many stribg fixes

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,66 +1,75 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+
+********** VERSION 2.0.1 ************
+
+Oooops ... I forgot to test on the Zaurus 5500 ...
+
+Fixed many problems of new (english) strings (and german translations)
+introduced in the latest versions, where the text was not fitting on the 
+240x320 display of the Zaurus 5500.
+
 ********** VERSION 2.0.0 ************
 
 Stable release 2.0.0!
 
 KO/Pi:
 Fixed problem in edit dialog recreation at startup.
 Made "toggle view*" menu items enabled context sensitive.
 Changed agenda size menu to items 1-10.
 Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down.
 Usebility enhancements in the KO/Pi menus.
 Birthday import now adds year to summary.
 What's Next view shows age in years for birthday.
 
 OM/Pi:
 Added three info lines to display subject, from and to of selected mails.
 
 KA/Pi:
 Fixed jump bar behaviour on Zaurus.
 Now KA/Pi search field supports searching for a range of starting characters.
 E.g. to search for all contact beginning with b to n, type 
 b-n
 in the search field.
 
 ********** VERSION 1.9.20 ************
 
 KO/Pi:
 Added for the "dislplay one day" agenda mode 
 info in the caption and in the day lables:
 Now it is displayed, if the selected day is from "day before yesterday"
 to "day after tomorrow".
 Made it possible to delete a Todo, which has sub-todos.
 Fixed two small problems in the todo view.
 Added missing German translation for filter edit and print dialog.
 Made search dialog closeable by cancel key.
 
 Made it possible to select in the date picker the (ligt grey )
 dates of the prev./next month with the mouse.
 
 OM/Pi:
 "Delete mail" icon in main window now deletes all selected mails.
 Fixed the problem, that the state flag of imap mails was ignored.
 Now mails with "FLAG_SEEN" on the imap server get no icon in the list view
 to indecate that they are already seen.
 Fixed the problem that the body of some mails was not displayed in the
 mail viewer when fetching them from the imap server directly to read them.
 Made it (configurable) possible  to show the "To:" field in the list view.
 Added to the mail viewer the option "View Source" to make it possible to see the raw mail data.
 Added a "Download Mail" button to the mail viewer to quickly download the viewed mail to the
 local storage folder (specified in account settings) of the account of the mail.
 Removed some memory leaks in OM/Pi.
 
 
 ********** VERSION 1.9.19 ************
 
 Added a lot of missing translations to KA/Pi, 
 Added some missing translations to KO/Pi and OM/Pi.
 
 Fixed some minor problems in KA/Pi + KO/Pi.
 
 Fixed a crash when closing PwM/Pi.
 Added German translation for PwM/Pi.
 
 Made view change and Month View update faster in KO/Pi.
 
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
@@ -81,130 +81,130 @@
 { "September","September" },

 { "October","October" },

 { "November","November" },

 { "December","Dezember" },

 { "tomorrow","Morgen" },

 { "today","Heute" },

 { "yesterday","Gestern" },

 { "Monday","Montag" },

 { "Tuesday","Dienstag" },

 { "Wednesday","Mittwoch" },

 { "Thursday","Donnerstag" },

 { "Friday","Freitag" },

 { "Saturday","Samstag" },

 { "Sunday","Sonntag" },

 { "Anniversary:","Jahrestag:" },

 { "Gender:","Geschlecht:" },

 { "ALIEN (gender undefined)","ALIEN (Geschlecht unbekannt)" },

 { "female","weiblich" },

 { "male","männlich" },

 { "&Details","&Details" },

 { "Note:","Notiz:" },

 { "&Notes","&Notizen" },

 { "Use geo data","Benutze geo Daten" },

 { "Latitude:","Breitengrad:" },

 { "Longitude:","Längengrad:" },

 { "Edit Geo Data...","Edit geo Daten..." },

 { "Keys:","Schlüssel:" },

 { "Add","Hinzufügen" },

 { "Remove","Entfernen" },

 { "Export","Exportiere" },

 { "&Misc","Verschiedenes" },

 { "Photo","Foto" },

 { "Store as URL","Speichere als URL" },

 { "Logo","Logo" },

 { "&Images","B&ilder" },

 { "Home","Privat" },

 { "Work","Geschäft" },

 { "Mobile","Handy" },

 { "Fax","Fax" },

 { "Contact Editor","Bearbeite Kontakt" },

 { "&Mail...","&Mail..." },

 { "&Print...","Drucken..." },

 { "&Save","&Speichern" },

 { "&New Contact...","&Neuer Kontakt..." },

 { "Mail &vCard...","Mail &vCard..." },

 { "Selected to phone","Auswahl zum Telefon" },

 { "Beam selected v&Card(s)","Beame ausgewählte v&Card(s)" },

 { "&Beam personal vCard","Beame persönliche vCard" },

 { "&Edit Contact...","Bearbeite Kontakt..." },

 { "&Exit","B&eenden" },

 { "&Copy","Kopieren" },

 { "Cu&t","Ausschneiden" },

 { "&Paste","Einfügen" },

 { "Select &All","Alles auswählen" },

 { "&Undo","Rückgängig machen" },

 { "Re&do","Wiederherstellen" },

 { "&Delete Contact","Lösche Kontakt" },

 { "Configure &Resources...","Konfiguriere &Resourcen..." },

 { "&Configure %1...","Konfiguriere %1..." },

 { "Configure S&hortcuts...","Konfiguriere S&hortcuts..." },

 { "Show Jump Bar","Zeige Jump Bar" },

 { "Show Details","Zeige Details" },

 { "Beam receive enabled","Beam (IR) Empfang AN" },

 { "Set Who Am I","Setze "wer bin ich"" },

-{ "Set Categories","Wähle Kategorien" },

-{ "Edit Categories","Editiere Kategorien" },

+{ "Set Categories for Contacts...","Setze Kategorien für Kontakte..." },

+{ "Edit Category List...","Editiere Kategorieliste..." },

 { "Remove "voice"...","Entferne "voice"..." },

 { "Import from Outlook...","Importiere aus Outlook..." },

 { "Licence","Lizenz" },

 { "Faq","Fragen + Antworten" },

 { "What's New?","Was ist neu?" },

 { "Sync HowTo","Sync Anleitung" },

 { "&About KAddressBook","Über KAdressBuch" },

 { "Select Incremental Search Field","Selektiere Such Feld" },

 { "Synchronize","Synchronisieren" },

 { "Configure...","Konfigurieren..." },

 { "Enable Pi-Sync","Aktiviere Pi-Sync" },

 { "Multiple sync","Multi Sync" },

 { "Import CSV List...","Importiere CSV-Datei..." },

 { "Export CSV List...","Exportiere CSV-Datei..." },

 { "Import KDE 2 Addressbook...","Importiere KDE 2 Adressbuch..." },

 { "Import vCard...","Importiere vCard..." },

 { "Export vCard 3.0...","Exportiere vCard 3.0..." },

 { "Import Qtopia...","Importiere Qtopia..." },

 { "Export Qtopia...","Exportiere Qtopia..." },

 { "Edit Contact","Bearbeite Kontakt" },

 { "Ok","Ok" },

 { "Apply","Anwenden" },

 { "Cancel","Abbrechen" },

 { "KAddressbook/Pi","KAdressbuch/Pi" },

 { "No Filter","Kein Filter" },

 { "Given Name","Vorname" },

 { "Family Name","Nachname" },

 { "Email Address","E-Mail Adresse" },

 { "All Fields","Alle Felder" },

 { "Question","Frage" },

 { "After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as "other".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?","After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as "other".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?" },

 { "No","Nein" },

 { "Yes","Ja" },

 { "Synchronization Preferences","Einstellungen der Synchronisationsprofile" },

 { "Local device name:","Name dieses Gerätes:" },

 { "New profile","Neues Profil" },

 { "Clone profile","Klone Profil" },

 { "Delete profile","Lösche Profil" },

 { "Profile:","Profil:" },

 { "Ask for every entry on conflict","Frage bei Konflikten nach"},

 { "Take local entry on conflict","Nimm lokalen Eintrag beim Konflikt" },

 { "Take newest entry on conflict","Nimm neuesten Eintrag beim Konflikt" },

 { "Take remote entry on conflict","Nimm fernen Eintrag beim Konflikt" }

 { "Force: Take local entry always","Erzwinge: Nimm immer lokalen Eintrag" },

 { "Force: Take remote entry always","Erzwinge: Nimm immer fernen Eintrag" },

 { "Show summary after sync","Zeige Zusammenfassung nach dem Synchronisieren" },

 { "Write back file","Schreibe Datei zurück" },

 { "Remote file (w down/upload command)","Entfernte Datei (via down/upload Kommando)" },

 { "Pre sync (download) command:","Bevor Sync (download) Kommando:" },

 { "Local device name:","Name dieses Gerätes:" },

 { "Ask for preferences before sync","Frage nach Synchronisationseinstellungen vor dem Syncen" },

 { "Sync preferences","Synchronisations Einstellungen" },

 { "Profile kind","Profil Art" },

 { "Local file","Lokale Datei" },

 { "Local file:","Lokale Datei:" },

 { "Post sync (upload) command:","Nach Sync (upload) Kommando:" },

 { "Fill in default values for:","Setze Beispiel Werte ein für:" },

 { "Hint: Use $PWD$ for placeholder of password!","Hinweis: Benutze $PWD$ als Platzhalter für ein Passwort!" },

 { "Synchronization Preferences","Einstellungen der Synchronisationsprofile"},

 { "Device","Gerät:" },

 { "Sync with file \n...%1\nfrom:\n%2\n","Sync mit Datei \n...%1\nvom:\n%2\n" },

 { "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n","Synchronisationsübersicht:\n\n %d items lokal hinzugefügt\n %d items entfernt hinzugefügt\n %d items lokal geändert\n %d items entfernt geändert\n %d items lokal gelöscht\n %d items entfernt gelöscht\n" },

 { "Synchronization successful","Synchronisation erfolgreich" },

 { "Sync cancelled or failed. Nothing synced.","Sync abgebrochen oder fehlgeschlagen. Nichts wurde gesynced." },

@@ -553,162 +553,167 @@
 { "Error accessing device!\nPlease turn on connection\nand retry!","Fehler beim Zugriff auf das Gerät!\nBitte die Verbindung aktivieren\nund nochmal versuchen!" },

 { "Error exporting to phone!","Fehler beim Export auf das Handy!" },

 { "&Print View","Drucke Ansicht" },

 { "&Print Details","Drucke Details" },

 { "Beam v&Card(s)...","Beame v&Card(s)..." },

 { "Set formatted name...","Setze formatierten Namen..." },

 { "Kde Sync HowTo","Kde Sync HowTo" },

 { "Multi Sync HowTo","Multi Sync HowTo" },

 { "&Beam","&Beame" },

 { "Edit Email Addresses","Editiere Email Adressen" },

 { "Email address:","Email Adresse:" },

 { "Change","Ändere" },

 { "Set Standard","Setze Standard" },

 { "New Contact","Neuer Contact" },

 { "Undo %1","Rückgängig %1" },

 { "Redo","Wiederholen" },

 { "Saving ... please wait! ","Am Speichern ... bitte warten! " },

 { "CSV Import Dialog","CSV Import Dialog" },

 { "File to import:","Datei zum Import:" },

 { "Delimiter","Trennzeichen" },

 { "Comma","Komma" },

 { "Semicolon","Semikolon" },

 { "Tabulator","Tabulator" },

 { "Space","Leerzeichen" },

 { "1","1" },

 { """,""" },

 { "'","'" },

 { "Start at line:","Beginne mit Zeile:" },

 { "Textquote:","Textquote:" },

 { "Ignore duplicate delimiters","Ignoriere doppelte Trennzeichen" },

 { "Import KDE 2 Addressbook","Importiere KDE 2 Addressbook" },

 { "Override previously imported entries?","Überschreibe bereits importierte Einträge?" },

 { "Select vCard to Import","Selektiere zu importierende vCard" },

 { "Information","Information" },

 { "contacts successfully imported.","Kontakte erfolgreich importiert." },

 { "Import xml file","Importiere xml Datei" },

 { "Choose contact selection","Wähle Kontakt Auswahl" },

 { "Select the entire address book","Wähle das ganze Adressbuch" },

 { "Only contacts selected in KAddressBook.\nThis option is disabled if no contacts are selected.","Nur in KA/Pi selektierte Kontate.\nDiese Option ist nicht verfügbar\nwhen keine Kontakte selektiert sind." },

 { "Only contacts matching the selected filter.\nThis option is disabled if you haven't defined any filters","Nur Kontakte die auf den Filter zutreffen.\nDiese Option ist nicht verfügbar, wenn keine Filter definiert sind." },

 { "Only contacts who are members of a category that is checked on the list to the left.\nThis option is disabled if you have no categories.","Nur Kontakte die Mitglieder der Kategirien sind,\die links selektiert sind.\nDiese Option ist nicht verfügbar, wenn es keine Kategirien gibt." },

 { "Select a filter to decide which contacts to select.","Selektiere einen Filter um festzulegen welche Kontakte ausgewählt werden sollen." },

 { "Check the categories whose members you want to select.","Setzte die Kategorien, dessen Mitglieder Sie auswählen möchten." },

 { "I/O device: ","I/O device: " },

 { "Connection: ","Connection: " },

 { "Model(opt.): ","Model(opt.): " },

 { "Exporting to phone...","Exportiere aufs Handy..." },

 { "Error exporting to phone","Fehler beim Export aufs Handy" },

 { "contacts successfully exported.","Kontakte erfolgreich exportiert." },

 { "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?","Wollen Sie<br>alle existieren Einträge von<br>%1<br>vor dem Export entfernen?" },

 { "Set formatted name","Setze formatierten Namen" },

 { "You can set the formatted name\nfor a list of contacts in one go.","Sie können den formatierten Namen für\nein Liste von Kontakten auf einmal setzen." },

 { "Set formatted name to:","Setze formatierten Name auf:" },

 { "Simple: James Bond","Einfach: James Bond" },

 { "Full: Mr. James 007 Bond I","Voll: Mr. James 007 Bond I" },

 { "Reverse: Bond, James","Umgekehrt: Bond, James" },

 { "Organization: MI6","Organisation: MI6" },

 { "Set formatted name to\norganization, if name empty","Setze formatierten Namen auf\nOrganisation, wenn Name leer ist." },

 { "Select contact list","Selektiere Kontakt Liste" },

 { "Changing contact #%1","Ändere Kontakt #%1" },

 { "Refreshing view...","Lade Ansicht neu..." },

 { "Setting formatted name completed!","Setzen vom formatierten Namen beendet!" },

 { "Removing voice...","Entferne voice..." },

 { "Remove voice completed!","Entferne voice beendet!" },

-{ "Merge with existing categories?","Zu bestehenden Kategorien hinzufügen?" },

+{ "Merge with existing categories?","Zu bestehenden\nKategorien hinzufügen?" },

 { "Setting categories ... please wait!","Setze Kategorien ... bitte warten!" },

 { "Setting categories completed!","Setzen der Kategorien beendet!" },

 { "OK","OK" },

 { "Please wait, processing categories...","Bitte warten, bearbeite Kategorien..." },

 { "Processing contact #%1","Bearbeite Kontakt #%1" },

 { " categories added to list! "," Kategorien zur Liste hinzugefügt! " },

 { "%1: %2","%1: %2" },

 { "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n","Ihr persönlicher Kontakt ist\nnicht gesetzt! Bitte selektieren Sie\nihn und setzen ihn mit Menu:\nKonfiguration - Setze wer bin ich\n" },

 { "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>","<qt>Wollen Sie wirklich<br><b>%1</b><br>als persönlichen Kontakt setzent?</qt>" },

 { "Cut","Ausschneiden" },

 { "Paste","Einfügen" },

 { "Delete","Löschen" },

 { "Choose...","Wähle..." },

 { "Add View","Ansicht hinzufügen" },

 { "View name:","Ansicht Name:" },

 { "View Type","Ainsicht Typ" },

 { "Icons represent contacts. Very simple view.","Icons repräsentieren Kontakte. Sehr einfache Ansicht." },

 { "A listing of contacts in a table. Each cell of the table holds a field of the contact.","Eine Kontaktliste in einer Tabelle." },

 { "Rolodex style cards represent contacts.","Rolodex Stil Karten repräsentieren Kontakte." },

 { "Draw &separators","Zeichne &Trennlinie" },

 { "Separator &width:","Trennlinien &Breite:" },

 { "&Padding:","Füllung:" },

 { "Cards","Karten" },

 { "&Margin:","&Rand:" },

 { "Draw &borders","Zeichne Ränder" },

 { "The item margin is the distance (in pixels) between the item edge and the item data. Most noticeably, incrementing the item margin will add space between the focus rectangle and the item data.","The item margin is the distance (in pixels) between the item edge and the item data. Most noticeably, incrementing the item margin will add space between the focus rectangle and the item data." },

 { "The Item Spacing decides the distance (in pixels) between the items and anything else: the view borders, other items or column separators.","The Item Spacing decides the distance (in pixels) between the items and anything else: the view borders, other items or column separators." },

 { "Sets the width of column separators","Sets the width of column separators" },

 { "&Layout","&Layout" },

 { "Show &empty fields","Zeige leere Felder" },

 { "Show field &labels","Zeige Feld Label" },

 { "Be&havior","Ver&halten" },

 { "Header, Border and Separator Color","Kopf, Rand und Trennlinien Farbe" },

 { "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>","<qt>Sind Sie sicher, dass Sie die Ansicht <b>%1</b> löschen möchten?</qt>" },

 { "Confirm Delete","Bestätige Löschen" },

 { "Edit Address Book Filter","Editiere Adressbuch Filter" },

 { "Category rule","Kategorie Regel" },

-{ "Include categories","Schließe Kategorien ein" },

-{ "Exclude categories","Schließe Kategorien aus" },

+{ "Include categories","Inklusive" },

+{ "Exclude categories","Exclusive" },

 { "Include contacts, that are:","Schließe folgende Kontakte ein:" },

 { "public","Öffentlich" },

 { "private","Privat" },

 { "confidential","Vertraulich" },

 { "Configure Resources","Konfiguriere Resourcen" },

 { "Resource Configuration","Resource Konfiguration" },

 { "Resources","Resourcen" },

 { "Standard","Standard" },

 { "&Use as Standard","Setze als Standard" },

 { "Select type of the new resource:","Selektiere Typ der neuen Resource:" },

 { "General Settings","Allgemeine Einstellungen" },

 { "Read-only","Nur-Lesen" },

 { "Include in sync","Schließe in Sync mit ein" },

 { "%1 Resource Settings","%1 Resource Einstellungen" },

 { "Format:","Format:" },

 { "Location:","Ort:" },

 { "Full Menu bar (restart)","Volle Menu Leiste (Neustart!)" },

 { "Language","Sprache" },

 { "Time Format","Zeit Format" },

 { "Time Zone","Zeit Zone" },

-{ "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" },

-{ "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" },

-{ "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" },

+{ "Data storage path","Daten Speicherpfad" },

+{ "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" },

+{ "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" },

+{ "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" },

 { "Save settings","Speichere Einstellungen" },

 { "Save standard","Speichere Standard" },

+{ "Save","Speichern" },

 { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },

-{ "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" },

-{ "Data storage path","Daten Speicherpfad" },

+{ "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" },

 { "Multiple Sync options","Multi Sync Optionen" },

 { "Sync algo options","Sync Ablauf Optionen" },

 { "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" },

 { "Incoming calendar filter:","Eingehender Kalender Filter:" },

 { "Incoming addressbook filter:","Eingehender Adressbuch Filter:" },

 { "Write back options","Optionen zum Zurückschreiben" },

 { "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" },

 { "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" },

 { "Outgoing calendar filter:","Ausgehender Kalender Filter:" },

 { "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" },

 { "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" },

 { "Time period","Zeitspanne" },

 { "From ","Von " },

 { " weeks in the past to "," Wochen in der Vergangenheit bis zu " },

 { " weeks in the future "," Wochen in der Zukunft " },

 { "Profile kind specific settings","Profil Art abhängige Einstellungen" },

 { "Local temp file:","Lokale temp Datei:" },

 { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" },

 { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" },

 { "You cannot remove your standard resource!\n Please select a new standard resource first.","Standard Resource kann\nnicht entfernt werden!\nBitte eine andere Resource\nals Standard setzen." },

 { "Sorry","Tut mir leid" },

 { "You cannot use a read-only<br> resource as standard!","Man kann nicht eine read-only<br> Resource als Standard setzen!" },

 { "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" },

 { "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" },

 { "Unable to load resource '%1'","Resource kann nicht geladen werden: '%1'" },

+{ "Some changes are only\neffective after a restart!\n","Einige Änderungen werden erst\nnach einem Neustart übernommen!\n" },

+{ "","" },

+{ "","" },

+{ "","" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },
\ No newline at end of file
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
@@ -182,93 +182,93 @@
 { "<p>Do you really want to delete this mail? <br><br>","<p>Wollen Sie diese Mail wirklich löschen? <br><br>" },
 { "Mailbox has %1 mail(s)","Mailbox hat %1 Mail(s)" },
 { "Move/Copie all mails","Verschiebe/kopiere alle Mails" },
 { "Delete all mails","Lösche alle Mails" },
 { "Create new subfolder","Neues Unterverzeichnis" },
 { "Delete folder","Lösche Verzeichnis" },
 { "Refresh folder list","Aktualisiere Liste" },
 { "Create new folder","Neues Verzeichnis" },
 { "Disconnect","Diskonnect" },
 { "Set offline","Gehe offline" },
 { "Select target box","Wähle Ziel Box" },
 { "<b>Store mail(s) to</b>","<b>Speichere Mail(s) nach</b>" },
 { "Folder:","Verzeichnis:" },
 { "Account:","Zugang:" },
 { "Prefix will prepend, do not enter","Pfad-Prefix wird vorangestellt" },
 { "Move mail(s)","Verschiebe Mail(s)" },
 { "only mails smaller","nur Mails kleiner" },
 { " kB"," kB" },
 { " message %1 of %2"," Nachricht %1 von %2" },
 { "Copying...","Am Kopieren..." },
 { "Copy message %1 of %2","Kopiere Nachricht %1 von %2" },
 { "Do you really want to delete\nall selected mails?","Wollen Sie wirklich alle\nselektierten Mails Löschen?" },
 { "Delete All Mails","Lösche alle Mails" },
 { "Deleting ...","Am Löschen..." },
 { "Delete message %1 of %2","Lösche Nachricht %1 von %2" },
 { "Compose Message","Verfasse Nachricht" },
 { "Reply-To","Antwort-An" },
 { "BCC","BCC" },
 { "Signature","Signatur" },
 { "CC","Kopie" },
 { "Options","Optionen" },
 { "Delete File","Lösche Datei" },
 { "Add File","Füge Datei hinzu" },
 { "Attachment","Anhang" },
 { "send later","sende später" },
 { "use:","via:" },
 { "Save","Speichern" },
 { "Name","Name" },
 { "No Receiver spezified","Kein Empfänger angegeben" },
 { "Sending mail","Sende Mail" },
 { "No","Nein" },
 { "Yes","Ja" },
 { "Store message into drafts?\n","Speichere Nachricht in Entwürfe?\n" },
 { "Store message?","Nachricht speichern?" },
 { "Select Type","Selektiere Typ" },
 { "Select Account Type","Wähle Art des Zugangs" },
 { "IMAP","IMAP (online lesen)" },
 { "POP3","POP3 (holen)" },
 { "SMTP","SMTP (senden)" },
 { "<p>Do you really want to delete the selected Account?</p>","<p>Möchten Sie wirklich den ausgewählten Account löschen?</p>" },
 { "Question","Eine Frage..." },
 { "Send this message?","Nachricht wirklich senden?" },
 { "Stop editing message","Stop editing message" },
 { "Sending mail %1 of %2","Sende Mail %1 von %2" },
 { "%1 of %2 bytes send","%1 von %2 Bytes gesendet" },
 { "Refresh header list","Aktualisiere Titel Liste" },
 { "Define a smtp\n account first!\n","Bitte zuerst einen\nSMTP Account anlegen!\n" },
 { "Mail queue flushed","Gespeicherte Mails gesendet!" },
 { "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n","Bitte legen Sie einen\nSMTP Account an.\nDer SMTP Account wird\nfür das Versenden von\nMails benötigt!" },
 { "Show next mail","Zeige nächste Mail" },
 { "End of List","Ende der Liste" },
 { "Language","Sprache" },
 { "Time Format","Zeit Format" },
 { "%1 groups subscribed","%1 Guppen abboniert" },
-{ "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" },
-{ "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" },
-{ "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" },
+{ "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" },
+{ "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" },
+{ "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" },
 { "Save settings","Speichere Einstellungen" },
 { "Save standard","Speichere Standard" },
 { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
-{ "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" },
+{ "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" },
 { "Data storage path","Daten Speicherpfad" },
 { "userdefined","benutzerdefiniert" },
 { "Reply to this mail","Beantworte diese Mail" },
 { "Su:","Be:" },
 { "Fr:","Vo:" },
 { "To:","An:" },
 { "Download Mail","Mail runterladen" },
 { "View Source","Zeige Source" },
 { "Show "To" field in list view","Zeige "An" Feld in Listenansicht" },
 { "Show info fields at startup","Zeige Info Felder beim Start" },
 { "Show "Subject" info field","Zeige "Betreff" Info Feld" },
 { "Show "From" info field","Zeige "Von" Info Feld" },
 { "Show "To" info field","Zeige "An" Info Feld" },
-{ "","" },
+{ "Mail saved as draft!","Mail als Entwurf gespeichert!" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
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
@@ -1019,185 +1019,183 @@
 { "<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n","<p><b>left</b>: Vorh. Woche | <b>left+ctrl</b>: Vorh. Monat</p>\n" },
 { "<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n","<p><b>right</b>: Nächste Woche | <b>right+ctrl</b>: Nächste Woche</p>\n" },
 { "<p><b>B</b>: Edit description (details) of selected item</p>\n","<p><b>B</b>: Editiere Beschreibung (Details) des selektierten Items</p>\n" },
 { "<p><b>C</b>: Show current time in agenda view</p>\n","<p><b>C</b>: Zeige aktuelle Zeit in Agenda Ansicht</p>\n" },
 { "<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n","<p><b>+,-</b> : Zoom rein/raus Agenda | <b>A</b>: Wechsle Ganztag Agenda Höhe</p>\n" },
 { "<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n","<p><b>S+ctrl</b>: Füge Sub-Todo hinzu | <b>X</b>: Zeige/verstecke Datenavigator</p>\n" },
 { "<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n","<p><b>T</b>: Gehe zu Heute | <b>T+ctrl</b>: Neues Todo</p>\n" },
 { "<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n","<p><b>E</b>: Editiere selektiertes Item |<b> E+ctrl</b>: Neuer Termin</p>\n" },
 { "<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n","<p><b>D</b>: Ein-Tages Ansicht | <b>M</b>: Monats Ansicht</p>\n" },
 { "<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n","<p><b>Z,Y</b>: Arbeitswochen Ansicht | <b>U</b>: Wochen Ansicht</p>\n" },
 { "<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n","<p><b>V</b>: Todo Ansicht | <b>L</b>: Termin Listen Ansicht</p>\n" },
 { "<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ","<p><b>N</b>: Nächste-Tage Ansicht days view| <b>W</b>: What's next Ansicht\n " },
 { "<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n","<p><b>1-0</b> (+<b>ctrl</b>): Selektiere Filter 1-10 (11-20)</p>\n" },
 { "<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n","<p><b>O</b>: Filter An/Aus | <b>J</b>: Journal Ansicht</p>\n" },
 { "<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n","<p><b>F</b>: Zeige/verstecke Filter Ansicht |<b>F+ctrl</b>: Editiere Filter </p>\n" },
 { "<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n","<p><b>Space</b>: Zeige fullscreen | <b>P</b>: Datums Picker</p>\n" },
 { "<p><b>I</b>: Show info for selected event/todo</p>\n","<p><b>I</b>: Zeige Info (Details) für selektiertes Item</p>\n" },
 { "<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n","<p><b>H</b>: Dieser Hilfe Dialog | <b>S</b>: Such Dialog</p>\n" },
 { "<p><h2>KO/Pi key shortcuts:</h2></p>\n","<p><h2>KO/Pi Tastatur Kurzbefehle:</h2></p>\n" },
 { "After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configurable) three minutes.\nFor safety reasons there is  one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n","Nachdem etwas geändert wurde, werden die\nDaten automatisch in die Datei abgespeichert\n~/kdepim/apps/korganizer/mycalendar.ics\nnach (konfigurierbar) drei Minuten.\nAus Sicherheitsgründen wird noch einmal\nnach 10 Min. abgespeichert, wenn keine\nÄnderungen vorgenommen wurden. Die \nDaten werden automatisch gespeichert,\nwenn KO/Pi beendet wird.\nSie können eine Backup-Datei erstellen im\nMenu: Datei - Speichere Kalender Backup\n" },
 { "Auto Saving in  KOrganizer/Pi","Auto Speichern in  KOrganizer/Pi" },
 { "\nhttp://sourceforge.net/projects/kdepimpi\n","\nhttp://sourceforge.net/projects/kdepimpi\n" },
 { "\nor report them in the bugtracker on\n","\noder trage sie in dem Bugtracker ein auf\n" },
 { "\nPlease report unexpected behaviour to\nlutz@pi-sync.net\n","\nBitte melde fehlerhaftes Verhalten an\nlutz@pi-sync.net\n" },
 { "2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n","2) Ein Audio Alarm Daemon\nfür den Zaurus ist verfügbar\nals zusätzliche Anwendung\n" },
 { "1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n","1) Importieren von *.vcs oder *.ics Dateien von\nanderen Anwendungen kann möglicherweise\n nicht richtig funktionieren,\nwenn die Termine Eigenschaften haben,\ndie KO/Pi nicht unterstützt.\n" },
 { "Known Problems in  KOrganizer/Pi","Bekannte Probleme in  KOrganizer/Pi" },
 { "KO/Pi FAQ","KO/Pi FAQ" },
 { "(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi is based on KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi is licensed\nunder the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.korganizer.org\nwww.pi-sync.net\n","(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi basiert auf KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi ist lizensiert unter der GPL.\nKO/Pi kann kompiliert werden für\nLinux, Zaurus-PDA und Windows\nwww.korganizer.org\nwww.pi-sync.net\n" },
 { "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n","PDA-Edition\nfür: Zaurus 5x00 / 7x0 / 8x0\n" },
 { "KOrganizer/Platform-independent\n","KOrganizer/Platform-independent\n" },
 { "About KOrganizer/Pi","Über KOrganizer/Pi" },
 { "From: ","Von: " },
 { "Remove sync info","Entferne Sync Info" },
 { "For all profiles","Für alle Profile" },
 { "Hide not Running","Verstecke nicht Laufende" },
 { "ME","ME" },
 { "Toolbar","Toolbar" },
 { "Undo Delete...","Löschen rückgängig machen..." },
 { "Undo Delete","Löschen rückgängig machen" },
 { "KDE Sync HowTo...","KDE Sync HowTo..." },
 { "Multi Sync HowTo...","Multi Sync HowTo..." },
 { "Januar","Januar" },
 { "KO/Pi Keys + Colors","KO/Pi Tasten + Farben" },
 { "No Filter","Kein Filter" },
 { "Multiple Sync options","Multi Sync Optionen" },
 { "Sync algo options","Sync Ablauf Optionen" },
 { "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" },
 { "Incoming calendar filter:","Eingehender Kalender Filter:" },
 { "Incoming addressbook filter:","Eingehender Adressbuch Filter:" },
 { "Write back options","Optionen zum Zurückschreiben" },
 { "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" },
 { "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" },
 { "Outgoing calendar filter:","Ausgehender Kalender Filter:" },
 { "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" },
 { "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" },
 { "Time period","Zeitspanne" },
 { "From ","Von " },
 { " weeks in the past to "," Wochen in der Vergangenheit bis zu " },
 { " weeks in the future "," Wochen in der Zukunft " },
 { "Profile kind specific settings","Profil Art abhängige Einstellungen" },
 { "Local temp file:","Lokale temp Datei:" },
 { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" },
 { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" },
-
-
-
-
 { "Language","Sprache" },
 { "Time Format","Zeit Format" },
 { "Time Zone","Zeit Zone" },
-{ "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" },
-{ "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" },
-{ "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" },
+{ "%1 groups subscribed","%1 Guppen abboniert" },
+{ "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" },
+{ "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" },
+{ "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" },
 { "Save settings","Speichere Einstellungen" },
 { "Save standard","Speichere Standard" },
 { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
-{ "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" },
+{ "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" },
 { "Data storage path","Daten Speicherpfad" },
 { "Language","Sprache" },
 { "Show time in agenda items","Zeige Zeit in Agenda Items" },
 { "Color for Sundays + category "Holiday"","Farbe für Sonntags + Kategorie "Feiertag"" },
 { "Show events, that are done in \nWhat's Next view","Zeige abgelaufene Termine in\nWhat's Next Ansicht" },
-{ "Hide not running Todos in To-do view","Verstecke nicht laufende Todos in To-do Ansicht" },
+{ "Hide not running Todos in To-do view","Verstecke nicht laufende Todos" },
 { "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
 { "KO/Pi","KO/Pi" },
 { "There is nothing to undo!","Es gibt nichts zum\nRückgängigmachen!" },
 { "Recreating edit dialog. Please wait...","Recreating edit dialog. Please wait..." },
 { "Sound.Al.: ","Sound.Al.: " },
 { "From: %1   To: %2   %3","Von: %1   Bis: %2   %3" },
 { "Restore","Wiederherstellen" },
 { "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklicht\nwiederherstellen?" },
 { "% completed","% komplett" },
 { "%d item(s) found.","%d Item(s) gefunden." },
 { "Set complete","Setze auf erledigt" },
 { "(cancelled)","(gecancelt)" },
 { "Click on the week number to\nshow week in agenda view","Klicke auf die Wochennummer\num die Woche in der Agenda anzuzeigen" },
 { " Local time "," Locale Zeit " },
 { "Form2","Form2" },
 { "Filter enabled","Filter angeschaltet" },
 { "Edit Filters","Ändere Filter" },
 { "Print What's Next View...","Drucke What's Next Ansicht..." },
 { "Agenda","Agenda" },
 { " ("," (" },
 { "<p><b>Due on:</b> %1</p>","<p><b>Fällig am:</b> %1</p>" },
 { "Print","Print" },
 { "&Setup Printer...","Drucker &Setup..." },
 { "View Type","Zeige Typ" },
 { "Page &orientation:","Seiten Ausrichtung:" },
 { "Use Default of Selected Style","Default des selektierten Stils" },
 { "Use Default Setting of Printer","Default Einstellung des Druckers" },
 { "Portrait","Portrait" },
 { "Landscape","Landschaft" },
 { "Print day","Drucke Tag" },
 { "CalPrintDay_Base","CalPrintDay_Base" },
 { "Date && Time Range","Datum && Zeitspanne" },
 { "&End date:","&Enddatum:" },
 { "&Start date:","&Startdatum:" },
 { "Start &time:","Startzeit:" },
 { "End ti&me:","Endzeit:" },
-{ "E&xtend time range to include all events","Erweitere Zeitspanne um alle Ereignisse einzuschliessen" },
+{ "E&xtend time range to include all events","Erweitere Zeitspanne um alle Termine einzuschliessen" },
 { "Include to&dos that are due on the printed day(s)","Inclusive To&dos, die an den selektierten Tagen fällig sind" },
 { "Alt+D","Alt+D" },
 { "&Use colors","Nutze Farben" },
 { "Alt+U","Alt+U" },
 { "Print week","Drucke Woche" },
 { "CalPrintWeek_Base","CalPrintWeek_Base" },
 { "Use &colors","Nutze Farben" },
 { "Type of View","Typ der Ansicht" },
 { "Print as &Filofax page","Drucke als &Filofax Seite" },
 { "Alt+F","Alt+F" },
 { "Print as &timetable view:","Drucke als Zeittabelle:" },
 { "Alt+T","Alt+T" },
 { "Print as split week view","Drucke als gesplittete Wochenansicht" },
 { "Print month","Drucke Monat" },
 { "CalPrintMonth_Base","CalPrintMonth_Base" },
 { "&Start month:","&Startmonat:" },
 { "&End month:","&Endmonat:" },
 { "Print week &numbers","Drucke Wochen Nummer(n)" },
 { "Print todos","Drucke Todos" },
 { "CalPrintTodoConfig_Base","CalPrintTodoConfig_Base" },
 { "Include &description of the item","Inclusive Itembeschreibung" },
 { "Include d&ue date of the item","Inclusive Fälligkeitsdatum des Items" },
 { "Include &priority of the item","Inclusive Priorität des Items" },
 { "Items to Print","Zu druckende Items" },
 { "&From:","Von:" },
 { "&To:","Bis:" },
 { "Print &all todo items","Drucke alle Todo Items" },
 { "Print only &uncompleted items","Drucke nur nicht erledigte Todos" },
 { "Only items due in the &range:","Nur Items in dem Zeitraum:" },
 { "Todo List","Todo Liste" },
 { "&Title:","&Titel:" },
 { "Co&nnect subtodos with its parent","Verbinde Unter-Todos mit ihren Ober-Todos" },
 { "Todo list","Todo Liste" },
 { "&Print...","Drucke..." },
 { "<qt>Printing on printer <b>%1</b></qt>","<qt>Drucke auf Drucker <b>%1</b></qt>" },
 { "[Unconfigured]","[Unkonfiguriert]" },
 { "OK","OK" },
 { "FilterEditor","FilterEditor" },
 { "Include","Inclusive" },
 { "Exclude","Exclusive" },
-{ "Edit Selection...","Editiere Selektion..." },
-{ "recurring events","wiederholende Ereignisse" },
+{ "Edit Selection...","Editiere Auswahl" },
+{ "recurring events","wiederholende Termine" },
+{ "recurr. events","wiederh.Termine" },
 { "completed to-dos","erledigte Todos" },
-{ "events","Ereignisse" },
+{ "events","Termine" },
 { "todos","Todos" },
 { "journals","Journale" },
-{ "public","öffentlich" },
+{ "public","öffentl." },
 { "private","privat" },
-{ "confidential","vertraulich" },
+{ "confidential","vertraul." },
 { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" },
 { "Yesterday","Gestern" },
 { "Day after tomorrow","Übermorgen" },
 { "Tomorrow","Morgen" },
 { "Day before yesterday","Vorgestern" },
 { "Size %1","Größe %1" },
 { "New Agendasize: %1","Neue Agendagröße: %1" },
 { " (%1 y.)"," (%1 J.)" },
 { "Allday:","Ganztägig:" },
-{ "","" },
+{ "compl.todos","erled.Todos" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
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
@@ -1,76 +1,76 @@
 { " Local Time","Ortszeit" },

 { "Default","Voreinstellungen" },

 { "Configure...","Konfigurieren..." },

 { "Remove sync info","Entferne Sync Info" },

 { "For all profiles","Für alle Profile" },

 { "Enable Pi-Sync","Aktiviere Pi-Sync" },

 { "Multiple sync","Multi Sync" },

 { "&Save","&Speichern" },

 { "&Print...","Drucken..." },

 { "&File","Datei" },

 { "&Edit","Bearbeite" },

-{ "&View","Ansichten" },

+{ "&View","Ansicht" },

 { "&Help","Hilfe" },

 { "Description","Beschreibungen" },

 { "URL","URL" },

 { "Name:","Name:" },

 { "Documents","Dokumente" },

 { "Files","Dateien" },

 { "All Files","Alle Dateien" },

 { "Name","Name" },

 { "Size","Größe" },

 { "Date","Datum" },

 { "Mime Type","Mime Typ" },

 { "Ok","Ok" },

 { "Cancel","Abbrechen" },

 { "1","1" },

 { "Synchronization Preferences","Einstellungen der Synchronisationsprofile" },

 { "Local device name:","Name dieses Gerätes:" },

 { "New profile","Neues Profil" },

 { "Clone profile","Klone Profil" },

 { "Delete profile","Lösche Profil" },

 { "Profile:","Profil:" },

 { "Multiple Sync options","Multi Sync Optionen" },

 { "Include in multiple ","Beziehe in mehrfach " },

 { "calendar  ","Kalender  " },

 { "addressbook  ","Adressbuch  " },

 { "pwmanager","PWmanager" },

 { " sync"," Sync ein" },

 { "Sync algo options","Sync Ablauf Optionen" },

 { "Ask for preferences before sync","Frage nach Synchronisationseinstellungen vor dem Syncen" },

 { "Sync preferences","Synchronisations Einstellungen" },

 { "Take local entry on conflict","Nimm lokalen Eintrag beim Konflikt" },

 { "Take remote entry on conflict","Nimm fernen Eintrag beim Konflikt" },

 { "Take newest entry on conflict","Nimm neuesten Eintrag beim Konflikt" },

 { "Ask for every entry on conflict","Frage bei Konflikten nach" },

 { "Force: Take local entry always","Erzwinge: Nimm immer lokalen Eintrag" },

 { "Force: Take remote entry always","Erzwinge: Nimm immer fernen Eintrag" },

 { "Show summary after sync","Zeige Zusammenfassung nach dem Synchronisieren" },

 { "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" },

 { "Incoming calendar filter:","Eingehender Kalender Filter:" },

 { "Incoming addressbook filter:","Eingehender Adressbuch Filter:" },

 { "Write back synced data","Schreibe gesyncte Daten zurück" },

 { "Write back options","Optionen zum Zurückschreiben" },

 { "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" },

 { "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" },

 { "Outgoing calendar filter:","Ausgehender Kalender Filter:" },

 { "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" },

 { "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" },

 { "Time period","Zeitspanne" },

 { "From ","Von " },

 { " weeks in the past to "," Wochen in der Vergangenheit bis zu " },

 { " weeks in the future "," Wochen in der Zukunft " },

 { "Profile kind","Profil Art" },

 { "Local file","Lokale Datei" },

 { "Pi-Sync ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync ( direktes Kx/Pi zu Kx/Pi sync )" },

 { "Remote file (w down/upload command)","Entfernte Datei (via down/upload Kommando)" },

 { "Mobile device (cell phone)","Mobiles Gerät (Handy)" },

 { "Profile kind specific settings","Profil Art abhängige Einstellungen" },

 { "I/O device: ","I/O device: " },

 { "Help...","Hilfe..." },

 { "Connection: ","Connection: " },

 { "Model(opt.): ","Model(opt.): " },

 { "Local file Cal:","Lokale Datei Kal:" },

 { "Local file ABook:","Lokale Datei ABuch:" },

 { "Local file PWMgr:","Lokale Datei PWMgr:" },

 { "Choose...","Wähle..." },

@@ -113,164 +113,164 @@
 { "User defined (usertranslation.txt)","Benutzerdef. (usertranslation.txt)" },

 { "Language","Sprache" },

 { "Time Format(nr):","Zeit Format(nr):" },

 { "24:00","24:00" },

 { "12:00am","12:00am" },

 { "Week starts on Sunday","Woche beginnt Sonntags" },

 { "Time Format","Zeit Format" },

 { "Date Format:","Datums Format:" },

 { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" },

 { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" },

 { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" },

 { "User defined","Benutzerdefiniert" },

 { "User long date:","Format langes Datum:" },

 { "User short date:","Format kurzes Datum:" },

 { "Monday 19 April 2004: %A %d %B %Y","Monday 19 April 2004: %A %d %B %Y" },

 { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" },

 { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" },

 { "Date Format","Datums Format" },

 { "Timezone:","Zeitzone:" },

 { "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" },

 { "Timezone has daylight saving","Zeitzone hat Sommerzeit" },

 { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" },

 { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." },

 { "Daylight start:","Sommerzeit Beginn:" },

 { "Mon","Mo" },

 { "Tue","Di" },

 { "Wed","Mi" },

 { "Thu","Do" },

 { "Fri","Fr" },

 { "Sat","Sa" },

 { "Sun","So" },

 { "January","Januar" },

 { "February","Februar" },

 { "March","März" },

 { "April","April" },

 { "May","Mai" },

 { "June","Juni" },

 { "July","July" },

 { "August","August" },

 { "September","September" },

 { "October","October" },

 { "November","November" },

 { "December","Dezember" },

 { "tomorrow","Morgen" },

 { "today","Heute" },

 { "yesterday","Gestern" },

 { "Monday","Montag" },

 { "Tuesday","Dienstag" },

 { "Wednesday","Mittwoch" },

 { "Thursday","Donnerstag" },

 { "Friday","Freitag" },

 { "Saturday","Samstag" },

 { "Sunday","Sonntag" },

 { "Daylight end:","Sommerzeit Ende:" },

 { "Time Zone","Zeit Zone" },

 { "Used Mail Client","Benutzter Mail Client" },

 { "Channel:","Channel:" },

 { "Message:","Message:" },

 { "Parameters:","Parameter:" },

 { "HINT: Delimiter=; Name=%1,Email=%2","Hinweis: Begrenzer=; Name=%1,Email=%2" },

 { "extra Message:","extra Message:" },

 { "extra Parameters:","extra Parameter:" },

 { "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" },

 { "External Apps.","Externe Appl." },

-{ "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" },

-{ "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" },

-{ "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" },

+{ "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" },

+{ "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" },

+{ "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" },

 { "Save settings","Speichere Einstellungen" },

 { "Save standard","Speichere Standard" },

 { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },

-{ "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" },

+{ "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" },

 { "Data storage path","Daten Speicherpfad" },

 { "Used %1 Client","Benutzer %1 Client" },

 { "No email client installed","Keine Email Client installiert" },

 { "Userdefined email client","Benutzerdef. Email Client" },

 { "OM/Pi email client","OM/Pi Email Client" },

 { "URL:","URL:" },

 { "No","Nein" },

 { "Yes","Ja" },

 { "Untitled","Unbenannt" },

 { "&New","&Neu" },

 { "&Open","&Öffne" },

 { "&Close","Schließen" },

 { "Save &as...","Speichere &als..." },

 { "&Text-file...","&Text-Datei..." },

 { "&Gpasman / Kpasman ...","&Gpasman / Kpasman ..." },

 { "&CSV (Comma Separated Value) ...","&CSV (Komma getrennte Werte) ..." },

 { "E&xport","E&xport" },

 { "I&mport","I&mport" },

 { "&Quit","Beenden" },

 { "&Add password","&Passwort hinzufügen" },

 { "&Delete","Lösche" },

 { "Change &Master Password","Ändere &Master Passwort" },

 { "&Manage","Verwalte" },

 { "&Find","&Finde" },

 { "&Lock all entries","Sperre alle Einträge" },

 { "&Deep-lock all entries","Sperre total alle Einträge" },

 { "&Unlock all entries","Entsperre alle Einträge" },

 { "&Configure...","Konfiguriere..." },

-{ "&Options","&Optionen" },

+{ "&Options","Konfig" },

 { "C&ategories...","K&ategorien..." },

 { "&Sync","&Sync" },

 { "&License","&Lizenz" },

 { "&Faq","&Faq" },

 { "&About PwManager","Über PwManager" },

 { "&Sync HowTo","&Sync HowTo" },

 { "&What's New","Was ist neu?" },

 { "New","Neu" },

 { "Open","Öffnen" },

 { "Save","Speichern" },

 { "Save as","Speichern als" },

 { "Print...","Drucke..." },

 { "Add password","Passwort hinzufügen" },

 { "Edit password","Passwort ändern" },

 { "Delete password","Passwort löschen" },

 { "Find entry","Finde Eintrag" },

 { "Lock all entries","Sperre alle Einträge" },

 { "Deep-Lock all entries","Sperre total alle Einträge" },

 { "Unlock all entries","Entsperre alle Einträge" },

 { "Categories:","Kategorien:" },

 { "&Rename","&Umbenennen" },

 { "Username","Benutzername" },

 { "Password","Passwort" },

 { "Launcher","Launcher" },

 { "copy password to clipboard","Kopiere Passwort ins Clipboard" },

 { "copy username to clipboard","Kopiere Benutzername ins Clipboard" },

 { "copy description to clipboard","Kopiere Beschreibung ins Clipboard" },

 { "copy url to clipboard","Kopiere URL ins Clipboard" },

 { "copy launcher to clipboard","Kopiere Launcher ins Clipboard" },

 { "copy comment to clipboard","Kopiere Kommentare ins Clipboard" },

 { "Execute "Launcher"",""Launcher" ausführen" },

 { "Go to "URL"","Gehe zu "URL"" },

 { "Ready.","Fertig." },

 { "password filename(*.pwm)","passwort dateiname(*.pwm)" },

 { "File error","Datei Fehler" },

 { "Could not read file!","Kann Datei nicht lesen!" },

 { "Master-password","Master-Passwort" },

 { "Please enter the master-password:","Bitter Master-Passwort eingeben:" },

 { "Wrong master-password!\nPlease try again.","Falsches Master-Passwort!\nBitte erneut versuchen." },

 { "password error","Passwort Fehler" },

 { "Successfully opened file.","Datei erfolgreich geöffnet." },

 { "DEEP-LOCKED","DEEP-LOCKED" },

 { "This file is DEEP-LOCKED!\nThat means all data has been encrypted\nand written out to the file. If you want\nto see the entries, please UNLOCK the file.\nWhile unlocking, you will be prompted for the\nmaster-password or the key-card.","This file is DEEP-LOCKED!\nThat means all data has been encrypted\nand written out to the file. If you want\nto see the entries, please UNLOCK the file.\nWhile unlocking, you will be prompted for the\nmaster-password or the key-card." },

 { "<LOCKED>","<GESPERRT>" },

 { "To unlock click the icon on the left.","Zum Entsperren klicke auf das linke Icon." },

 { "PwManager","PwManager" },

 { "Window-style:","Window-style:" },

 { "Category on top","Kategorien oben" },

 { "Category-list left/top","Kategorien links oben" },

 { "<b>Font for Password entries:</b>","<b>Schrift für Passwort Einträge:</b>" },

 { "Font:","Schriftart:" },

 { "Compression:","Kompression:" },

 { "gzip","gzip" },

 { "Encryption:","Verschlüsselung:" },

 { "Blowfish (128 bit)","Blowfish (128 bit)" },

 { "AES-128, Rijndael (128 bit)","AES-128, Rijndael (128 bit)" },

 { "AES-192, Rijndael (192 bit)","AES-192, Rijndael (192 bit)" },

 { "AES-256, Rijndael (256 bit)","AES-256, Rijndael (256 bit)" },

 { "Triple-DES (168 bit)","Triple-DES (168 bit)" },

 { "Twofish (256 bit)","Twofish (256 bit)" },

 { "Twofish-128 (128 bit)","Twofish-128 (128 bit)" },

 { "Hashing:","Hashing:" },

 { "SHA-160, SHA1 (160 bit)","SHA-160, SHA1 (160 bit)" },

 { "SHA-256 (256 bit)","SHA-256 (256 bit)" },

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index e2e3a66..0def16e 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1977,132 +1977,132 @@ void KABCore::initActions()
   mActionRedo->setEnabled( false );
 
   // settings menu
 #ifdef KAB_EMBEDDED
 //US special menuentry to configure the addressbook resources. On KDE
 // you do that through the control center !!!
   mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this,
                SLOT( configureResources() ), actionCollection(),
                "kaddressbook_configure_resources" );
 #endif //KAB_EMBEDDED
 
   if ( mIsPart ) {
     mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this,
                  SLOT( openConfigDialog() ), actionCollection(),
                  "kaddressbook_configure" );
 
     //US not implemented yet
     //mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0,
     //             this, SLOT( configureKeyBindings() ), actionCollection(),
     //             "kaddressbook_configure_shortcuts" );
 #ifdef KAB_EMBEDDED
   mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() );
   mActionConfigureToolbars->setEnabled( false );
 #endif //KAB_EMBEDDED
 
   } else {
     mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() );
 
     //US not implemented yet
     //mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() );
   }
 
   mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0,
                                       actionCollection(), "options_show_jump_bar" );
   connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBar( bool ) ) );
 
   mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0,
                                       actionCollection(), "options_show_details" );
   connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) );
 
 
   mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this,
                                SLOT( toggleBeamReceive() ), actionCollection(),
                                "kaddressbook_beam_rec" );
 
 
   // misc
   // only enable LDAP lookup if we can handle the protocol
 #ifndef KAB_EMBEDDED
   if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) {
     new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0,
                  this, SLOT( openLDAPDialog() ), actionCollection(),
                  "ldap_lookup" );
   }
 #else //KAB_EMBEDDED
   //qDebug("KABCore::initActions() LDAP has to be implemented");
 #endif //KAB_EMBEDDED
 
 
   mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this,
                                SLOT( setWhoAmI() ), actionCollection(),
                                "set_personal" );
 
 
-  mActionCategories = new KAction( i18n( "Set Categories" ), 0, this,
+  mActionCategories = new KAction( i18n( "Set Categories for Contacts..." ), 0, this,
                                    SLOT( setCategories() ), actionCollection(),
                                    "edit_set_categories" );
-  mActionEditCategories = new KAction( i18n( "Edit Categories" ), 0, this,
+  mActionEditCategories = new KAction( i18n( "Edit Category List..." ), 0, this,
                                    SLOT( editCategories() ), actionCollection(),
                                    "edit__categories" );
 
   mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this,
                                     SLOT( removeVoice() ), actionCollection(),
                                    "remove_voice" );
   mActionSetFormattedName = new KAction( i18n( "Set formatted name..." ), 0, this,
                                     SLOT( setFormattedName() ), actionCollection(),
                                    "set_formatted" );
 
   mActionManageCategories= new KAction( i18n( "Manage new categories..." ), 0, this,
                                     SLOT( manageCategories() ), actionCollection(),
                                    "remove_voice" );
 
 
   mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this,
                                     SLOT( importFromOL() ), actionCollection(),
                                    "import_OL" );
 #ifdef KAB_EMBEDDED
  mActionLicence = new KAction( i18n( "Licence" ), 0,
                  this, SLOT( showLicence() ), actionCollection(),
                  "licence_about_data" );
  mActionFaq = new KAction( i18n( "Faq" ), 0,
                  this, SLOT( faq() ), actionCollection(),
                  "faq_about_data" );
  mActionWN = new KAction( i18n( "What's New?" ), 0,
                  this, SLOT( whatsnew() ), actionCollection(),
                  "wn" );
  mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0,
                  this, SLOT( synchowto() ), actionCollection(),
                  "sync" );
  mActionKdeSyncHowto = new KAction( i18n( "Kde Sync HowTo" ), 0,
                  this, SLOT( kdesynchowto() ), actionCollection(),
                  "kdesync" );
  mActionMultiSyncHowto = new KAction( i18n( "Multi Sync HowTo" ), 0,
                  this, SLOT( multisynchowto() ), actionCollection(),
                  "multisync" );
 
   mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0,
                  this, SLOT( createAboutData() ), actionCollection(),
                  "kaddressbook_about_data" );
 #endif //KAB_EMBEDDED
 
   clipboardDataChanged();
   connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
   connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
 }
 
 //US we need this function, to plug all actions into the correct menues.
 // KDE uses a XML format to plug the actions, but we work her without this overhead.
 void KABCore::addActionsManually()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
 
 #ifdef KAB_EMBEDDED
   QPopupMenu *fileMenu = new QPopupMenu( this );
   QPopupMenu *editMenu = new QPopupMenu( this );
   QPopupMenu *helpMenu = new QPopupMenu( this );
 
   KToolBar* tb =  mMainWindow->toolBar();
 
 #ifndef DESKTOP_VERSION
   if ( KABPrefs::instance()->mFullMenuBarVisible ) {
 #endif
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
@@ -1,145 +1,152 @@
 /****************************************************************************
 ** Form implementation generated from reading ui file 'filteredit_base.ui'
 **
 ** Created: Fr Jan 21 21:25:30 2005
 **      by: The User Interface Compiler ($Id$)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 
 #include "filteredit_base.h"
 
 #include <qvariant.h>
 #include <qpushbutton.h>
 #include <qframe.h>
 #include <qbuttongroup.h>
+#include <qapplication.h>
 #include <qradiobutton.h>
 #include <qlistbox.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qlayout.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 #include "tr.h"
 
 /*
  *  Constructs a FilterEdit_base as a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'.
  */
 FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
     if ( !name )
         setName( "FilterEdit_base" );
     FilterEdit_baseLayout = new QVBoxLayout( this, 0, 0, "FilterEdit_baseLayout"); 
 
     mCriteriaFrame = new QFrame( this, "mCriteriaFrame" );
     mCriteriaFrame->setFrameShape( QFrame::StyledPanel );
     mCriteriaFrame->setFrameShadow( QFrame::Raised );
     mCriteriaFrameLayout = new QVBoxLayout( mCriteriaFrame, 3, 2, "mCriteriaFrameLayout"); 
 
     ButtonGroup1 = new QButtonGroup( mCriteriaFrame, "ButtonGroup1" );
     ButtonGroup1->setColumnLayout(0, Qt::Vertical );
     ButtonGroup1->layout()->setSpacing( 6 );
     ButtonGroup1->layout()->setMargin( 6 );
     ButtonGroup1Layout = new QGridLayout( ButtonGroup1->layout() );
     ButtonGroup1Layout->setAlignment( Qt::AlignTop );
 
     layout4 = new QHBoxLayout( 0, 0, 6, "layout4"); 
 
     mCatShowCheck = new QRadioButton( ButtonGroup1, "mCatShowCheck" );
     layout4->addWidget( mCatShowCheck );
 
     mCatHideCheck = new QRadioButton( ButtonGroup1, "mCatHideCheck" );
     layout4->addWidget( mCatHideCheck );
 
     mCatEditButton = new QPushButton( ButtonGroup1, "mCatEditButton" );
     layout4->addWidget( mCatEditButton );
 
     ButtonGroup1Layout->addLayout( layout4, 0, 0 );
 
     mCatList = new QListBox( ButtonGroup1, "mCatList" );
 
     ButtonGroup1Layout->addWidget( mCatList, 1, 0 );
     mCriteriaFrameLayout->addWidget( ButtonGroup1 );
 
     layout7 = new QHBoxLayout( 0, 0, 6, "layout7"); 
 
     textLabel1 = new QLabel( mCriteriaFrame, "textLabel1" );
     layout7->addWidget( textLabel1 );
 
     mRecurringCheck = new QCheckBox( mCriteriaFrame, "mRecurringCheck" );
     layout7->addWidget( mRecurringCheck );
 
     mCompletedCheck = new QCheckBox( mCriteriaFrame, "mCompletedCheck" );
     layout7->addWidget( mCompletedCheck );
     mCriteriaFrameLayout->addLayout( layout7 );
 
     layout9 = new QHBoxLayout( 0, 0, 6, "layout9"); 
 
     textLabel1_2 = new QLabel( mCriteriaFrame, "textLabel1_2" );
     layout9->addWidget( textLabel1_2 );
 
     mEventCheck = new QCheckBox( mCriteriaFrame, "mEventCheck" );
     layout9->addWidget( mEventCheck );
 
     mTodoCheck = new QCheckBox( mCriteriaFrame, "mTodoCheck" );
     layout9->addWidget( mTodoCheck );
 
     mJournalCheck = new QCheckBox( mCriteriaFrame, "mJournalCheck" );
     layout9->addWidget( mJournalCheck );
     mCriteriaFrameLayout->addLayout( layout9 );
 
     layout2 = new QHBoxLayout( 0, 0, 0, "layout2"); 
 
     textLabel2 = new QLabel( mCriteriaFrame, "textLabel2" );
     layout2->addWidget( textLabel2 );
 
     mPublicCheck = new QCheckBox( mCriteriaFrame, "mPublicCheck" );
     layout2->addWidget( mPublicCheck );
 
     mPrivateCheck = new QCheckBox( mCriteriaFrame, "mPrivateCheck" );
     layout2->addWidget( mPrivateCheck );
 
     mConfidentialCheck = new QCheckBox( mCriteriaFrame, "mConfidentialCheck" );
     mConfidentialCheck->setChecked( FALSE );
     layout2->addWidget( mConfidentialCheck );
     mCriteriaFrameLayout->addLayout( layout2 );
     FilterEdit_baseLayout->addWidget( mCriteriaFrame );
     languageChange();
-    resize( QSize(324, 281).expandedTo(minimumSizeHint()) );
+    resize( QSize(300, 200).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 FilterEdit_base::~FilterEdit_base()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
 /*
  *  Sets the strings of the subwidgets using the current
  *  language.
  */
 void FilterEdit_base::languageChange()
 {
     setCaption( tr( "FilterEditor" ) );
     ButtonGroup1->setTitle( tr( "Categories" ) );
     mCatShowCheck->setText( tr( "Include" ) );
     mCatHideCheck->setText( tr( "Exclude" ) );
     mCatEditButton->setText( tr( "Edit Selection..." ) );
     textLabel1->setText( tr( "Exclude" ) );
-    mRecurringCheck->setText( tr( "recurring events" ) );
-    mCompletedCheck->setText( tr( "completed to-dos" ) );
+    if (QApplication::desktop()->width() > 480 ) {
+        mCompletedCheck->setText( tr( "completed to-dos" ) );
+        mRecurringCheck->setText( tr( "recurring events" ) );
+    }
+    else {
+        mCompletedCheck->setText( tr( "compl.todos" ) );
+        mRecurringCheck->setText( tr( "recurr. events" ) );
+    }
     textLabel1_2->setText( tr( "Exclude" ) );
     mEventCheck->setText( tr( "events" ) );
     mTodoCheck->setText( tr( "todos" ) );
     mJournalCheck->setText( tr( "journals" ) );
     textLabel2->setText( tr( "Include" ) );
     mPublicCheck->setText( tr( "public" ) );
     mPrivateCheck->setText( tr( "private" ) );
     mConfidentialCheck->setText( tr( "confidential" ) );
 }
 
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index b73d22f..cf0a458 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -83,129 +83,130 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
 
   mListView = new KListView(this,"mListView");
   mListView->addColumn(i18n("Name"),180);
   mListView->addColumn(i18n("Email"),180);
   mListView->addColumn(i18n("Role"),60);
   mListView->addColumn(i18n("Status"),100);
   mListView->addColumn(i18n("RSVP"),35);
   if ( KOPrefs::instance()->mCompactDialogs ) {
       //mListView->setFixedHeight(78);
   }
 
   connect(mListView,SIGNAL(selectionChanged(QListViewItem *)),
           SLOT(updateAttendeeInput()));
 
   QLabel *attendeeLabel = new QLabel(this);
   attendeeLabel->setText(i18n("Name:"));
   attendeeLabel->setFixedSize( attendeeLabel->sizeHint()  );
   mNameEdit = new QLineEdit(this);
   connect(mNameEdit,SIGNAL(textChanged(const QString &)),
           SLOT(updateAttendeeItem()));
 
   mUidEdit = new QLineEdit(0);
   mUidEdit->setText("");
 
   QLabel *emailLabel = new QLabel(this);
   emailLabel->setText(i18n("Email:"));
   mEmailEdit = new QLineEdit(this);
   connect(mEmailEdit,SIGNAL(textChanged(const QString &)),
           SLOT(updateAttendeeItem()));
 
   QLabel *attendeeRoleLabel = new QLabel(this);
   attendeeRoleLabel->setText(i18n("Role:"));
   mRoleCombo = new QComboBox(false,this);
   mRoleCombo->insertStringList(Attendee::roleList());
   connect(mRoleCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem()));
 
   QLabel *statusLabel = new QLabel(this);
   statusLabel->setText( i18n("Status:") );
 
   mStatusCombo = new QComboBox(false,this);
   mStatusCombo->insertStringList(Attendee::statusList());
   connect(mStatusCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem()));
 
   mRsvpButton = new QCheckBox(this);
   mRsvpButton->setText(i18n("Request response"));
   connect(mRsvpButton,SIGNAL(clicked()),SLOT(updateAttendeeItem()));
   QWidget *buttonBox = new QWidget(this);
   QVBoxLayout *buttonLayout = new QVBoxLayout(buttonBox);
 
   QPushButton *newButton = new QPushButton(i18n("&New"),buttonBox);
   buttonLayout->addWidget(newButton);
   connect(newButton,SIGNAL(clicked()),SLOT(addNewAttendee()));
 
   mRemoveButton = new QPushButton(i18n("&Remove"),buttonBox);
   buttonLayout->addWidget(mRemoveButton);
   connect(mRemoveButton, SIGNAL(clicked()),SLOT(removeAttendee()));
 
   mAddressBookButton = new QPushButton(i18n("Address &Book..."),this);
   // buttonLayout->addWidget(mAddressBookButton);
   connect(mAddressBookButton,SIGNAL(clicked()),SLOT(openAddressBook()));
   //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () );
 
   if (qApp->desktop()->width() < 640 ) {
       if ( qApp->desktop()->width() < 300 )
-      mListView->setFixedHeight(80);
+          topLayout->setSpacing(1);
+          ;//mListView->setFixedHeight(80);
       topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3);
       topLayout->addMultiCellWidget(mListView,1,1,0,3);
       topLayout->addWidget(attendeeLabel,3,0);
       topLayout->addMultiCellWidget(mNameEdit,3,3,1,2);
       topLayout->addWidget(emailLabel,4,0);
       topLayout->addMultiCellWidget(mEmailEdit,4,4,1,2);
       topLayout->addWidget(attendeeRoleLabel,5,0);
       topLayout->addMultiCellWidget(mRoleCombo,5,5,1,3);
       topLayout->addWidget(statusLabel,6,0);
       topLayout->addMultiCellWidget(mStatusCombo,6,6,1,3);
       topLayout->addMultiCellWidget(mAddressBookButton,2,2,2,3);
       topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1);
       topLayout->addMultiCellWidget(buttonBox,3,4,3,3);
       topLayout->setRowStretch(1,2);
       topLayout->setColStretch(0,0);
       topLayout->setColStretch(1,2);
       topLayout->setColStretch(2,1);
       topLayout->setColStretch(3,1);
 
   } else {
       topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,5);
       topLayout->addMultiCellWidget(mListView,1,1,0,5);
       topLayout->addWidget(attendeeLabel,3,0);
       topLayout->addMultiCellWidget(mNameEdit,3,3,1,4);
       topLayout->addWidget(emailLabel,4,0);
       topLayout->addMultiCellWidget(mEmailEdit,4,4,1,4);
       topLayout->addWidget(attendeeRoleLabel,5,0);
       topLayout->addMultiCellWidget(mRoleCombo,5,5,1,2);
       topLayout->addWidget(statusLabel,5,3);
       topLayout->addMultiCellWidget(mStatusCombo,5,5,4,5);
       topLayout->addMultiCellWidget(mAddressBookButton,2,2,4,5);
       topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1);
       topLayout->addMultiCellWidget(buttonBox,3,4,5,5);
       topLayout->setRowStretch(1,5);
       topLayout->setColStretch(0,0);
   }
 // #if 0
 //   topLayout->setColStretch(2,1);
 //   topLayout->addWidget(statusLabel,3,3);
 //   topLayout->addWidget(mStatusCombo,3,4);
 // #else
 //   topLayout->addWidget(statusLabel,4,3);
 //   // topLayout->addWidget(mStatusCombo,4,3);
 //   topLayout->addMultiCellWidget(mStatusCombo,4,4,4,5);
 
 // #endif
 //   // topLayout->setRowStretch(5,1);
 //   topLayout->addMultiCellWidget(mRsvpButton,5,5,0,1);
 //   topLayout->addMultiCellWidget(buttonBox,2,3,5,5);
 //   topLayout->setRowStretch(1,5);
 //   topLayout->setColStretch(0,0);
 
 #ifdef KORG_NOKABC
   mAddressBookButton->hide();
 #endif
 
   updateAttendeeInput();
 #ifndef DESKTOP_VERSION
 //US listen for arriving address resultsets
   connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)),
           this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&)));
 #endif
 
 }
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index b4fe965..f5eb52e 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -188,159 +188,159 @@ void KOEditorGeneral::initAlarm(QWidget *parent,QBoxLayout *topLayout)
     mAlarmIncrCombo = new QComboBox(false, parent);
     if ( QApplication::desktop()->width() < 320 ) {
         mAlarmIncrCombo->insertItem(i18n("min"));
         mAlarmIncrCombo->insertItem(i18n("hou"));
         mAlarmIncrCombo->insertItem(i18n("day"));
         mAlarmTimeEdit->setMaximumWidth( mAlarmTimeEdit->sizeHint().width() );
         mAlarmIncrCombo->setMaximumWidth( mAlarmIncrCombo->sizeHint().width() );
     } else {
         mAlarmIncrCombo->insertItem(i18n("minute(s)"));
         mAlarmIncrCombo->insertItem(i18n("hour(s)"));
         mAlarmIncrCombo->insertItem(i18n("day(s)"));
     }
 
     //  mAlarmIncrCombo->setMinimumHeight(20);
     alarmLayout->addWidget(mAlarmIncrCombo);
     mAlarmSoundButton = new QPushButton(parent);
     mAlarmSoundButton->setPixmap(SmallIcon("playsound"));
     mAlarmSoundButton->setToggleButton(true);
     QToolTip::add(mAlarmSoundButton, i18n("No sound set"));
     connect(mAlarmSoundButton, SIGNAL(clicked()), SLOT(pickAlarmSound()));
     alarmLayout->addWidget(mAlarmSoundButton);
 
     mAlarmProgramButton = new QPushButton(parent);
     mAlarmProgramButton->setPixmap(SmallIcon("run"));
     mAlarmProgramButton->setToggleButton(true);
     QToolTip::add(mAlarmProgramButton, i18n("No program set"));
     connect(mAlarmProgramButton, SIGNAL(clicked()), SLOT(pickAlarmProgram()));
     alarmLayout->addWidget(mAlarmProgramButton);
     mAlarmSoundButton->setMaximumWidth( mAlarmSoundButton->sizeHint().width() + 4 );
     mAlarmProgramButton->setMaximumWidth(mAlarmProgramButton->sizeHint().width() + 4 );
     //   if ( KOPrefs::instance()->mCompactDialogs ) {
     //     mAlarmSoundButton->hide();
     //     mAlarmProgramButton->hide();
     //   }
 }
 
 void KOEditorGeneral::pickAlarmSound()
 {
 
     //QString prefix = mAlarmSound;
     if (!mAlarmSoundButton->isOn()) {
         //mAlarmSound = "";
         QToolTip::remove(mAlarmSoundButton);
         QToolTip::add(mAlarmSoundButton, i18n("No sound set"));
         mAlarmProgramButton->setOn(true);
         mAlarmSoundButton->setOn(false);
     } else {
         QString fileName(KFileDialog::getOpenFileName(mAlarmSound,
                                                       i18n("*.wav|Wav Files"), 0));
         if (!fileName.isEmpty()) {
             mAlarmSound = fileName;
             QToolTip::remove(mAlarmSoundButton);
             QString dispStr = i18n("Playing '%1'").arg(fileName);
             QToolTip::add(mAlarmSoundButton, dispStr);
             mAlarmProgramButton->setOn(false);
             mAlarmSoundButton->setOn(true);
         } else {
             mAlarmProgramButton->setOn(true);
             mAlarmSoundButton->setOn(false);
            
         }
     }
    
     if (mAlarmProgramButton->isOn())
-        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + mAlarmProgram );
+        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
     if ( mAlarmSoundButton->isOn())
-        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio.Al.: ") + mAlarmSound );
+        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio.Al.: ") + getFittingPath(mAlarmSound) );
 }
 
 void KOEditorGeneral::pickAlarmProgram()
 {
     if (!mAlarmProgramButton->isOn()) {
         //mAlarmProgram = "";
         QToolTip::remove(mAlarmProgramButton);
         QToolTip::add(mAlarmProgramButton, i18n("No program set"));
         mAlarmProgramButton->setOn(false);
         mAlarmSoundButton->setOn(true);
     } else {
         QString fileName(KFileDialog::getOpenFileName(mAlarmProgram,i18n("Procedure Alarm.: ")  , 0));
         if (!fileName.isEmpty()) {
             mAlarmProgram = fileName;
             QToolTip::remove(mAlarmProgramButton);
             QString dispStr = i18n("Running '%1'").arg(fileName);
             QToolTip::add(mAlarmProgramButton, dispStr);
             mAlarmSoundButton->setOn(false);
             mAlarmProgramButton->setOn(true);
         }  else {
             mAlarmProgramButton->setOn(false);
             mAlarmSoundButton->setOn(true);
         }
     }
     if (mAlarmProgramButton->isOn())
-        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + mAlarmProgram );
+        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
     if ( mAlarmSoundButton->isOn())
-        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Sound.Al.: ") + mAlarmSound );
+        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Sound.Al.: ") + getFittingPath(mAlarmSound) );
 }
 
 
 QString KOEditorGeneral::getFittingPath( const QString  s ) 
 {
     int maxlen = 50;
     if ( QApplication::desktop()->width() < 640 ) {
         if ( QApplication::desktop()->width() < 320 )
             maxlen = 22;
         else
             maxlen = 35;
     }
     if ( s.length() > maxlen ) {
         return "..."+s.right(maxlen -3);
     }
     return s;
 }
 
 void KOEditorGeneral::enableAlarmEdit(bool enable)
 {
     if (  enable ) {
         if (!mAlarmProgramButton->isOn() && !mAlarmSoundButton->isOn()) {
             mAlarmSoundButton->setOn( true );
             if ( mAlarmSound.isEmpty() )
                 mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile;
             else {
                 if ( ! QFile::exists( mAlarmSound ) )
                     mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile;
             }
         }
         if (mAlarmProgramButton->isOn())
             ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
         if (!mAlarmSound.isEmpty() && mAlarmSoundButton->isOn())
             ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
     }
     else {
         ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Alarm disabled for this item"));
 
     }
     mAlarmTimeEdit->setEnabled(enable);
     mAlarmSoundButton->setEnabled(enable);
     mAlarmProgramButton->setEnabled(enable);
     mAlarmIncrCombo->setEnabled(enable);
 }
 
 void KOEditorGeneral::disableAlarmEdit(bool disable)
 {
     enableAlarmEdit( !disable );
 }
 
 void KOEditorGeneral::enableAlarm( bool enable )
 {
     enableAlarmEdit( enable );
 }
 
 void KOEditorGeneral::alarmDisable(bool disable)
 {
     if (!disable) {
         //mAlarmBell->setEnabled(true);
         mAlarmButton->setEnabled(true);
     } else {
         //mAlarmBell->setEnabled(false);
         mAlarmButton->setEnabled(false);
         mAlarmButton->setChecked(false);
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index ea73fd0..1b24f56 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -655,151 +655,149 @@ void KOPrefsDialog::setupViewsTab()
 
 
    topFrame = addPage(i18n("ViewChange"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,6,1);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
   ii = 0;
  
 
   dummy =
     addWidBool(i18n("Hold fullscreen on view change"),
                &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
   dummy =
     addWidBool(i18n("Hold non-fullscreen on view change"),
                &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
  KPrefsDialogWidBool *fullViewTodo =
       addWidBool(i18n("Event list view uses full window"),
                  &(KOPrefs::instance()->mFullViewTodo),topFrame);
   topLayout->addWidget(fullViewTodo->checkBox(),ii++,0);
 
   KPrefsDialogWidBool *fullViewMonth =
       addWidBool(i18n("Next days view uses full window"),
                  &(KOPrefs::instance()->mFullViewMonth),topFrame);
   topLayout->addWidget(fullViewMonth->checkBox(),ii++,0);
 
  dummy =
     addWidBool(i18n("Set agenda to DayBeginsAt on change"),
                &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
  dummy =
     addWidBool(i18n("Set agenda to current time on change"),
                &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
   dummy =
     addWidBool(i18n("Listview uses monthly timespan"),
                &(KOPrefs::instance()->mListViewMonthTimespan),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
  dummy  =
     addWidBool(i18n("Highlight selection in Time Edit"),
                &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame);
    topLayout->addWidget( dummy->checkBox(), ii++,0);
 
 
 
 
 
    topFrame = addPage(i18n("Month View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,5,1);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
   ii = 0;
   QLabel *lab;
   QHBox *habo = new QHBox( topFrame );
-  if ( QApplication::desktop()->width() < 320 ) {
+  if ( QApplication::desktop()->width() <= 480 ) {
       lab = new QLabel ( i18n("Show events that recur "), topFrame );
       topLayout->addMultiCellWidget(lab,ii, ii,0,1);
       ii++;
-      
   } else {
       new QLabel ( i18n("Show events that recur "), habo );
-
   }
   dailyRecur =
     addWidBool(i18n("daily"),
                &(KOPrefs::instance()->mMonthDailyRecur),habo);
   // topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
 
   weeklyRecur =
     addWidBool(i18n("weekly"),
                &(KOPrefs::instance()->mMonthWeeklyRecur),habo);
   topLayout->addMultiCellWidget(habo,ii, ii,0,1);
   ii++;
 
 
   habo = new QHBox( topFrame ); 
-  if ( QApplication::desktop()->width() < 320 ) {
+  if ( QApplication::desktop()->width() <= 480 ) {
       lab = new QLabel (i18n("Show in every cell ") , topFrame );
       topLayout->addMultiCellWidget(lab,ii, ii,0,1);
       ii++;
       
   } else {
       new QLabel ( i18n("Show in every cell "), habo );
   }
   weeklyRecur = 
     addWidBool(i18n("short month"),
                &(KOPrefs::instance()->mMonthShowShort),habo);
  weeklyRecur =
     addWidBool(i18n("icons"),
                &(KOPrefs::instance()->mMonthShowIcons),habo);
 
   topLayout->addMultiCellWidget(habo,ii, ii,0,1);
   ii++;
 #ifdef DESKTOP_VERSION
  KPrefsDialogWidBool *enableMonthScroll =
       addWidBool(i18n("Enable scrollbars in month view cells"),
                  &(KOPrefs::instance()->mEnableMonthScroll),topFrame);
   topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0);
 #endif
 
   dummy =
     addWidBool(i18n("Show Sat/Sun together"),
                &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
  KPrefsDialogWidBool *coloredCategoriesInMonthView =
        addWidBool(i18n("Month view uses category colors"),
                   &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame);
   topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 
 
   dummy =
     addWidBool(i18n("Categorie colors are applied to text"),
                &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
  coloredCategoriesInMonthView =
        addWidBool(i18n("Month view uses day colors"),
                   &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame);
   topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
 
  KPrefsDialogWidColor *holidayColor =
       addWidColor(i18n("Day color odd months"),
                   &(KOPrefs::instance()->mMonthViewOddColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
 
  holidayColor =
       addWidColor(i18n("Day color even months"),
                   &(KOPrefs::instance()->mMonthViewEvenColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
 
  
   holidayColor =
       addWidColor(i18n("Color for Sundays + category \"Holiday\""),
                   &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
   // *********************** What'sNext View
   topFrame = addPage(i18n("What's Next View"),0,0);
   //  DesktopIcon("viewmag",KIcon::SizeMedium));
   
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
@@ -55,139 +55,143 @@ $Id$
 #include <qlabel.h>
 #include <qfile.h>
 
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 
 #ifndef KAB_EMBEDDED
 #include <ktrader.h>
 #else // KAB_EMBEDDED
 #include <mergewidget.h>
 #include <distributionlistwidget.h>
 #endif // KAB_EMBEDDED
 
 #include "addresseewidget.h"
 #include "extensionconfigdialog.h"
 #include "extensionwidget.h"
 */
 
 #include "qapplication.h"
 
 #include "kpimglobalprefs.h"
 
 #include "kdepimconfigwidget.h"
 
 
 KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name )
   : KPrefsWidget(prefs, parent, name )
 {
   mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email"));
   mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone"));
   mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS"));
   mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax"));
   mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager"));
   mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP"));
 
 
   QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
                                             KDialog::spacingHint() );
 
   tabWidget = new QTabWidget( this );
   topLayout->addWidget( tabWidget );
 
 
   setupLocaleTab();
   setupLocaleDateTab();
   setupTimeZoneTab();
   setupExternalAppTab();
   setupStoreTab();
 
 }
 void KDEPIMConfigWidget::showTimeZoneTab()
 {
     tabWidget->setCurrentPage ( 3 ) ;
 }
 void KDEPIMConfigWidget::setupStoreTab()
 {
     QVBox *storePage = new QVBox( this );
     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  );
-    new QLabel( i18n("<b>Set new data storage dir:</b>"), storePage );
+    new QLabel( i18n("<b>New data storage dir:</b>"), storePage );
     mStoreUrl = new KURLRequester( storePage );
     mStoreUrl->setURL( KGlobal::dirs()->localkdedir() );
-    new QLabel( i18n("Not existing dirs are created automatically"), storePage  );
+    new QLabel( i18n("New dirs are created automatically"), storePage  );
     QHBox *bb = new QHBox( storePage );
-    QPushButton * pb = new QPushButton ( i18n("Save settings"), bb  );
+    QPushButton * pb;
+    if ( QApplication::desktop()->width() < 640 )
+        pb = new QPushButton ( i18n("Save"), bb  );
+    else
+        pb = new QPushButton ( i18n("Save settings"), bb  );
     connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) );
     pb = new QPushButton ( i18n("Save standard"), bb  );
     connect(pb, SIGNAL( clicked() ), this, SLOT ( setStandardStore() ) );
     new QLabel( i18n("<b>New settings are used\nafter a restart</b>"), storePage );
-    new QLabel( i18n("The settings of the storage\ndir is saved in the file\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage  );
+    new QLabel( i18n("Settings are stored in\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage  );
     tabWidget->addTab( storePage, i18n( "Data storage path" ) );
 }
 void KDEPIMConfigWidget::setStandardStore()
 {
     mStoreUrl->setURL(  QDir::homeDirPath() + "/kdepim"  );
     saveStoreSettings();
 }
 void KDEPIMConfigWidget::saveStoreSettings()
 {
     if ( !mStoreUrl->url().isEmpty() ) {
         KConfig cfg (   QDir::homeDirPath() + "/.microkdehome" );
         cfg.setGroup("Global");
         cfg.writeEntry( "MICROKDEHOME", mStoreUrl->url() ); 
         qDebug("cfg.writeEntry( MICROKDEHOME, mStoreUrl->url() );  ");
         cfg.sync();
     } else {
         mStoreUrl->setURL(  QDir::homeDirPath() + "/kdepim"  );
         saveStoreSettings();
     }
 }
 void KDEPIMConfigWidget::setupExternalAppTab()
 {
   QWidget *externalAppsPage = new QWidget( this );
   QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(),
                                             KDialog::spacingHintSmall() );
 
   mExternalApps = new QComboBox( externalAppsPage );
 
   QMap<ExternalAppHandler::Types, QString>::Iterator it;
   for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it )
     mExternalApps->insertItem( it.data(), it.key() );
 
   layout->addWidget( mExternalApps );
 
   connect( mExternalApps, SIGNAL( activated( int ) ),
            this, SLOT (externalapp_changed( int ) ) );
 
 
   mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage );
   QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2,    -1, "gridlayout" );
   mExternalAppGroupBox->layout()->setMargin(5);
 
   mClient = new QComboBox( mExternalAppGroupBox );
   boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 );
 
   connect( mClient, SIGNAL( activated( int ) ),
            this, SLOT (client_changed( int ) ) );
 
   QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox);
   boxLayout->addWidget( lab, 1, 0 );
   mChannel = new QLineEdit(mExternalAppGroupBox);
   mChannel->setReadOnly(true);
   boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 );
 
   lab = new QLabel( i18n("Message:"), mExternalAppGroupBox);
   boxLayout->addWidget( lab, 3, 0 );
   mMessage = new QLineEdit(mExternalAppGroupBox);
   mMessage->setReadOnly(true);
   boxLayout->addWidget( mMessage , 4, 0);
 
   lab = new QLabel( i18n("Parameters:"), mExternalAppGroupBox);
   boxLayout->addWidget( lab, 3, 1 );
   mParameters = new QLineEdit(mExternalAppGroupBox);
   mParameters->setReadOnly(true);
diff --git a/version b/version
index b972ae7..628b450 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.0.0";
+version = "2.0.1";