-rw-r--r-- | bin/kdepim/WhatsNew.txt | 9 | ||||
-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 25 | ||||
-rw-r--r-- | bin/kdepim/kopiemail/germantranslation.txt | 10 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 30 | ||||
-rw-r--r-- | bin/kdepim/pwmanager/germantranslation.txt | 12 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 4 | ||||
-rw-r--r-- | korganizer/filteredit_base.cpp | 13 | ||||
-rw-r--r-- | korganizer/koeditordetails.cpp | 3 | ||||
-rw-r--r-- | korganizer/koeditorgeneral.cpp | 8 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 6 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 12 | ||||
-rw-r--r-- | version | 2 |
12 files changed, 78 insertions, 56 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 4b0c920..7e5240c 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,5 +1,14 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | |||
4 | ********** VERSION 2.0.1 ************ | ||
5 | |||
6 | Oooops ... I forgot to test on the Zaurus 5500 ... | ||
7 | |||
8 | Fixed many problems of new (english) strings (and german translations) | ||
9 | introduced in the latest versions, where the text was not fitting on the | ||
10 | 240x320 display of the Zaurus 5500. | ||
11 | |||
3 | ********** VERSION 2.0.0 ************ | 12 | ********** VERSION 2.0.0 ************ |
4 | 13 | ||
5 | Stable release 2.0.0! | 14 | Stable release 2.0.0! |
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index 2f449ef..3a1b2f4 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt | |||
@@ -142,8 +142,8 @@ | |||
142 | { "Show Details","Zeige Details" }, | 142 | { "Show Details","Zeige Details" }, |
143 | { "Beam receive enabled","Beam (IR) Empfang AN" }, | 143 | { "Beam receive enabled","Beam (IR) Empfang AN" }, |
144 | { "Set Who Am I","Setze "wer bin ich"" }, | 144 | { "Set Who Am I","Setze "wer bin ich"" }, |
145 | { "Set Categories","Wähle Kategorien" }, | 145 | { "Set Categories for Contacts...","Setze Kategorien für Kontakte..." }, |
146 | { "Edit Categories","Editiere Kategorien" }, | 146 | { "Edit Category List...","Editiere Kategorieliste..." }, |
147 | { "Remove "voice"...","Entferne "voice"..." }, | 147 | { "Remove "voice"...","Entferne "voice"..." }, |
148 | { "Import from Outlook...","Importiere aus Outlook..." }, | 148 | { "Import from Outlook...","Importiere aus Outlook..." }, |
149 | { "Licence","Lizenz" }, | 149 | { "Licence","Lizenz" }, |
@@ -614,7 +614,7 @@ | |||
614 | { "Setting formatted name completed!","Setzen vom formatierten Namen beendet!" }, | 614 | { "Setting formatted name completed!","Setzen vom formatierten Namen beendet!" }, |
615 | { "Removing voice...","Entferne voice..." }, | 615 | { "Removing voice...","Entferne voice..." }, |
616 | { "Remove voice completed!","Entferne voice beendet!" }, | 616 | { "Remove voice completed!","Entferne voice beendet!" }, |
617 | { "Merge with existing categories?","Zu bestehenden Kategorien hinzufügen?" }, | 617 | { "Merge with existing categories?","Zu bestehenden\nKategorien hinzufügen?" }, |
618 | { "Setting categories ... please wait!","Setze Kategorien ... bitte warten!" }, | 618 | { "Setting categories ... please wait!","Setze Kategorien ... bitte warten!" }, |
619 | { "Setting categories completed!","Setzen der Kategorien beendet!" }, | 619 | { "Setting categories completed!","Setzen der Kategorien beendet!" }, |
620 | { "OK","OK" }, | 620 | { "OK","OK" }, |
@@ -652,8 +652,8 @@ | |||
652 | { "Confirm Delete","Bestätige Löschen" }, | 652 | { "Confirm Delete","Bestätige Löschen" }, |
653 | { "Edit Address Book Filter","Editiere Adressbuch Filter" }, | 653 | { "Edit Address Book Filter","Editiere Adressbuch Filter" }, |
654 | { "Category rule","Kategorie Regel" }, | 654 | { "Category rule","Kategorie Regel" }, |
655 | { "Include categories","Schließe Kategorien ein" }, | 655 | { "Include categories","Inklusive" }, |
656 | { "Exclude categories","Schließe Kategorien aus" }, | 656 | { "Exclude categories","Exclusive" }, |
657 | { "Include contacts, that are:","Schließe folgende Kontakte ein:" }, | 657 | { "Include contacts, that are:","Schließe folgende Kontakte ein:" }, |
658 | { "public","Öffentlich" }, | 658 | { "public","Öffentlich" }, |
659 | { "private","Privat" }, | 659 | { "private","Privat" }, |
@@ -674,14 +674,15 @@ | |||
674 | { "Language","Sprache" }, | 674 | { "Language","Sprache" }, |
675 | { "Time Format","Zeit Format" }, | 675 | { "Time Format","Zeit Format" }, |
676 | { "Time Zone","Zeit Zone" }, | 676 | { "Time Zone","Zeit Zone" }, |
677 | { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" }, | 677 | { "Data storage path","Daten Speicherpfad" }, |
678 | { "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" }, | 678 | { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" }, |
679 | { "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" }, | 679 | { "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" }, |
680 | { "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" }, | ||
680 | { "Save settings","Speichere Einstellungen" }, | 681 | { "Save settings","Speichere Einstellungen" }, |
681 | { "Save standard","Speichere Standard" }, | 682 | { "Save standard","Speichere Standard" }, |
683 | { "Save","Speichern" }, | ||
682 | { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, | 684 | { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, |
683 | { "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" }, | 685 | { "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" }, |
684 | { "Data storage path","Daten Speicherpfad" }, | ||
685 | { "Multiple Sync options","Multi Sync Optionen" }, | 686 | { "Multiple Sync options","Multi Sync Optionen" }, |
686 | { "Sync algo options","Sync Ablauf Optionen" }, | 687 | { "Sync algo options","Sync Ablauf Optionen" }, |
687 | { "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" }, | 688 | { "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" }, |
@@ -707,6 +708,10 @@ | |||
707 | { "Please restart to get the \nchanged resources (re)loaded!\n","Bitte starten Sie jetzt\ndas Programm neu, um die geänderten\nResourcen neu zu laden!\n" }, | 708 | { "Please restart to get the \nchanged resources (re)loaded!\n","Bitte starten Sie jetzt\ndas Programm neu, um die geänderten\nResourcen neu zu laden!\n" }, |
708 | { "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n","Die gewählte Datei enthält\nkeine gültige vCard.\nBitte prüfen Sie die Datei\nund versuchen es erneut.\n" }, | 709 | { "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n","Die gewählte Datei enthält\nkeine gültige vCard.\nBitte prüfen Sie die Datei\nund versuchen es erneut.\n" }, |
709 | { "Unable to load resource '%1'","Resource kann nicht geladen werden: '%1'" }, | 710 | { "Unable to load resource '%1'","Resource kann nicht geladen werden: '%1'" }, |
711 | { "Some changes are only\neffective after a restart!\n","Einige Änderungen werden erst\nnach einem Neustart übernommen!\n" }, | ||
712 | { "","" }, | ||
713 | { "","" }, | ||
714 | { "","" }, | ||
710 | { "","" }, | 715 | { "","" }, |
711 | { "","" }, | 716 | { "","" }, |
712 | { "","" }, | 717 | { "","" }, |
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt index 68dc6db..58f4ea8 100644 --- a/bin/kdepim/kopiemail/germantranslation.txt +++ b/bin/kdepim/kopiemail/germantranslation.txt | |||
@@ -243,13 +243,13 @@ | |||
243 | { "Language","Sprache" }, | 243 | { "Language","Sprache" }, |
244 | { "Time Format","Zeit Format" }, | 244 | { "Time Format","Zeit Format" }, |
245 | { "%1 groups subscribed","%1 Guppen abboniert" }, | 245 | { "%1 groups subscribed","%1 Guppen abboniert" }, |
246 | { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" }, | 246 | { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" }, |
247 | { "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" }, | 247 | { "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" }, |
248 | { "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" }, | 248 | { "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" }, |
249 | { "Save settings","Speichere Einstellungen" }, | 249 | { "Save settings","Speichere Einstellungen" }, |
250 | { "Save standard","Speichere Standard" }, | 250 | { "Save standard","Speichere Standard" }, |
251 | { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, | 251 | { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, |
252 | { "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" }, | 252 | { "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" }, |
253 | { "Data storage path","Daten Speicherpfad" }, | 253 | { "Data storage path","Daten Speicherpfad" }, |
254 | { "userdefined","benutzerdefiniert" }, | 254 | { "userdefined","benutzerdefiniert" }, |
255 | { "Reply to this mail","Beantworte diese Mail" }, | 255 | { "Reply to this mail","Beantworte diese Mail" }, |
@@ -263,7 +263,7 @@ | |||
263 | { "Show "Subject" info field","Zeige "Betreff" Info Feld" }, | 263 | { "Show "Subject" info field","Zeige "Betreff" Info Feld" }, |
264 | { "Show "From" info field","Zeige "Von" Info Feld" }, | 264 | { "Show "From" info field","Zeige "Von" Info Feld" }, |
265 | { "Show "To" info field","Zeige "An" Info Feld" }, | 265 | { "Show "To" info field","Zeige "An" Info Feld" }, |
266 | { "","" }, | 266 | { "Mail saved as draft!","Mail als Entwurf gespeichert!" }, |
267 | { "","" }, | 267 | { "","" }, |
268 | { "","" }, | 268 | { "","" }, |
269 | { "","" }, | 269 | { "","" }, |
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 3d16c1a..6a20868 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1080,26 +1080,23 @@ | |||
1080 | { "Local temp file:","Lokale temp Datei:" }, | 1080 | { "Local temp file:","Lokale temp Datei:" }, |
1081 | { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" }, | 1081 | { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" }, |
1082 | { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" }, | 1082 | { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" }, |
1083 | |||
1084 | |||
1085 | |||
1086 | |||
1087 | { "Language","Sprache" }, | 1083 | { "Language","Sprache" }, |
1088 | { "Time Format","Zeit Format" }, | 1084 | { "Time Format","Zeit Format" }, |
1089 | { "Time Zone","Zeit Zone" }, | 1085 | { "Time Zone","Zeit Zone" }, |
1090 | { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" }, | 1086 | { "%1 groups subscribed","%1 Guppen abboniert" }, |
1091 | { "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" }, | 1087 | { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" }, |
1092 | { "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" }, | 1088 | { "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" }, |
1089 | { "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" }, | ||
1093 | { "Save settings","Speichere Einstellungen" }, | 1090 | { "Save settings","Speichere Einstellungen" }, |
1094 | { "Save standard","Speichere Standard" }, | 1091 | { "Save standard","Speichere Standard" }, |
1095 | { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, | 1092 | { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, |
1096 | { "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" }, | 1093 | { "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" }, |
1097 | { "Data storage path","Daten Speicherpfad" }, | 1094 | { "Data storage path","Daten Speicherpfad" }, |
1098 | { "Language","Sprache" }, | 1095 | { "Language","Sprache" }, |
1099 | { "Show time in agenda items","Zeige Zeit in Agenda Items" }, | 1096 | { "Show time in agenda items","Zeige Zeit in Agenda Items" }, |
1100 | { "Color for Sundays + category "Holiday"","Farbe für Sonntags + Kategorie "Feiertag"" }, | 1097 | { "Color for Sundays + category "Holiday"","Farbe für Sonntags + Kategorie "Feiertag"" }, |
1101 | { "Show events, that are done in \nWhat's Next view","Zeige abgelaufene Termine in\nWhat's Next Ansicht" }, | 1098 | { "Show events, that are done in \nWhat's Next view","Zeige abgelaufene Termine in\nWhat's Next Ansicht" }, |
1102 | { "Hide not running Todos in To-do view","Verstecke nicht laufende Todos in To-do Ansicht" }, | 1099 | { "Hide not running Todos in To-do view","Verstecke nicht laufende Todos" }, |
1103 | { "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" }, | 1100 | { "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" }, |
1104 | { "KO/Pi","KO/Pi" }, | 1101 | { "KO/Pi","KO/Pi" }, |
1105 | { "There is nothing to undo!","Es gibt nichts zum\nRückgängigmachen!" }, | 1102 | { "There is nothing to undo!","Es gibt nichts zum\nRückgängigmachen!" }, |
@@ -1136,7 +1133,7 @@ | |||
1136 | { "&Start date:","&Startdatum:" }, | 1133 | { "&Start date:","&Startdatum:" }, |
1137 | { "Start &time:","Startzeit:" }, | 1134 | { "Start &time:","Startzeit:" }, |
1138 | { "End ti&me:","Endzeit:" }, | 1135 | { "End ti&me:","Endzeit:" }, |
1139 | { "E&xtend time range to include all events","Erweitere Zeitspanne um alle Ereignisse einzuschliessen" }, | 1136 | { "E&xtend time range to include all events","Erweitere Zeitspanne um alle Termine einzuschliessen" }, |
1140 | { "Include to&dos that are due on the printed day(s)","Inclusive To&dos, die an den selektierten Tagen fällig sind" }, | 1137 | { "Include to&dos that are due on the printed day(s)","Inclusive To&dos, die an den selektierten Tagen fällig sind" }, |
1141 | { "Alt+D","Alt+D" }, | 1138 | { "Alt+D","Alt+D" }, |
1142 | { "&Use colors","Nutze Farben" }, | 1139 | { "&Use colors","Nutze Farben" }, |
@@ -1177,15 +1174,16 @@ | |||
1177 | { "FilterEditor","FilterEditor" }, | 1174 | { "FilterEditor","FilterEditor" }, |
1178 | { "Include","Inclusive" }, | 1175 | { "Include","Inclusive" }, |
1179 | { "Exclude","Exclusive" }, | 1176 | { "Exclude","Exclusive" }, |
1180 | { "Edit Selection...","Editiere Selektion..." }, | 1177 | { "Edit Selection...","Editiere Auswahl" }, |
1181 | { "recurring events","wiederholende Ereignisse" }, | 1178 | { "recurring events","wiederholende Termine" }, |
1179 | { "recurr. events","wiederh.Termine" }, | ||
1182 | { "completed to-dos","erledigte Todos" }, | 1180 | { "completed to-dos","erledigte Todos" }, |
1183 | { "events","Ereignisse" }, | 1181 | { "events","Termine" }, |
1184 | { "todos","Todos" }, | 1182 | { "todos","Todos" }, |
1185 | { "journals","Journale" }, | 1183 | { "journals","Journale" }, |
1186 | { "public","öffentlich" }, | 1184 | { "public","öffentl." }, |
1187 | { "private","privat" }, | 1185 | { "private","privat" }, |
1188 | { "confidential","vertraulich" }, | 1186 | { "confidential","vertraul." }, |
1189 | { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" }, | 1187 | { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" }, |
1190 | { "Yesterday","Gestern" }, | 1188 | { "Yesterday","Gestern" }, |
1191 | { "Day after tomorrow","Übermorgen" }, | 1189 | { "Day after tomorrow","Übermorgen" }, |
@@ -1195,7 +1193,7 @@ | |||
1195 | { "New Agendasize: %1","Neue Agendagröße: %1" }, | 1193 | { "New Agendasize: %1","Neue Agendagröße: %1" }, |
1196 | { " (%1 y.)"," (%1 J.)" }, | 1194 | { " (%1 y.)"," (%1 J.)" }, |
1197 | { "Allday:","Ganztägig:" }, | 1195 | { "Allday:","Ganztägig:" }, |
1198 | { "","" }, | 1196 | { "compl.todos","erled.Todos" }, |
1199 | { "","" }, | 1197 | { "","" }, |
1200 | { "","" }, | 1198 | { "","" }, |
1201 | { "","" }, | 1199 | { "","" }, |
diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt index a47b123..0ebc644 100644 --- a/bin/kdepim/pwmanager/germantranslation.txt +++ b/bin/kdepim/pwmanager/germantranslation.txt | |||
@@ -9,7 +9,7 @@ | |||
9 | { "&Print...","Drucken..." }, | 9 | { "&Print...","Drucken..." }, |
10 | { "&File","Datei" }, | 10 | { "&File","Datei" }, |
11 | { "&Edit","Bearbeite" }, | 11 | { "&Edit","Bearbeite" }, |
12 | { "&View","Ansichten" }, | 12 | { "&View","Ansicht" }, |
13 | { "&Help","Hilfe" }, | 13 | { "&Help","Hilfe" }, |
14 | { "Description","Beschreibungen" }, | 14 | { "Description","Beschreibungen" }, |
15 | { "URL","URL" }, | 15 | { "URL","URL" }, |
@@ -174,13 +174,13 @@ | |||
174 | { "extra Parameters:","extra Parameter:" }, | 174 | { "extra Parameters:","extra Parameter:" }, |
175 | { "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" }, | 175 | { "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" }, |
176 | { "External Apps.","Externe Appl." }, | 176 | { "External Apps.","Externe Appl." }, |
177 | { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" }, | 177 | { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" }, |
178 | { "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" }, | 178 | { "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" }, |
179 | { "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" }, | 179 | { "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" }, |
180 | { "Save settings","Speichere Einstellungen" }, | 180 | { "Save settings","Speichere Einstellungen" }, |
181 | { "Save standard","Speichere Standard" }, | 181 | { "Save standard","Speichere Standard" }, |
182 | { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, | 182 | { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, |
183 | { "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" }, | 183 | { "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" }, |
184 | { "Data storage path","Daten Speicherpfad" }, | 184 | { "Data storage path","Daten Speicherpfad" }, |
185 | { "Used %1 Client","Benutzer %1 Client" }, | 185 | { "Used %1 Client","Benutzer %1 Client" }, |
186 | { "No email client installed","Keine Email Client installiert" }, | 186 | { "No email client installed","Keine Email Client installiert" }, |
@@ -209,7 +209,7 @@ | |||
209 | { "&Deep-lock all entries","Sperre total alle Einträge" }, | 209 | { "&Deep-lock all entries","Sperre total alle Einträge" }, |
210 | { "&Unlock all entries","Entsperre alle Einträge" }, | 210 | { "&Unlock all entries","Entsperre alle Einträge" }, |
211 | { "&Configure...","Konfiguriere..." }, | 211 | { "&Configure...","Konfiguriere..." }, |
212 | { "&Options","&Optionen" }, | 212 | { "&Options","Konfig" }, |
213 | { "C&ategories...","K&ategorien..." }, | 213 | { "C&ategories...","K&ategorien..." }, |
214 | { "&Sync","&Sync" }, | 214 | { "&Sync","&Sync" }, |
215 | { "&License","&Lizenz" }, | 215 | { "&License","&Lizenz" }, |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index e2e3a66..0def16e 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2038,10 +2038,10 @@ void KABCore::initActions() | |||
2038 | "set_personal" ); | 2038 | "set_personal" ); |
2039 | 2039 | ||
2040 | 2040 | ||
2041 | mActionCategories = new KAction( i18n( "Set Categories" ), 0, this, | 2041 | mActionCategories = new KAction( i18n( "Set Categories for Contacts..." ), 0, this, |
2042 | SLOT( setCategories() ), actionCollection(), | 2042 | SLOT( setCategories() ), actionCollection(), |
2043 | "edit_set_categories" ); | 2043 | "edit_set_categories" ); |
2044 | mActionEditCategories = new KAction( i18n( "Edit Categories" ), 0, this, | 2044 | mActionEditCategories = new KAction( i18n( "Edit Category List..." ), 0, this, |
2045 | SLOT( editCategories() ), actionCollection(), | 2045 | SLOT( editCategories() ), actionCollection(), |
2046 | "edit__categories" ); | 2046 | "edit__categories" ); |
2047 | 2047 | ||
diff --git a/korganizer/filteredit_base.cpp b/korganizer/filteredit_base.cpp index 15a4aaa..505edf6 100644 --- a/korganizer/filteredit_base.cpp +++ b/korganizer/filteredit_base.cpp | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <qpushbutton.h> | 13 | #include <qpushbutton.h> |
14 | #include <qframe.h> | 14 | #include <qframe.h> |
15 | #include <qbuttongroup.h> | 15 | #include <qbuttongroup.h> |
16 | #include <qapplication.h> | ||
16 | #include <qradiobutton.h> | 17 | #include <qradiobutton.h> |
17 | #include <qlistbox.h> | 18 | #include <qlistbox.h> |
18 | #include <qlabel.h> | 19 | #include <qlabel.h> |
@@ -107,7 +108,7 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl ) | |||
107 | mCriteriaFrameLayout->addLayout( layout2 ); | 108 | mCriteriaFrameLayout->addLayout( layout2 ); |
108 | FilterEdit_baseLayout->addWidget( mCriteriaFrame ); | 109 | FilterEdit_baseLayout->addWidget( mCriteriaFrame ); |
109 | languageChange(); | 110 | languageChange(); |
110 | resize( QSize(324, 281).expandedTo(minimumSizeHint()) ); | 111 | resize( QSize(300, 200).expandedTo(minimumSizeHint()) ); |
111 | clearWState( WState_Polished ); | 112 | clearWState( WState_Polished ); |
112 | } | 113 | } |
113 | 114 | ||
@@ -131,8 +132,14 @@ void FilterEdit_base::languageChange() | |||
131 | mCatHideCheck->setText( tr( "Exclude" ) ); | 132 | mCatHideCheck->setText( tr( "Exclude" ) ); |
132 | mCatEditButton->setText( tr( "Edit Selection..." ) ); | 133 | mCatEditButton->setText( tr( "Edit Selection..." ) ); |
133 | textLabel1->setText( tr( "Exclude" ) ); | 134 | textLabel1->setText( tr( "Exclude" ) ); |
134 | mRecurringCheck->setText( tr( "recurring events" ) ); | 135 | if (QApplication::desktop()->width() > 480 ) { |
135 | mCompletedCheck->setText( tr( "completed to-dos" ) ); | 136 | mCompletedCheck->setText( tr( "completed to-dos" ) ); |
137 | mRecurringCheck->setText( tr( "recurring events" ) ); | ||
138 | } | ||
139 | else { | ||
140 | mCompletedCheck->setText( tr( "compl.todos" ) ); | ||
141 | mRecurringCheck->setText( tr( "recurr. events" ) ); | ||
142 | } | ||
136 | textLabel1_2->setText( tr( "Exclude" ) ); | 143 | textLabel1_2->setText( tr( "Exclude" ) ); |
137 | mEventCheck->setText( tr( "events" ) ); | 144 | mEventCheck->setText( tr( "events" ) ); |
138 | mTodoCheck->setText( tr( "todos" ) ); | 145 | mTodoCheck->setText( tr( "todos" ) ); |
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index b73d22f..cf0a458 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp | |||
@@ -144,7 +144,8 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) | |||
144 | 144 | ||
145 | if (qApp->desktop()->width() < 640 ) { | 145 | if (qApp->desktop()->width() < 640 ) { |
146 | if ( qApp->desktop()->width() < 300 ) | 146 | if ( qApp->desktop()->width() < 300 ) |
147 | mListView->setFixedHeight(80); | 147 | topLayout->setSpacing(1); |
148 | ;//mListView->setFixedHeight(80); | ||
148 | topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3); | 149 | topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3); |
149 | topLayout->addMultiCellWidget(mListView,1,1,0,3); | 150 | topLayout->addMultiCellWidget(mListView,1,1,0,3); |
150 | topLayout->addWidget(attendeeLabel,3,0); | 151 | topLayout->addWidget(attendeeLabel,3,0); |
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index b4fe965..f5eb52e 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp | |||
@@ -249,9 +249,9 @@ void KOEditorGeneral::pickAlarmSound() | |||
249 | } | 249 | } |
250 | 250 | ||
251 | if (mAlarmProgramButton->isOn()) | 251 | if (mAlarmProgramButton->isOn()) |
252 | ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + mAlarmProgram ); | 252 | ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) ); |
253 | if ( mAlarmSoundButton->isOn()) | 253 | if ( mAlarmSoundButton->isOn()) |
254 | ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio.Al.: ") + mAlarmSound ); | 254 | ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio.Al.: ") + getFittingPath(mAlarmSound) ); |
255 | } | 255 | } |
256 | 256 | ||
257 | void KOEditorGeneral::pickAlarmProgram() | 257 | void KOEditorGeneral::pickAlarmProgram() |
@@ -277,9 +277,9 @@ void KOEditorGeneral::pickAlarmProgram() | |||
277 | } | 277 | } |
278 | } | 278 | } |
279 | if (mAlarmProgramButton->isOn()) | 279 | if (mAlarmProgramButton->isOn()) |
280 | ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + mAlarmProgram ); | 280 | ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) ); |
281 | if ( mAlarmSoundButton->isOn()) | 281 | if ( mAlarmSoundButton->isOn()) |
282 | ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Sound.Al.: ") + mAlarmSound ); | 282 | ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Sound.Al.: ") + getFittingPath(mAlarmSound) ); |
283 | } | 283 | } |
284 | 284 | ||
285 | 285 | ||
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index ea73fd0..1b24f56 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -716,14 +716,12 @@ void KOPrefsDialog::setupViewsTab() | |||
716 | ii = 0; | 716 | ii = 0; |
717 | QLabel *lab; | 717 | QLabel *lab; |
718 | QHBox *habo = new QHBox( topFrame ); | 718 | QHBox *habo = new QHBox( topFrame ); |
719 | if ( QApplication::desktop()->width() < 320 ) { | 719 | if ( QApplication::desktop()->width() <= 480 ) { |
720 | lab = new QLabel ( i18n("Show events that recur "), topFrame ); | 720 | lab = new QLabel ( i18n("Show events that recur "), topFrame ); |
721 | topLayout->addMultiCellWidget(lab,ii, ii,0,1); | 721 | topLayout->addMultiCellWidget(lab,ii, ii,0,1); |
722 | ii++; | 722 | ii++; |
723 | |||
724 | } else { | 723 | } else { |
725 | new QLabel ( i18n("Show events that recur "), habo ); | 724 | new QLabel ( i18n("Show events that recur "), habo ); |
726 | |||
727 | } | 725 | } |
728 | dailyRecur = | 726 | dailyRecur = |
729 | addWidBool(i18n("daily"), | 727 | addWidBool(i18n("daily"), |
@@ -738,7 +736,7 @@ void KOPrefsDialog::setupViewsTab() | |||
738 | 736 | ||
739 | 737 | ||
740 | habo = new QHBox( topFrame ); | 738 | habo = new QHBox( topFrame ); |
741 | if ( QApplication::desktop()->width() < 320 ) { | 739 | if ( QApplication::desktop()->width() <= 480 ) { |
742 | lab = new QLabel (i18n("Show in every cell ") , topFrame ); | 740 | lab = new QLabel (i18n("Show in every cell ") , topFrame ); |
743 | topLayout->addMultiCellWidget(lab,ii, ii,0,1); | 741 | topLayout->addMultiCellWidget(lab,ii, ii,0,1); |
744 | ii++; | 742 | ii++; |
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index d097078..6eaf2f2 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -116,17 +116,21 @@ void KDEPIMConfigWidget::setupStoreTab() | |||
116 | { | 116 | { |
117 | QVBox *storePage = new QVBox( this ); | 117 | QVBox *storePage = new QVBox( this ); |
118 | new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage ); | 118 | new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage ); |
119 | new QLabel( i18n("<b>Set new data storage dir:</b>"), storePage ); | 119 | new QLabel( i18n("<b>New data storage dir:</b>"), storePage ); |
120 | mStoreUrl = new KURLRequester( storePage ); | 120 | mStoreUrl = new KURLRequester( storePage ); |
121 | mStoreUrl->setURL( KGlobal::dirs()->localkdedir() ); | 121 | mStoreUrl->setURL( KGlobal::dirs()->localkdedir() ); |
122 | new QLabel( i18n("Not existing dirs are created automatically"), storePage ); | 122 | new QLabel( i18n("New dirs are created automatically"), storePage ); |
123 | QHBox *bb = new QHBox( storePage ); | 123 | QHBox *bb = new QHBox( storePage ); |
124 | QPushButton * pb = new QPushButton ( i18n("Save settings"), bb ); | 124 | QPushButton * pb; |
125 | if ( QApplication::desktop()->width() < 640 ) | ||
126 | pb = new QPushButton ( i18n("Save"), bb ); | ||
127 | else | ||
128 | pb = new QPushButton ( i18n("Save settings"), bb ); | ||
125 | connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) ); | 129 | connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) ); |
126 | pb = new QPushButton ( i18n("Save standard"), bb ); | 130 | pb = new QPushButton ( i18n("Save standard"), bb ); |
127 | connect(pb, SIGNAL( clicked() ), this, SLOT ( setStandardStore() ) ); | 131 | connect(pb, SIGNAL( clicked() ), this, SLOT ( setStandardStore() ) ); |
128 | new QLabel( i18n("<b>New settings are used\nafter a restart</b>"), storePage ); | 132 | new QLabel( i18n("<b>New settings are used\nafter a restart</b>"), storePage ); |
129 | new QLabel( i18n("The settings of the storage\ndir is saved in the file\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage ); | 133 | new QLabel( i18n("Settings are stored in\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage ); |
130 | tabWidget->addTab( storePage, i18n( "Data storage path" ) ); | 134 | tabWidget->addTab( storePage, i18n( "Data storage path" ) ); |
131 | } | 135 | } |
132 | void KDEPIMConfigWidget::setStandardStore() | 136 | void KDEPIMConfigWidget::setStandardStore() |
@@ -1 +1 @@ | |||
version = "2.0.0"; | version = "2.0.1"; | ||