2 files changed, 13 insertions, 4 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index fdcfab1..41b2a81 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,64 +1,73 @@
 Info about the changes in new versions of KDE-Pim/Pi
+********** VERSION 2.1.3 ************
+Changed the menu structure of the alarm applet:
+Moved "Simulate" to " Play Beeps" submenu and re-added "Todo List".
+Fixed several problems in the KA/Pi CSV import dialog:
+Added "Category", made codec configureable and made it possible to map many fields to the "Note" field.
 ********** VERSION 2.1.2 ************
 Fixed a problem closing the alarm dialog on Zaurus with "OK" button.
 Fixed a problem when importing data from Outlook with mutiple categories set.
 Changed display of days in datenavigator:
 Birthdays are now blue, not dark green.
 When todo view is shown, no birtdays are shown and days with due todos are shown blue.
 When journal view is shown, only holidays are shown and days with journals are blue. 
 Added Backup options to global config:
 You can create now x-daily backups for KO/Pi, KA/Pi (for file resources only, file resource is the standard type) and PwM/Pi ( all files you will open ). 
 It is recommended to use another HDD/Memory card for the backup directory. If (very useful on the Zaurus) the specified backup directory does not exist you are asked if you want to try again to create a backup. That makes it possible to insert your memory card in the Zaurus and then trying again.
 The backup is created when the application wants to save for the first time on a backup-day. You can specify the amount of backups and the day interval of backups.
 ********** VERSION 2.1.1 ************
 Stable release 2.1.1!
 KO/Pi:
 Fixed one problem in the layout of the edit dialogs on the Zaurus with 640x480 display.
 ********** VERSION 2.1.0 ************
 Stable release 2.1.0!
 Summary of changes/fixes compared to version 2.0.6:
 Many bugs of version 2.0.6 fixed.
 Most of them were small bugs, but some of them were important.
 It is recommended to use version 2.1.0 and not version 2.0.6.
 Important changes:
 Added recurring todos to KO/Pi.
 Added global application font settings (for all KDE-Pim/Pi apps) to the general settings.
 Made Passwordmanager PwM/Pi more userfriendly: Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more.
 Datenavigator can now display many months. Very useful on the desktop.
 KO/Pi alarm applet changed: Made buttons in alarm dialog much bigger and other usebility enhancements.
 Made alarm sound working on Linux desktop.
 Made KO/Pi and KA/Pi running from a memory stick. Please read storage HowTo for details.
 Added timetracking feature in KO/Pi todo view. Please read timetraker HowTo for details.
 Many other usebility enhancements.
 Special thanks to Ben for his suggestions!
 You can find the complete changelog 
 from version 1.7.7 to  2.1.0 
 in the source package or on 
 http://www.pi-sync.net/html/changelog.html
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index ef4ab3f..899203e 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -192,217 +192,217 @@
 { "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." },
 { "Sync file \n...%1\ndoes not exist!\nNothing synced!\n","Sync Datei \n...%1\nexistiert nicht!\nNichts wurde gesynced!\n" },
 { "Sync filename(*.ics/*.vcs)","Sync Dateiname(*.ics/*.vcs)" },
 { "Enter password","Passwort eingeben" },
 { "Do you really want\nto remote sync\nwith profile \n","Wollen Sie wirklich\nmit dem entfernten\nProfil syncen: \n" },
 { "Copy remote file to local machine...","Kopiere entfernte Datei auf lokalen Rechner..." },
 { "Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n","Sorry, das Kopierkommando schlug fehl!\nKommando war:\n%1\n \nVersuche Kommando von Kosole um\nDetails f�r das Fehlschlagen\nzu erfahren.\n" },
 { "Writing back file result: ","Resultat des Dateizur�ckschreibens: " },
 { "Syncronization sucessfully completed","Synchronisation erfolgreich abgeschlossen" },
 { "Used %1 Client","Benutzter %1 Client" },
 { "No email client installed","Kein Email Klient installiert" },
 { "Userdefined email client","Benutzerdef. Email Klient" },
 { "OM/Pi email client","OM/Pi Email Klient" },
 { "Include in multiple ","Beziehe in mehrfach " },
 { "calendar  ","Kalender  " },
 { "addressbook  ","Adressbuch  " },
 { "pwmanager","PWmanager" },
 { " sync"," Sync ein" },
 { "Write back synced data","Schreibe gesyncte Daten zur�ck" },
 { "-- Write back (on remote) existing entries only","-- Schreibe nur existierende (entfernte) Eintr�ge zur�ck" },
 { "-- Write back (calendar) entries in future only","-- Schreibe nur zuk�nftige Kalender-Eintr�ge zur�ck" },
 { "---- Max. weeks in future: ","---- Max. wochen in der Zukunft: " },
 { "Pi-Sync ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync ( direktes Kx/Pi zu Kx/Pi sync )" },
 { "Mobile device (cell phone)","Mobiles Ger�t (Handy)" },
 { "Help...","Hilfe..." },
 { "Local file Cal:","Lokale Datei Kal:" },
 { "Local file ABook:","Lokale Datei ABuch:" },
 { "Local file PWMgr:","Lokale Datei PWMgr:" },
 { "Addressbook file (*.vcf) is used by KA/Pi","Adressbuch Datei (*.vcf) wird von KA/Pi genutzt" },
 { "Calendar:","Kalender:" },
 { "AddressBook:","AdressBuch:" },
 { "PWManager:","PWManager:" },
 { "Addressbook file is used by KA/Pi","Adressbuch Datei wird von KA/Pi genutzt" },
 { "ssh/scp","ssh/scp" },
 { "ftp","ftp" },
 { "Password for remote access: (could be the same for each)","Passwort f�r entfernten Zugriff: (kann dasselbe sein f�r alle)" },
 { "Remote IP address: (could be the same for each)","Entfernte IP Adresse: (kann dasselbe sein f�r alle)" },
 { "Remote port number: (should be different for each)","Entfernte Port Nummer: (Sollte f�r alle unterschiedlich sein)" },
 { "command for downloading remote file to local device","Kommando zum Download der entfernten Datei zum lokalen Ger�t" },
 { "command for uploading local temp file to remote device","Kommando zum Upload der lokalen temp. Datei zum entfernten Ger�t" },
 { "Insert device where\nphone is connected. E.g.:\n","F�ge Device ein, an dem\ndas Handy angeschlossen ist. Z.B.:\n" },
 { "KDE-Pim sync config","KDE-Pim sync Konfig" },
 { "Insert kind of connection,e.g.:\n","F�ge Art der Verbindung ein,z.B.:\n" },
 { "Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n","Empfohlen: Leer lassen!\n(So dass das Model\nautomatisch erkannt\nwerden kann)\nOder f�ge Model Name ein:\n" },
 { "Port number (Default: %1)","Port Nummer (Default: %1)" },
 { "Password to enable\naccess from remote:","Passwort um entfernten\nZugriff zuzulassen:" },
 { "Automatically start\nat application startup","Starte automatisch\nbeim Programmstart" },
 { "Automatically sync\nwith KDE-Desktop","Automatischer Sync\nmit dem KDE-Desktop" },
 { "Enter port for Pi-Sync","Port Nummer f�r Pi-Sync" },
 { "Disable Pi-Sync","Schalte Pi-Sync aus" },
 { "Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!","Wollen Sie wirklich\nmit allen selektierten\nProfilen \"Multi-Syncen\"?\nDas Syncen dauert einige Zeit -\nalle Profile werden zweimal gesynct!" },
 { "KDE-Pim Sync","KDE-Pim Sync" },
 { "Multiple profiles","Multi-Sync Profile" },
 { "Device: ","Ger�t: " },
 { "Multiple sync started.","Multi-Sync gestartet." },
 { "Nothing synced! No profiles defined for multisync!","Nichts gesynct! Keine Profile\nselektiert f�r Multi-Sync" },
 { "KDE-Pim sync config","KDE-Pim Sync Konfig" },
 { "Insert kind of connection,e.g.:\n","F�ge Art der Verbindung ein, z.B.:\n" },
 { "Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n","Empfohlen: Leer lassen!\n(So dass das Modell\nautomatisch\erkannt\nwerden kann)\nOder f�ge Model Name ein:\n" },
 { "KO/Pi config error","KO/Pi Konfig. Fehler" },
 { "Local device name undefined!\nPlease define device name!","Name dieses Ger�tes undefiniert!\nBitte Namen angeben!" },
 { "Edit Address Book Filters","Editiere Addressbuch Filter" },
 { "&Add...","Hinzuf�gen..." },
 { "&Edit...","B&earbeiten..." },
 { "&Remove","Entfe&rne" },
 { "Modify View: ","Ansicht �ndern: " },
 { "Fields","Felder" },
 { "Select Fields to Display","W�hle anzuzeigende Felder" },
 { "All","Alles" },
 { "Frequent","Frequent" },
 { "Address","Adresse" },
 { "Email","E-Mail" },
 { "Personal","Pers�nl." },
 { "Organization","Organisation" },
 { "Custom","Benutzerdefiniert" },
 { "&Selected\nfields:","&Selektierte\nFelder:" },
 { "Formatted Name","Format. Name" },
 { "Additional Names","Mittelname" },
-{ "Honorific Prefixes","Namen Prefix" },
+{ "Honorific Prefixes","Namensprefix" },
-{ "Honorific Suffixes","Namen Suffix" },
+{ "Honorific Suffixes","Namenssuffix" },
-{ "Nick Name","Sptitzname" },
+{ "Nick Name","Spitzname" },
 { "Birthday","Geburtstag" },
 { "Home Address Street","Privat Adresse Strasse" },
 { "Home Address Locality","Privat Adresse Stadt" },
 { "Home Address Region","Privat Adresse Bundesland" },
 { "Home Address Postal Code","Privat Adresse PLZ" },
 { "Home Address Country","Privat Adresse Land" },
 { "Home Address Label","Privat Adresse Label" },
 { "Business Address Street","B�ro Adresse Strasse" },
 { "Business Address Locality","B�ro Adresse Stadt" },
 { "Business Address Region","B�ro Adresse Bundesland" },
 { "Business Address Postal Code","B�ro Adresse PLZ" },
 { "Business Address Country","B�ro Adresse Land" },
 { "Business Address Label","B�ro Adresse Label" },
 { "Home Phone","Privat Telefon" },
 { "Business Phone","B�ro Telefon" },
 { "Mobile Phone","Handy" },
 { "Home Fax","Privat Fax" },
 { "Business Fax","B�ro Fax" },
 { "Car Phone","Autotelefon" },
 { "ISDN","ISDN" },
 { "Pager","Pager" },
-{ "Mail Client","Mail Client" },
+{ "Mail Client","Mail Klient" },
 { "Title","Titel" },
 { "Role","Rolle" },
 { "Note","Notiz" },
 { "URL","URL" },
 { "Resource","Resource" },
 { "SIP","SIP" },
 { "Default Filter","Default Filter" },
 { "The default filter will be activated whenever this view is displayed. This feature allows you to configure views that only interact with certain types of information based on the filter. Once the view is activated, the filter can be changed at anytime.","#The default filter will be activated whenever this view is displayed. This feature allows you to configure views that only interact with certain types of information based on the filter. Once the view is activated, the filter can be changed at anytime." },
 { "No default filter","Kein default Filter" },
 { "Use last active filter","Nutze letzen aktiven Filter" },
 { "Use filter:","Nutze Filter:" },
 { "Look & Feel","Look & Feel" },
 { "Row Separator","Reihen Separator" },
 { "Alternating backgrounds","Abwechselnder Hintergrund" },
 { "Single line","Einzelne Zeile" },
 { "Enable background image:","Hintergrundbild:" },
 { "Enable contact tooltips","Contact Tooltips" },
 { "&Enable custom Colors","Benutzerdef. Farben" },
 { "&Colors","Farben" },
 { "If custom colors are enabled, you may choose the colors for the view below. Otherwise colors from your current KDE color scheme are used.","#If custom colors are enabled, you may choose the colors for the view below. Otherwise colors from your current KDE color scheme are used." },
 { "Double click or press RETURN on a item to select a color for the related strings in the view.","#Double click or press RETURN on a item to select a color for the related strings in the view." },
 { "&Enable custom fonts","B&enutzerdefinierte Schriften" },
 { "&Text font:","Textschriftart:" },
 { "&Header font:","Titelschriftart:" },
 { "If custom fonts are enabled, you may choose which fonts to use for this view below. Otherwise the default KDE font will be used, in bold style for the header and normal style for the data.","#If custom fonts are enabled, you may choose which fonts to use for this view below. Otherwise the default KDE font will be used, in bold style for the header and normal style for the data." },
 { "&Fonts","Schri&ften" },
 { "Background Color","Hintergrundfarbe" },
 { "Text Color","Textfarbe" },
 { "Header Background Color","Titel Hintergrundfarbe" },
 { "Header Text Color","Titel Farbe" },
 { "Highlight Color","Auswahlfarbe" },
 { "Highlighted Text Color","Auswahltextfarbe" },
 { "Alternating Background Color","Abwechselnder Hintergrundfarbe" },
 { "Postal","Post" },
 { "Dr.","Dr." },
 { "Miss","Frl." },
 { "Mr.","Herr" },
 { "Mrs.","Frau" },
 { "Ms.","Fr." },
 { "Prof.","Prof." },
 { "I","I" },
 { "II","II" },
 { "III","III" },
 { "Jr.","Jr." },
 { "Sr.","Sr." },
 { "Name:","Name:" },
 { "Documents","Dokumente" },
 { "Files","Dateien" },
 { "All Files","Alle Dateien" },
 { "Name","Name" },
 { "Size","Gr��e" },
 { "Date","Datum" },
 { "Mime Type","Mime Typ" },
 { "Geo Data Input","Geo Dateneingabe" },
 { "Sexagesimal","Sexagesimal" },
 { "North","Nord" },
 { "South","S�d" },
 { "East","Ost" },
 { "West","West" },
 { "Undefined","Unbestimmt" },
 { "Edit Address","Bearbeite Adresse" },
 { "Street:","Strasse:" },
 { "Post office box:","Postfach:" },
 { "Locality:","Stadt:" },
 { "Region:","Region:" },
 { "Postal code:","PLZ:" },
 { "Country:","Staat:" },
 { "This is the preferred address","Dies ist die bevorzugte Adresse" },
 { "New...","Neu..." },
 { "Change Type","�ndere Art" },
 { "Edit Address Type","�ndere Address Art" },
 { "Address Types","Address Art" },
 { "Domestic","Inland" },
 { "International","International" },
 { "Parcel","Paket" },
 { "Edit Contact Name","�ndere Kontakt Name" },
 { "Honorific prefixes:","Namensprefixes:" },
 { "Given name:","Vorname:" },
 { "Additional names:","Mittelnamen:" },
 { "Family names:","Nachname:" },
 { "Honorific suffixes:","Namenssuffixe:" },
 { "Parse name automatically","Setze Namen automatisch" },
 { "Edit Phone Numbers","Bearbeite Telefonnummern" },
 { "Number","Nummer" },
 { "Type","Typ" },
 { "Edit Phone Number","Bearbeite Telefonnummer" },
 { "Number:","Nummer:" },
 { "This is the preferred phone number","Dies ist die bevorzugte Telefonnummer" },
 { "Types","Typen" },
 { "Messenger","Messenger" },
 { "Other","Anderes" },
 { "Video","Video" },
 { "Mailbox","Mailbox" },
 { "Modem","Modem" },
 { "Car","Auto" },
 { "PCS","PCS" },