mv dk da

31 files changed, 1625 insertions, 467 deletions

diff --git a/i18n/fr/addressbook.ts b/i18n/fr/addressbook.ts
index f97a6f0..64bb3ab 100644
--- a/i18n/fr/addressbook.ts
+++ b/i18n/fr/addressbook.ts
@@ -48,300 +48,418 @@
     <message>
         <source>Gender</source>
         <translation>Genre</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation>Configurer les champs</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation>Sélectionner l&apos;ordre des champs :</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Monter</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Descendre</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contacts</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contact</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trouver</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Ecrire un email à</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Entrée</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Mes informations personnelles</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
-        <translation>Configurer les champs</translation>
+        <translation type="obsolete">Configurer les champs</translation>
     </message>
     <message>
         <source>Out of Space</source>
-        <translation>Plus de mémoire disponible</translation>
+        <translation type="obsolete">Plus de mémoire disponible</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
-        <translation>Pas assez d&apos;espace disponible 
+        <translation type="obsolete">Pas assez d&apos;espace disponible 
 pour créer les fichiers de démarrage
 
 Libérer de la mémoire avant de pouvoir
 saisir des données !</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossible d&apos;accéder aux données, synchronisation en cours</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editer mes informations personnelles</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editer une adresse</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contacts - Mes informations personnelles</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Plus de mémoire disponible</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossible d&apos;enregistrer les informations
 Libérer de la mémoire
 et réessayer
 
 Quitter ?</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Titre</translation>
+        <translation type="obsolete">Titre</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notes</translation>
+        <translation type="obsolete">Notes</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Bureau</translation>
+        <translation type="obsolete">Bureau</translation>
     </message>
     <message>
         <source>Mb</source>
-        <translation>Mo</translation>
+        <translation type="obsolete">Mo</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Prénom</translation>
+        <translation type="obsolete">Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Nom</translation>
+        <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Lister sous</translation>
+        <translation type="obsolete">Lister sous</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Email par défaut</translation>
+        <translation type="obsolete">Email par défaut</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Genre</translation>
+        <translation type="obsolete">Genre</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vide</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Petit</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grand</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importer une vCard</translation>
     </message>
+    <message>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save all Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OContacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to find a contact for this</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search pattern !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list. Wrap around now.. !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Email Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDlg_Base</name>
+    <message>
+        <source>MyDialog1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Query Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Regular Expressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Wildcards (*,?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Wrap Around</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer QT-Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer Opie-Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notice: QT-Mail is just 
+provided in the SHARP 
+default ROM. Opie-Mail 
+is provided free !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation>Email par défaut</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Emails</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Titre</translation>
+        <translation type="obsolete">Titre</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Prénom</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Second prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffixe</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Lister sous</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Genre</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Fonction</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Société</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notes</translation>
+        <translation type="obsolete">Notes</translation>
     </message>
     <message>
         <source>Groups</source>
-        <translation>Groupes</translation>
+        <translation type="obsolete">Groupes</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Ville</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Département</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Pays</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nom complet...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisation</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notes...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Maison</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Code postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Etats Unies</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Grande Bretagne</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japon</translation>
     </message>
     <message>
         <source>France</source>
         <translation>France</translation>
@@ -1163,176 +1281,180 @@ Quitter ?</translation>
         <translation>Viet Nam</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Iles Vierges</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Sahara Occidental</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Yemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Yougoslavie</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambie</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax (Bureau)</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax (Domicile)</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Téléphone (Bureau)</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Téléphone (Domicile)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Portable (Bureau)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Portable (Domicile)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Page web (Bureau)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Page web (Domicile)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pager (Bureau)</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Rue (Bureau)</translation>
+        <translation type="obsolete">Rue (Bureau)</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Rue (Domicile)</translation>
+        <translation type="obsolete">Rue (Domicile)</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Ville (Bureau)</translation>
+        <translation type="obsolete">Ville (Bureau)</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Département (Bureau)</translation>
+        <translation type="obsolete">Département (Bureau)</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Code postal (Bureau)</translation>
+        <translation type="obsolete">Code postal (Bureau)</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>Pays (Bureau)</translation>
+        <translation type="obsolete">Pays (Bureau)</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Ville (Domicile)</translation>
+        <translation type="obsolete">Ville (Domicile)</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Département (Domicile)</translation>
+        <translation type="obsolete">Département (Domicile)</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Code postal (Domicile)</translation>
+        <translation type="obsolete">Code postal (Domicile)</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>Pays (Domicile)</translation>
+        <translation type="obsolete">Pays (Domicile)</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Département</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profession</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistant</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Responsable</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Epouse</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Date de naissance</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversaire</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Surnom</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Enfants</translation>
     </message>
     <message>
         <source>Work Phone</source>
-        <translation>Téléphone (Bureau)</translation>
+        <translation type="obsolete">Téléphone (Bureau)</translation>
     </message>
     <message>
         <source>Work Fax</source>
-        <translation>Fax (Bureau)</translation>
+        <translation type="obsolete">Fax (Bureau)</translation>
     </message>
     <message>
         <source>work Mobile</source>
-        <translation>Portable (Bureau)</translation>
+        <translation type="obsolete">Portable (Bureau)</translation>
     </message>
     <message>
         <source>Work Pager</source>
-        <translation>Pager (Bureau)</translation>
+        <translation type="obsolete">Pager (Bureau)</translation>
     </message>
     <message>
         <source>Work Web Page</source>
-        <translation>Page web (Bureau)</translation>
+        <translation type="obsolete">Page web (Bureau)</translation>
     </message>
     <message>
         <source>Work Mobile</source>
-        <translation>Portable (Bureau)</translation>
+        <translation type="obsolete">Portable (Bureau)</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgystan</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/advancedfm.ts b/i18n/fr/advancedfm.ts
index 7a1fcf8..7255eeb 100644
--- a/i18n/fr/advancedfm.ts
+++ b/i18n/fr/advancedfm.ts
@@ -60,198 +60,202 @@
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Voulez-vous vraiment effacer</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Impossible de renommer</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Répertoire inexistant</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Copier sous</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Sortie d&apos;AdvancedFm</translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation>la commande n&apos;a pas fonctionnée !</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>A traduire</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Envoie Ir.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
-        <translation type="obsolete">Changer de répertoire</translation>
+        <translation type="unfinished">Changer de répertoire</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Exécuter</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Ouvrir comme texte</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Créer un lien symbolique</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Déplacer</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Information sur le fichier</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Définir les droits</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriétés</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>A traduire</translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation>existe déjà
 Souhaitez-vous vraiment l&apos;effacer ?</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Copier</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Sous</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copier le même répertoire</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Sauvegarder la sortie dans un fichier</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Définir les droits</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Définir les droits pour :</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propriétaire</translation>
     </message>
     <message>
         <source>group</source>
         <translation>groupe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>autres</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propriétaire</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Groupe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lire</translation>
     </message>
     <message>
         <source>write</source>
         <translation>écrire</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>exécuter</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/checkbook.ts b/i18n/fr/checkbook.ts
index 78f2c2f..b00d8db 100644
--- a/i18n/fr/checkbook.ts
+++ b/i18n/fr/checkbook.ts
@@ -1,295 +1,445 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QCheckDetailsBase</name>
+    <name>Checkbook</name>
     <message>
-        <source>Transaction Details</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntry</name>
     <message>
-        <source>Automobile</source>
+        <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntryBase</name>
     <message>
-        <source>Account Transaction</source>
+        <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$</source>
+        <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>This is a listing of all transactions entered for this checkbook.
+
+To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check Number:</source>
+        <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Extra Fee:</source>
+        <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Additional Notes:</source>
+        <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Date:</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Select a checkbook and then click here to edit it.
+
+You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Payment</source>
+        <source>Select a checkbook and then click here delete it.
+
+You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckGraphBase</name>
     <message>
-        <source>Account Graph</source>
+        <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QCheckDetailsBase</name>
+</context>
+<context>
+    <name>QCheckEntry</name>
+</context>
+<context>
+    <name>QCheckEntryBase</name>
+</context>
+<context>
+    <name>QCheckGraphBase</name>
 </context>
 <context>
     <name>QCheckMMBase</name>
+</context>
+<context>
+    <name>QCheckNameBase</name>
+</context>
+<context>
+    <name>QCheckViewBase</name>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Main Menu</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckNameBase</name>
     <message>
-        <source>Check Book Name</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name...</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please name your check book (limit: 15 characters):</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Done</source>
+        <source>Select date of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckViewBase</name>
     <message>
-        <source>Account Transactions</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$0.00</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Balance:</source>
+        <source>Enter description of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction category here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Out of Space</source>
+        <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
+        <source>Enter any fee amount assoiciated with this transaction.
 
-Please free up some space and
-try again.</source>
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eletronics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/citytime.ts b/i18n/fr/citytime.ts
index e47bf91..437c17a 100644
--- a/i18n/fr/citytime.ts
+++ b/i18n/fr/citytime.ts
@@ -1,52 +1,68 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation>Changement d&apos;horaire</translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation>Il a eu un problème dans la mise en place de la zone de temps %1</translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation>Restaurer la zone de temps</translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation>Il a eu un problème dans la mise en place de la zone de temps. Votre horloge n&apos;est sans doute pas bonne...</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation>City Time</translation>
     </message>
+    <message>
+        <source>Click on one of the set cities to replace it</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation>Ville</translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation>Impossible de trouver les informations des zones de temps</translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation>&lt;p&gt;Impossible de trouver les informations de zones de temps dans %1</translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation>Impossible de trouver la carte</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation>&lt;p&gt;Impossible de charger la carte : %1, sortie de l&apos;application</translation>
     </message>
+    <message>
+        <source>Continent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a continent/country here, then select a city</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/embeddedkonsole.ts b/i18n/fr/embeddedkonsole.ts
index 73c8ab8..983b6bd 100644
--- a/i18n/fr/embeddedkonsole.ts
+++ b/i18n/fr/embeddedkonsole.ts
@@ -130,84 +130,92 @@
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta sur bleue</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cyan sur blanc</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Blanc sur cyan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Bleue sur noir</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ambre sur noir</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Edition rapide</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Gauche</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Droite</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barre de défilement</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Afficher la liste des commandes</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Cacher la liste des commandes</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personaliser</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Beep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Sélection de la commande</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Ajouter une commande</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Entrer la commande à ajouter :</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/keypebble.ts b/i18n/fr/keypebble.ts
index e1e27aa..c951968 100644
--- a/i18n/fr/keypebble.ts
+++ b/i18n/fr/keypebble.ts
@@ -85,157 +85,201 @@ to this account, please try later.</source>
 sous ce compte, essayez plus tard.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Echec du login</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Trop d&apos;échecs</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>Visualisateur VNC</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Plein écran</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Déconnecté</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Cesser le mode &quot;plein écran&quot;</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Connecté à l&apos;hôte distant</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Loggé sur l&apos;hôte distant</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Connection terminée</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished">Mot de passe :</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation type="unfinished">Hôte :</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation type="unfinished">Numéro de &quot;display&quot; :</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation type="unfinished">Vérifier la mise à jour de l&apos;écran toutes les :</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation type="unfinished">Millisecondes</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished">Demande de session &quot;8 bits&quot;</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished">Réveil à la cloche</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation type="unfinished">Demande de session partagée</translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation type="unfinished">Encodage Hextile</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation type="unfinished">Encodage CoRRE</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation type="unfinished">Encodage RRE</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation type="unfinished">Copier l&apos;encodage rectangle</translation>
     </message>
+    <message>
+        <source>The password of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle obscuring the password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The display number of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between requesting updates from the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/kpacman.ts b/i18n/fr/kpacman.ts
index b40c4f0..fb73268 100644
--- a/i18n/fr/kpacman.ts
+++ b/i18n/fr/kpacman.ts
@@ -146,109 +146,87 @@ or is of an unknown format.</source>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You&apos;re going to create the highscore-file
-&apos;%1&apos;
-for your maschine, that should be used systemwide.
-
-To grant access to the other users, set the appropriate rights (a+w)
-on that file or ask your systemadministator for that favor.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>You&apos;re using a private highscore-file, that&apos;s mostly because of
-missing write-access to the systemwide file
-&apos;%1&apos; .
-
-Ask your systemadministrator for granting you access to that file,
-by setting the appropriate rights (a+w) on it.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/language.ts b/i18n/fr/language.ts
index cde5005..bf64bb9 100644
--- a/i18n/fr/language.ts
+++ b/i18n/fr/language.ts
@@ -1,14 +1,25 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>LanguageSettings</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Language</source>
         <translation>Langue</translation>
     </message>
     <message>
         <source>Select language</source>
         <translation>Sélectionner une langue</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libmetal.ts b/i18n/fr/libmetal.ts
index 8225ce0..343131d 100644
--- a/i18n/fr/libmetal.ts
+++ b/i18n/fr/libmetal.ts
@@ -1,22 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Metal</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Metal style</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Metal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libopie.ts b/i18n/fr/libopie.ts
index f0ba700..77657ad 100644
--- a/i18n/fr/libopie.ts
+++ b/i18n/fr/libopie.ts
@@ -1,209 +1,292 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ColorPopupMenu</name>
     <message>
         <source>More</source>
-        <translation>Suite</translation>
+        <translation type="obsolete">Suite</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Suite...</translation>
+        <translation type="obsolete">Suite...</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
-        <translation>Teinte :</translation>
+        <translation type="obsolete">Teinte :</translation>
     </message>
     <message>
         <source>Sat:</source>
-        <translation>Saturation :</translation>
+        <translation type="obsolete">Saturation :</translation>
     </message>
     <message>
         <source>Val:</source>
-        <translation>Valeur :</translation>
+        <translation type="obsolete">Valeur :</translation>
     </message>
     <message>
         <source>Red:</source>
-        <translation>Rouge :</translation>
+        <translation type="obsolete">Rouge :</translation>
     </message>
     <message>
         <source>Green:</source>
-        <translation>Vert :</translation>
+        <translation type="obsolete">Vert :</translation>
     </message>
     <message>
         <source>Blue:</source>
-        <translation>Bleu :</translation>
+        <translation type="obsolete">Bleu :</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
-        <translation>Canal alpha :</translation>
+        <translation type="obsolete">Canal alpha :</translation>
     </message>
     <message>
         <source>Select color</source>
-        <translation>Sélectionner une couleur</translation>
+        <translation type="obsolete">Sélectionner une couleur</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>Boite de dialogue de fichiers</translation>
+        <translation type="obsolete">Boite de dialogue de fichiers</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Ouvrir</translation>
+        <translation type="obsolete">Ouvrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Sauver</translation>
+        <translation type="obsolete">Sauver</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
-        <translation>Documents</translation>
+        <translation type="obsolete">Documents</translation>
     </message>
     <message>
         <source>Files</source>
-        <translation>Fichiers</translation>
+        <translation type="obsolete">Fichiers</translation>
     </message>
     <message>
         <source>All Files</source>
-        <translation>Tous les fichiers</translation>
+        <translation type="obsolete">Tous les fichiers</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Tout</translation>
+        <translation type="obsolete">Tout</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation>Nom :</translation>
+        <translation type="obsolete">Nom :</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sauver</translation>
+        <translation type="obsolete">&amp;Sauver</translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
-        <translation>&amp;Annuler</translation>
+        <translation type="obsolete">&amp;Annuler</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Nom</translation>
+        <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Taille</translation>
+        <translation type="obsolete">Taille</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Date</translation>
+        <translation type="obsolete">Date</translation>
     </message>
     <message>
         <source>Mime Type</source>
-        <translation>Type Mime</translation>
+        <translation type="obsolete">Type Mime</translation>
     </message>
     <message>
         <source>Ser Permission</source>
-        <translation>Définir les droits</translation>
+        <translation type="obsolete">Définir les droits</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Effacer</translation>
+        <translation type="obsolete">Effacer</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>Voulez-vous vraiment effacer
+        <translation type="obsolete">Voulez-vous vraiment effacer
 </translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Oui</translation>
+        <translation type="obsolete">Oui</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Non</translation>
+        <translation type="obsolete">Non</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
-        <translation>Grand</translation>
+        <translation type="obsolete">Grand</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation>Moyen</translation>
+        <translation type="obsolete">Moyen</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation>Petit</translation>
+        <translation type="obsolete">Petit</translation>
     </message>
 </context>
 <context>
     <name>OFontSelector</name>
     <message>
-        <source>Style</source>
+        <source>Size</source>
+        <translation type="obsolete">Taille</translation>
+    </message>
+</context>
+<context>
+    <name>ORecurranceBase</name>
+    <message>
+        <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
-        <translation type="unfinished">Taille</translation>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End On:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No End Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>TimePicker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
-        <translation>Résumé :</translation>
+        <translation type="obsolete">Résumé :</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Description :</translation>
+        <translation type="obsolete">Description :</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation>Priorité :</translation>
+        <translation type="obsolete">Priorité :</translation>
     </message>
     <message>
         <source>Progress:</source>
-        <translation>Progression :</translation>
+        <translation type="obsolete">Progression :</translation>
     </message>
     <message>
         <source>Deadline:</source>
-        <translation>Date de fin :</translation>
+        <translation type="obsolete">Date de fin :</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Catégorie :</translation>
+        <translation type="obsolete">Catégorie :</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libqdvorak.ts b/i18n/fr/libqdvorak.ts
index a5e2858..a128522 100644
--- a/i18n/fr/libqdvorak.ts
+++ b/i18n/fr/libqdvorak.ts
@@ -1,3 +1,10 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libqhandwriting.ts b/i18n/fr/libqhandwriting.ts
index 093ec02..fcd17e2 100644
--- a/i18n/fr/libqhandwriting.ts
+++ b/i18n/fr/libqhandwriting.ts
@@ -1,133 +1,167 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation>Aide de la reconnaissance d&apos;écriture</translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation>&lt;ul&gt;&lt;li&gt;Lorsque vous commencez à utiliser la reconnaissance d&apos;écriture, écrivez lentement, avec précision et franchement.&lt;li&gt;Utilisez les guides pour dessinervos caractères.&lt;li&gt;Lorsque vous dessiner un caractère avec plusieurs traits, chaque trait doit avoir été dessiné avant la disparition des traits précédents qui apparaissent en grisés.&lt;li&gt;Entrainez-vous à écrire.&lt;li&gt;Lorsque vous créer vos propres formes de caractères, assurez vous qu&apos;elles sont suffisament différentes des autres formes.&lt;/ul&gt;</translation>
     </message>
     <message>
         <source>Tips</source>
         <translation>Astuces</translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation>Entrainement</translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
         <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
-        <translation>Sélectionner un caractère dans la liste. La one d&apos;écriture à gauche présente les caractères de référence. Entrainez-vous à écrire sur la zone à droite.</translation>
+        <translation type="obsolete">Sélectionner un caractère dans la liste. La one d&apos;écriture à gauche présente les caractères de référence. Entrainez-vous à écrire sur la zone à droite.</translation>
     </message>
     <message>
         <source>Matched: </source>
         <translation>Ressemblance :</translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation>Similaire à :</translation>
     </message>
     <message>
         <source>%1%</source>
         <translation>%1%</translation>
     </message>
+    <message>
+        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation>Nouveau...</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Enlever</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Par défaut</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInput</name>
+    <message>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation>Entrée un nouveau caractère</translation>
     </message>
+    <message>
+        <source>Character:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation>Délais d&apos;écriture des caractères multi-trait :</translation>
     </message>
     <message>
         <source>ms</source>
         <translation>ms</translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation>Affichage des zones d&apos;écriture</translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation>Zones majuscule et minuscule</translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation>Zone minuscule (enlever la zone majuscule)</translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation>Paramètrage de la reconnaissance d&apos;écriture</translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation>Profile du caractère :</translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation>Péférences</translation>
     </message>
     <message>
         <source>Customize</source>
         <translation>Personnaliser</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Plus de mémoire</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Enregistrement des informations
 Impossible.
 Libérer de la mémoire et réessayer.
 
diff --git a/i18n/fr/libqjumpx.ts b/i18n/fr/libqjumpx.ts
index 4eb9e18..80ea414 100644
--- a/i18n/fr/libqjumpx.ts
+++ b/i18n/fr/libqjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libqkeyboard.ts b/i18n/fr/libqkeyboard.ts
index 4eb9e18..318758e 100644
--- a/i18n/fr/libqkeyboard.ts
+++ b/i18n/fr/libqkeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libqkjumpx.ts b/i18n/fr/libqkjumpx.ts
index 4eb9e18..964d5dc 100644
--- a/i18n/fr/libqkjumpx.ts
+++ b/i18n/fr/libqkjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libqpe.ts b/i18n/fr/libqpe.ts
index 7219b7b..4607963 100644
--- a/i18n/fr/libqpe.ts
+++ b/i18n/fr/libqpe.ts
@@ -271,163 +271,163 @@ est en train d&apos;éditer les catégories.</translation>
     <message>
         <source>Copy of </source>
         <translation>Copie de</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliquer</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Echec de la copie de fichier.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Echec du déplacement du fichier.</translation>
     </message>
     <message>
         <source>File does not exist.</source>
         <translation type="obsolete">Le fichier n&apos;existe pas.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished">Détails</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Effacer</translation>
     </message>
     <message>
-        <source>Del Icon</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use custom rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -800,105 +800,121 @@ Free some memory and try again.</source>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>MMC Card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>TimeZoneSelector</name>
+    <message>
+        <source>citytime executable not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to choose the time zones,
+please install citytime.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libqpickboard.ts b/i18n/fr/libqpickboard.ts
index 4eb9e18..488fb8f 100644
--- a/i18n/fr/libqpickboard.ts
+++ b/i18n/fr/libqpickboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libqunikeyboard.ts b/i18n/fr/libqunikeyboard.ts
index 4eb9e18..6966daa 100644
--- a/i18n/fr/libqunikeyboard.ts
+++ b/i18n/fr/libqunikeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libtheme.ts b/i18n/fr/libtheme.ts
index 16fa6e1..7a8a6d4 100644
--- a/i18n/fr/libtheme.ts
+++ b/i18n/fr/libtheme.ts
@@ -1,49 +1,39 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Themed style</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the theme to be used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[No theme]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/light-and-power.ts b/i18n/fr/light-and-power.ts
index 44dfa2f..80d23a3 100644
--- a/i18n/fr/light-and-power.ts
+++ b/i18n/fr/light-and-power.ts
@@ -1,53 +1,151 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>LightSettingsBase</name>
+    <name>Calibration</name>
     <message>
-        <source>Adjust to environment</source>
+        <source>%1 Steps</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LightSettingsBase</name>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Power saving</source>
+        <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light off after</source>
+        <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dim light after</source>
+        <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend after</source>
+        <source>Light and Power Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Light Sensor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bright</source>
+        <source>Advanced settings for light sensor handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
+        <source>on AC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warnings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low power warning interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>very low battery warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>critical power warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SensorBase</name>
+    <message>
+        <source>Sensor Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only deactivate LCD during Suspend</source>
+        <source>Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light and Power Settings</source>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/mediummount.ts b/i18n/fr/mediummount.ts
index 4f9e4a1..dba8eda 100644
--- a/i18n/fr/mediummount.ts
+++ b/i18n/fr/mediummount.ts
@@ -1,87 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/opieplayer.ts b/i18n/fr/opieplayer.ts
index 6431f8d..925daba 100644
--- a/i18n/fr/opieplayer.ts
+++ b/i18n/fr/opieplayer.ts
@@ -7,258 +7,258 @@ your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Export playlist to m3u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/oxygen.ts b/i18n/fr/oxygen.ts
index 8bd0f80..a06cb8f 100644
--- a/i18n/fr/oxygen.ts
+++ b/i18n/fr/oxygen.ts
@@ -1,100 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
-        <source>Calculations</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Molweight</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Formula:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Result:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Elemental composition (%):</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Nernst</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
diff --git a/i18n/fr/qpe.ts b/i18n/fr/qpe.ts
index 357c8b8..d5f6e32 100644
--- a/i18n/fr/qpe.ts
+++ b/i18n/fr/qpe.ts
@@ -1,17 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AppMonitor</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CategoryTabWidget</name>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopApplication</name>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery is running very low.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <source>Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>%1 files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All types of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountGui</name>
+    <message>
+        <source>Medium inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit search to dir: (not used yet)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your decision will be stored on the medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do not ask again for this medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownImpl</name>
+    <message>
+        <source>Shut down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reboot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutdown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/sheetqt.ts b/i18n/fr/sheetqt.ts
index 299ca20..dcf5b0e 100644
--- a/i18n/fr/sheetqt.ts
+++ b/i18n/fr/sheetqt.ts
@@ -607,197 +607,197 @@
         <source>Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help file not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Number of rows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Descending</source>
diff --git a/i18n/fr/showimg.ts b/i18n/fr/showimg.ts
index c42e7d7..8f08d9e 100644
--- a/i18n/fr/showimg.ts
+++ b/i18n/fr/showimg.ts
@@ -3,121 +3,156 @@
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Slideshow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Preferences..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Image Info ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Slide show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/sound.ts b/i18n/fr/sound.ts
index cc385a9..559bf2b 100644
--- a/i18n/fr/sound.ts
+++ b/i18n/fr/sound.ts
@@ -1,123 +1,119 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
         <source>Shows icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>11025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>22050</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>44100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vmemo Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>33075</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key_Escape</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Key_Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Calender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/fr/systemtime.ts b/i18n/fr/systemtime.ts
index b100610..ca10683 100644
--- a/i18n/fr/systemtime.ts
+++ b/i18n/fr/systemtime.ts
@@ -1,72 +1,254 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>SetDateTime</name>
+    <name>Ntp</name>
+    <message>
+        <source>time.fu-berlin.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rerun NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NtpBase</name>
+    <message>
+        <source>Network Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>Set System Time</source>
+        <source>nan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Time Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Esimated Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mean shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP server to get the time from the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes until</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP tries to syncronises the clock with the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insure a delay of</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>a new NTP lookup will be used to predict the time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SetDateTime</name>
+    <message>
         <source>Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
diff --git a/i18n/fr/textedit.ts b/i18n/fr/textedit.ts
index 2e03f75..110b81e 100644
--- a/i18n/fr/textedit.ts
+++ b/i18n/fr/textedit.ts
@@ -1,302 +1,261 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
-        <source>Font Dialog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Size</source>
         <translation type="obsolete">Taille</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="obsolete">Fonte</translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation type="obsolete">Style Fonte</translation>
     </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation type="unfinished">Nouveau</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">Ouvrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished">Enregistrer</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished">Enregistrer Sous</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished">Couper</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished">Copier</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished">Coller</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished">Chercher...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bold</source>
         <translation type="obsolete">Gras</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="obsolete">Italique</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished">Fichier</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Edition</translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Effacer</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished">Editeur Texte</translation>
     </message>
     <message>
-        <source>Unnamed</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Font</source>
         <translation type="unfinished">Fonte</translation>
     </message>
     <message>
-        <source>Permissions</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced features</source>
+        <source>Advanced Features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Text Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="obsolete"></translation>
+        <source>Prompt on Exit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="obsolete"></translation>
+        <source>Always open linked file</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
-        <translation type="obsolete"></translation>
+        <source>File Permissions</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished">propriétaire</translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished">groupe</translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished">Propriétaire</translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished">Groupe</translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished">lectire</translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished">écriture</translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/fr/today.ts b/i18n/fr/today.ts
index 3a162ff..63e671c 100644
--- a/i18n/fr/today.ts
+++ b/i18n/fr/today.ts
@@ -1,166 +1,120 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No active tasks</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No appointments today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No more appointments today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
-        <source>Opiemail not installed</source>
-        <translation type="obsolete"></translation>
+        <source>Today</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation type="obsolete"></translation>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today&#xb2;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>todayconfig</name>
-    <message>
-        <source>Today config</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Should the 
-location 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
     <message>
-        <source>Should the notes 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Show only later
-appointments</source>
-        <translation type="obsolete"></translation>
+        <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calendar</source>
-        <translation type="obsolete"></translation>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many
-tasks should 
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tasks</source>
-        <translation type="obsolete"></translation>
+        <source>Icon size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip after how
-many letters</source>
-        <translation type="obsolete"></translation>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
-        <translation type="obsolete"></translation>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Should today be
-autostarted on
-resume? (Opie only)</source>
-        <translation type="obsolete"></translation>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Activate the  
-autostart after how
-many minutes?</source>
-        <translation type="obsolete"></translation>
+        <source>never</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>todayconfig</name>
+</context>
 </TS>
diff --git a/i18n/fr/todolist.ts b/i18n/fr/todolist.ts
index 79e60a4..abfe54e 100644
--- a/i18n/fr/todolist.ts
+++ b/i18n/fr/todolist.ts
@@ -1,217 +1,460 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>NewTaskDialog</name>
+    <name>MainWindow</name>
     <message>
-        <source>Todo List</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NewTaskDialogBase</name>
     <message>
-        <source>New Task</source>
+        <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Priority:</source>
+        <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 - Very High</source>
+        <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 - High</source>
+        <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 - Normal</source>
+        <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 - Low</source>
+        <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>5 - Very Low</source>
+        <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Completed</source>
+        <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D&amp;ue</source>
+        <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 Jan 2001</source>
+        <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Summary:</source>
+        <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Progress:</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>0%</source>
+        <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>20%</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>40%</source>
+        <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>60%</source>
+        <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>80%</source>
+        <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoTable</name>
+    <name>NewTaskDialog</name>
+</context>
+<context>
+    <name>NewTaskDialogBase</name>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Overview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reminders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X-Ref</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deadline</source>
+        <source> day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoWindow</name>
+    <name>TaskEditorAdvanced</name>
     <message>
-        <source>Todo</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of Space</source>
+        <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to create startup files
-Free up some space
-before you enter any data</source>
+        <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Task</source>
+        <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</source>
+        <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Completed tasks</source>
+        <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
+        <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
+        <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
+        <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
+        <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
     <message>
-        <source>Show Deadline</source>
+        <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
+        <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fonts</source>
+        <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View Task</source>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete...</source>
+        <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
     <message>
-        <source>Delete all...</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 - Very High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 - High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 - Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4 - Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5 - Very Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>20 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>40 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>60 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>80 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>100 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Due Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2002</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2001</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>work on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>buy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>organize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>get</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Enable Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorOverViewImpl</name>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialog</name>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TemplateDialogImpl</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateEditor</name>
     <message>
-        <source>all tasks</source>
+        <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TodoTable</name>
+</context>
+<context>
+    <name>TodoWindow</name>
+</context>
 </TS>