30 files changed, 12 insertions, 975 deletions

diff --git a/i18n/fr/addressbook.ts b/i18n/fr/addressbook.ts
index aaf18dd..768c467 100644
--- a/i18n/fr/addressbook.ts
+++ b/i18n/fr/addressbook.ts
@@ -42,484 +42,444 @@
         <translation>Email par défaut</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <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 mail</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>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Plus d&apos;espace 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 
 pour créer les fichiers de démarrage
 
 Libérer de la mémoire pour
 entrer 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 d&apos;espace 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>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Travail</translation>
     </message>
     <message>
         <source>Mb</source>
         <translation>Mo</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Lister sous</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Email par défaut</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>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>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
-        <source>Fax</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Phone</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>IM</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Mobile</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Pager</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <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>
     </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>Titre</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Société</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Groupes</translation>
     </message>
     <message>
-        <source>Street</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Street 2</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>P.O. Box</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>City</source>
         <translation>Ville</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Département</translation>
     </message>
     <message>
-        <source>Zip</source>
-        <translation type="obsolete"></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>Travail</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domicile</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>
     </message>
     <message>
         <source>Germany</source>
         <translation>Allemagne</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norvège</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculin</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminin</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Entrer une note</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editer le nom</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contacts</translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation>Afganistan</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanie</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algérie</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>American Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorre</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation>Antartique</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentine</translation>
     </message>
     <message>
         <source>Armania</source>
         <translation>Arménie</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australie</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Autriche</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbaijan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahreïn</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbade</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Biélorussie</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgique</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermudes</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhoutan</translation>
     </message>
     <message>
         <source>Boliva</source>
         <translation>Bolivie</translation>
     </message>
     <message>
diff --git a/i18n/fr/appearance.ts b/i18n/fr/appearance.ts
index 38d1bda..01b4b82 100644
--- a/i18n/fr/appearance.ts
+++ b/i18n/fr/appearance.ts
@@ -1,259 +1,110 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation>Apparence</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Style</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Théme actuel</translation>
     </message>
     <message>
-        <source>More</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Load</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Save</source>
         <translation>Sauver</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation>Explorer...</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fond d&apos;écran</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation>Editer le thème actuel...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Voulez-vous vraiment effeacer</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Effacer le thème</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Impossible d&apos;effacer le thème actuel.</translation>
     </message>
     <message>
-        <source>Do you want to apply your changes?
-</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Select</source>
         <translation>Sélectionner</translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation>Activer l&apos;image de fond</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Réglage par défaut</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Voix ambiguë d&apos;un coeur qui au zéphyr préfère les jattes de kiwis</translation>
     </message>
     <message>
         <source>Apply</source>
         <translation>Appliquer</translation>
     </message>
     <message>
         <source>Restart</source>
         <translation>Redémarer</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation>Souhaitez-vous redémarrer Opie maintenant ?</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>Préférences...</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editer le thème</translation>
     </message>
-    <message>
-        <source>More</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
-<context>
-    <name>QColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
-<context>
-    <name>fileBrowser</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Documents</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Hidden files</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Type: %1</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Change Directory</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Make Directory</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Rescan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Note</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Could not rename</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Do you really want to delete
-</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source> ?
-It must be empty</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/fr/calculator.ts b/i18n/fr/calculator.ts
index b1c9285..3708d7b 100644
--- a/i18n/fr/calculator.ts
+++ b/i18n/fr/calculator.ts
@@ -1,133 +1,133 @@
 <!DOCTYPE TS><TS>
-<codec>iso8859-1</codec>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calculator</name>
     <message>
         <source>Experimental Calculator</source>
         <translation>Calculatrice expérimentale</translation>
     </message>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Calculator</source>
         <translation>Calculatrice</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/citytime.ts b/i18n/fr/citytime.ts
index 9319bfc..25c5945 100644
--- a/i18n/fr/citytime.ts
+++ b/i18n/fr/citytime.ts
@@ -1,100 +1,100 @@
 <!DOCTYPE TS><TS>
-<codec>iso8859-1</codec>
+<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 %l</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 heure est sans doute mauvaise...</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation>City Time</translation>
     </message>
     <message>
         <source>&lt;location 4&gt;</source>
         <translation>&lt;location 4&gt;</translation>
     </message>
     <message>
         <source>&lt;CITY 6 TIME&gt;</source>
         <translation>&lt;CITY 6 TIME&gt;</translation>
     </message>
     <message>
         <source>&lt;location 5&gt;</source>
         <translation>&lt;location 5&gt;</translation>
     </message>
     <message>
         <source>&lt;location 2&gt;</source>
         <translation>&lt;location 2&gt;</translation>
     </message>
     <message>
         <source>&lt;location 6&gt;</source>
         <translation>&lt;location 6&gt;</translation>
     </message>
     <message>
         <source>&lt;CITY 5 TIME&gt;</source>
         <translation>&lt;CITY 5 TIME&gt;</translation>
     </message>
     <message>
         <source>&lt;CITY 2 TIME&gt;</source>
         <translation>&lt;CITY 2 TIME&gt;</translation>
     </message>
     <message>
         <source>&lt;CITY 1 TIME&gt;</source>
         <translation>&lt;CITY 1 TIME&gt;</translation>
     </message>
     <message>
         <source>&lt;location 3&gt;</source>
         <translation>&lt;location 3&gt;</translation>
     </message>
     <message>
         <source>&lt;location 1&gt;</source>
         <translation>&lt;location 1&gt;</translation>
     </message>
     <message>
         <source>&lt;CITY 3 TIME&gt;</source>
         <translation>&lt;CITY 3 TIME&gt;</translation>
     </message>
     <message>
         <source>&lt;CITY 4 TIME&gt;</source>
         <translation>&lt;CITY 4 TIME&gt;</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 de zone 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 zone de temps dans %l</translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation>Impossible de toruver 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 : %l, sortie de l&apos;application</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/clock.ts b/i18n/fr/clock.ts
index 2a1fbc7..35b8a02 100644
--- a/i18n/fr/clock.ts
+++ b/i18n/fr/clock.ts
@@ -1,98 +1,90 @@
 <!DOCTYPE TS><TS>
-<codec>iso8859-1</codec>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation>Faire du bruit</translation>
     </message>
     <message>
         <source>Clock</source>
         <translation>Horloge</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>Arréter</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Démarrer</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Mettre à zéro</translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation>Définir l&apos;alarme</translation>
     </message>
     <message>
-        <source>Alarm On</source>
-        <translation type='obsolete'></translation>
-    </message>
-    <message>
-        <source>Alarm Off</source>
-        <translation type='obsolete'></translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>Arréter</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Alarm Is On</source>
         <translation>L&apos;alarme est activée</translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
         <translation>L&apos;alarme est désactivée</translation>
     </message>
     <message>
         <source>Set date and time.</source>
         <translation>Paramètrer la date et l&apos;heure.</translation>
     </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation>Définir l&apos;alarme</translation>
     </message>
     <message>
         <source>Hour</source>
         <translation>Heure</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minute</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>Matin</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>Après-midi</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation>Faire du bruit</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
         <translation>alarme mp3</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/datebook.ts b/i18n/fr/datebook.ts
index b72ec10..9439e9c 100644
--- a/i18n/fr/datebook.ts
+++ b/i18n/fr/datebook.ts
@@ -1,768 +1,741 @@
 <!DOCTYPE TS><TS>
-<codec>iso8859-1</codec>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Clendrier</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Préférences</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Aujourd&apos;hui</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semaine</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Liste des jours</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mois</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trouver</translation>
     </message>
     <message>
         <source>Alarm and Start Time...</source>
         <translation>Alarm et date de déclenchement...</translation>
     </message>
     <message>
         <source>Default View</source>
         <translation>Vue par défaut</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>La durée de l&apos;événement est peut-être plus longue
 que l&apos;intervalle entre les répétitions.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossible d&apos;accéder au donnée, synchronisation en cours</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Editer un événement</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>minutes)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Plus de mémoire libre</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>L&apos;application n&apos;a pas été capable de sauver
 vos modifications.
 Libérer de l&apos;espace et réessayer.
 
 Quitter ?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(inconnu)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Erreur !</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>A modifier</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuer</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
-        <source>Form1</source>
-        <translation type='obsolete'></translation>
-    </message>
-    <message>
         <source>M</source>
         <translation>L</translation>
     </message>
     <message>
         <source>T</source>
         <translation>M</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>V</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lundi</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Mardi</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercredi</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jeudi</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vendredi</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samedi</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Dimanche</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Début</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Beam</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>C&apos;est un événement qui dure toute la journée.</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 Après-midi</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 Matin</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>Après-midi</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>Matin</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Voir les événements</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Date de début :</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Paramètres de l&apos;alarme</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Paramètres par défaut de l&apos;alarme</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minutes</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Autre</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Style des colonnes :</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Par défaut</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Moyen</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grand</translation>
     </message>
     <message>
         <source>Jump to current time (dayview)</source>
         <translation>Aller à aujourd&apos;hui (vue du jour)</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>C&apos;est un événement qui dure toute la journée.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Form1</source>
-        <translation type='obsolete'></translation>
-    </message>
-    <message>
         <source>Y: </source>
         <translation>Y :</translation>
     </message>
     <message>
         <source>W: </source>
         <translation>W :</translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
-    <name>DateBookWeekLstDayHdrBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type='obsolete'></translation>
-    </message>
-</context>
-<context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
-        <source>Form2</source>
-        <translation type='obsolete'></translation>
-    </message>
-    <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>00 Jan-00 Jan</source>
         <translation>00 Jan-00 Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation>L</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation>M</translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
         <translation>J</translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
         <translation>V</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
         <translation>S</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
         <translation>D</translation>
     </message>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Calendrier</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Répéter...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Quotidin...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Hbdomadaire...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mensuel...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Annuel...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Pas de répétition...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Date de début</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Date de fin</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nouvel événement</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Rendez-vous</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Déjeuné</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Diné</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Voyage</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type='obsolete'></translation>
-    </message>
-    <message>
         <source>Office</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Maison</translation>
     </message>
     <message>
-        <source>Start - End</source>
-        <translation type='obsolete'></translation>
-    </message>
-    <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Date de début</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Toute la journée</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zone de temps</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarme</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minutes</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Silencieux</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Fort</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Répéter</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Pas de répétition...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Description</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Début - fin</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Notes...</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Editer la note</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Lunch</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Début</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 tout</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Tout les %1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Les %1 %1 de chaque</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lundi</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Mardi</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercredi</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jeudi</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vendredi</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samedi</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Dimanche</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>er</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>ème</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>ème</translation>
     </message>
     <message>
         <source>th</source>
         <translation>ème</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Pas de répétition</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>jour(s)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semaine(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Répéter</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>année(s)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>jours</translation>
     </message>
     <message>
         <source>day</source>
         <translation>jour</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semaines</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semaine</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>year</source>
         <translation>année</translation>
     </message>
     <message>
         <source> and </source>
         <translation>et</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 et</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, et</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Répétition des événements</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semaine</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mois</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>année</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Tout :</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Fréquence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Fin le :</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Pas de date de fin</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Répéter le</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Jeu</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sam</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dim</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>years</source>
         <translation>années</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/drawpad.ts b/i18n/fr/drawpad.ts
index 37c23e8..05158b7 100644
--- a/i18n/fr/drawpad.ts
+++ b/i18n/fr/drawpad.ts
@@ -1,472 +1,352 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
         <translation>Supprimer tout</translation>
     </message>
     <message>
         <source>Import</source>
         <translation>Importer</translation>
     </message>
     <message>
         <source>Import...</source>
         <translation>Importer...</translation>
     </message>
     <message>
         <source>Export</source>
         <translation>Exporter</translation>
     </message>
     <message>
         <source>Export...</source>
         <translation>Exporter...</translation>
     </message>
     <message>
         <source>Tools</source>
         <translation>Outils</translation>
     </message>
     <message>
         <source>New Page</source>
         <translation>Nouvelle page</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Effacer la page</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Supprimer la page</translation>
     </message>
     <message>
         <source>Undo</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>Redo</source>
         <translation>Refaire</translation>
     </message>
     <message>
         <source>First Page</source>
         <translation>Premiere page</translation>
     </message>
     <message>
         <source>Previous Page</source>
         <translation>Page précédente</translation>
     </message>
     <message>
         <source>Next Page</source>
         <translation>Page suivante</translation>
     </message>
     <message>
         <source>Last Page</source>
         <translation>Dernière page</translation>
     </message>
     <message>
         <source>Draw Point</source>
         <translation>Dessiner un point</translation>
     </message>
     <message>
         <source>Draw Line</source>
         <translation>Dessiner une ligne</translation>
     </message>
     <message>
         <source>Draw Rectangle</source>
         <translation>Dessiner un rectangle</translation>
     </message>
     <message>
         <source>Draw Filled Rectangle</source>
         <translation>Dessiner un rectangle rempli</translation>
     </message>
     <message>
         <source>Draw Ellipse</source>
         <translation>Dessiner une ellipse</translation>
     </message>
     <message>
         <source>Draw Filled Ellipse</source>
         <translation>Desinner une ellipse remplie</translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation>Remplir une région</translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation>Effacer un point</translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation>Largeur du pinceau</translation>
     </message>
     <message>
-        <source>More</source>
-        <translation type="obsolete">Plus</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Plus...</translation>
-    </message>
-    <message>
         <source>Pen Color</source>
         <translation>Couleur du pinceau</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Couleur de remplissage</translation>
     </message>
     <message>
         <source>DrawPad</source>
         <translation>DrawPad</translation>
     </message>
     <message>
         <source>Page</source>
         <translation>Page</translation>
     </message>
     <message>
         <source>Insert Text</source>
         <translation>Insérer un texte</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Vue d&apos;ensemble</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation>Vue d&apos;ensemble...</translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation>Informations sur la page</translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation>Informations sur la page...</translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation>Voulez-vous effacer
 la page actuelle ?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation>Voulez-vous supprimer
 la page actuelle ?</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation>Voulez-vous supprimer
 toutes les pages ?</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation>Anti-crénelage</translation>
     </message>
 </context>
 <context>
-    <name>DrawPadCanvas</name>
-    <message>
-        <source>Delete All</source>
-        <translation type="obsolete">Supprimer tout</translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-all the pages?</source>
-        <translation type="obsolete">Voulez-vous supprimer
-toutes les pages ?</translation>
-    </message>
-    <message>
-        <source>Clear Page</source>
-        <translation type="obsolete">Effacer la page</translation>
-    </message>
-    <message>
-        <source>Do you want to clear
-the current page?</source>
-        <translation type="obsolete">Voulez-vous effacer
-la page actuelle ?</translation>
-    </message>
-    <message>
-        <source>Delete Page</source>
-        <translation type="obsolete">Supprimer la page</translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-the current page?</source>
-        <translation type="obsolete">Voulez-vous supprimer
-la page actuelle ?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Oui</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete">Non</translation>
-    </message>
-</context>
-<context>
     <name>ExportDialog</name>
     <message>
-        <source>Export</source>
-        <translation type="obsolete">Exporter</translation>
-    </message>
-    <message>
         <source>Page Selection</source>
         <translation>Sélection des pages</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Toutes</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>En cours</translation>
     </message>
     <message>
         <source>Range</source>
         <translation>Plage</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>A :</translation>
     </message>
     <message>
         <source>Export As</source>
         <translation>Exporter sous</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nom :</translation>
     </message>
     <message>
         <source>Format:</source>
         <translation>Format :</translation>
     </message>
     <message>
         <source>DrawPad - Export</source>
         <translation>DrawPad - Exporter</translation>
     </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
-        <source>Import</source>
-        <translation type="obsolete">Importer</translation>
-    </message>
-    <message>
         <source>Automatic preview</source>
         <translation>Aperçu automatique</translation>
     </message>
     <message>
         <source>Preview</source>
         <translation>Aperçu</translation>
     </message>
     <message>
         <source>DrawPad - Import</source>
         <translation>DrawPad - Importer</translation>
     </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
         <translation>Nouvelle page</translation>
     </message>
     <message>
-        <source>Page Size</source>
-        <translation type="obsolete">Dimension de la page</translation>
-    </message>
-    <message>
-        <source>Width :</source>
-        <translation type="obsolete">Largeur :</translation>
-    </message>
-    <message>
-        <source>Height :</source>
-        <translation type="obsolete">Hauteur :</translation>
-    </message>
-    <message>
-        <source>Contents</source>
-        <translation type="obsolete">Contenu</translation>
-    </message>
-    <message>
         <source>White</source>
         <translation>Blanc</translation>
     </message>
     <message>
-        <source>Foreground Color</source>
-        <translation type="obsolete">Couleur Avant Plan</translation>
-    </message>
-    <message>
-        <source>Background Color</source>
-        <translation type="obsolete">Couleur Arrière Plan</translation>
-    </message>
-    <message>
         <source>Background</source>
         <translation>Fond</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Couleur du pinceau</translation>
     </message>
     <message>
-        <source>Brush Color</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Fill Color</source>
         <translation>Couleur  de remplissage</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>Titre :</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Largeur :</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Hauteur :</translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
         <translation>Informations sur la page</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>Titre :</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Date :</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Largeur :</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Hauteur :</translation>
     </message>
 </context>
 <context>
-    <name>QColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Rouge</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Vert</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Bleu</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
         <source>Title:</source>
         <translation>Titre :</translation>
     </message>
     <message>
         <source>Dimension:</source>
         <translation>Dimensions :</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Date :</translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation>Insérer un texte</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation>DrawPad - Vue d&apos;ensemble</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Effacer la page</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation>Voulez-vous effacer
 la page sélectionnée ?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Supprimer la page</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation>Voulez-vous supprimer
 la page sélectionnée ?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/embeddedkonsole.ts b/i18n/fr/embeddedkonsole.ts
index b13a765..30e12d0 100644
--- a/i18n/fr/embeddedkonsole.ts
+++ b/i18n/fr/embeddedkonsole.ts
@@ -1,194 +1,194 @@
 <!DOCTYPE TS><TS>
-<codec>iso8859-1</codec>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Sélection de la commande</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Commandes</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Commandes&lt;/B&gt; :</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Commandes suggérées&lt;/B&gt; :</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Petite à chasse fixe</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Moyenne à chasse fixe</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Entrée</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espace</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tabulation</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Monter</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Descendre</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Coller</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>Tabs on Bottom</source>
         <translation>Tabs en bas</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Vert sur noir</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Noir sur blanc</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Blanc sur noir</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Noir sur transparent</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Noir sur rouge</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Rouge sur noir</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Vert sur jaune</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Bleue sur magenta</translation>
     </message>
     <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>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
diff --git a/i18n/fr/kcheckers.ts b/i18n/fr/kcheckers.ts
index 991aff6..01e6872 100644
--- a/i18n/fr/kcheckers.ts
+++ b/i18n/fr/kcheckers.ts
@@ -1,197 +1,129 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KCheckers</name>
     <message>
-        <source>New</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Beginner</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Novice</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Expert</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>English Rules</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Russian Rules</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Marble Board</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Wooden Board</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>What&apos;s This</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About KCheckers</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>About &amp;Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Game</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Skill</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congratulation! You have won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have lost. Game over.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect course.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Undo Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Beginner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Novice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Good</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Expert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Master</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Show Numeration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;English Rules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Russian Rules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Green Board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Marble Board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Wooden Board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Rules of Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;About KCheckers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Skill</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> New Game </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Undo Move </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Rules of Play </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libcardmonapplet.ts b/i18n/fr/libcardmonapplet.ts
index 15e4ff1..441a701 100644
--- a/i18n/fr/libcardmonapplet.ts
+++ b/i18n/fr/libcardmonapplet.ts
@@ -1,61 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
-        <source>Eject card</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>CardMonitor</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Card eject failed!</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Eject SD/ MMC card</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Eject %1 (0)</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Eject %1 (1)</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New card: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject SD/MMC card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libirdaapplet.ts b/i18n/fr/libirdaapplet.ts
index a064746..1000064 100644
--- a/i18n/fr/libirdaapplet.ts
+++ b/i18n/fr/libirdaapplet.ts
@@ -1,45 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IrdaApplet</name>
     <message>
         <source>Discovered Device:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Disable IrDA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable IrDA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Discovery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Discovery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Receive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Receive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Found:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lost:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libqdvorak.ts b/i18n/fr/libqdvorak.ts
index 73ca4bd..4eb9e18 100644
--- a/i18n/fr/libqdvorak.ts
+++ b/i18n/fr/libqdvorak.ts
@@ -1,9 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Dvorak</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/fr/libqhandwriting.ts b/i18n/fr/libqhandwriting.ts
index a043161..e7358b9 100644
--- a/i18n/fr/libqhandwriting.ts
+++ b/i18n/fr/libqhandwriting.ts
@@ -1,139 +1,132 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Matched: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1%</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InputMethods</name>
-    <message>
-        <source>Handwriting</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
-<context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libqjumpx.ts b/i18n/fr/libqjumpx.ts
index 8fb21eb..4eb9e18 100644
--- a/i18n/fr/libqjumpx.ts
+++ b/i18n/fr/libqjumpx.ts
@@ -1,9 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>JumpX</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/fr/libqkeyboard.ts b/i18n/fr/libqkeyboard.ts
index edc0a1e..4eb9e18 100644
--- a/i18n/fr/libqkeyboard.ts
+++ b/i18n/fr/libqkeyboard.ts
@@ -1,9 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Keyboard</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/fr/libqkjumpx.ts b/i18n/fr/libqkjumpx.ts
index 9a77bb9..4eb9e18 100644
--- a/i18n/fr/libqkjumpx.ts
+++ b/i18n/fr/libqkjumpx.ts
@@ -1,9 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>KJumpX</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/fr/libqpickboard.ts b/i18n/fr/libqpickboard.ts
index 067c90b..4eb9e18 100644
--- a/i18n/fr/libqpickboard.ts
+++ b/i18n/fr/libqpickboard.ts
@@ -1,9 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Pickboard</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/fr/libqunikeyboard.ts b/i18n/fr/libqunikeyboard.ts
index c2e304c..4eb9e18 100644
--- a/i18n/fr/libqunikeyboard.ts
+++ b/i18n/fr/libqunikeyboard.ts
@@ -1,9 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Unicode</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/fr/libvolumeapplet.ts b/i18n/fr/libvolumeapplet.ts
index 13d64ca..fbb6fb9 100644
--- a/i18n/fr/libvolumeapplet.ts
+++ b/i18n/fr/libvolumeapplet.ts
@@ -1,29 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>VolumeControl</name>
     <message>
-        <source>Mute</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Enable Sounds for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key Clicks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Screen taps</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Screen Taps</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/mail.ts b/i18n/fr/mail.ts
index 81a6e07..0ecaf66 100644
--- a/i18n/fr/mail.ts
+++ b/i18n/fr/mail.ts
@@ -461,388 +461,384 @@ Visit http://www.lisa.de/ for Information.
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Looking up host...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to host.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The IMAP connection was refused.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The host was not found.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was an error while reading from the socket.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Login failed. Check your password/username.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unknown error was encountered.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login successfull!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Login failed. Go away.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Renaming successfull!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Renaming failed. (Server said: %1)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletion successfull!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Delete failed. (Server said: %1)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder created. Rescanning...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The folder could not be created. (Server said: %1)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t open folder cache file for writing!&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Got folder list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t retrieve the folder list. (Server said: %1)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailTable</name>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unseen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Marked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unmarked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox contained no mails.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Getting mail headers...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An error occoured during the selection of the mailbox. (Server said: %1)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Got all mail headers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Couldn&apos;t fetch mail.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindowBase</name>
     <message>
         <source>E-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Abort</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>OpenDiagBase</name>
     <message>
         <source>Open file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Stop </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; kB of &lt;b&gt;%2&lt;/b&gt; kB at &lt;b&gt;%3&lt;/b&gt; kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Icon]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;i&gt;application/v-card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open using an application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save to disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>(no name)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;Foldertree not known.&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(no from)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(no subject)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(no date)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RenameBase</name>
     <message>
         <source>Renaming</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Renaming</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;to</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDiag</name>
     <message>
         <source>Body</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Header Field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please enter what to search for.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a folder.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please enter a header field to search in.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not select the folder. Aborting. (Server said: %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No mails match your criteria.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Search failed. (Server said: %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t fetch the mail headers. (Server said: %1)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDiagBase</name>
     <message>
         <source>Mail Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Search&amp;nbsp;in:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;For:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/div&gt;&lt;b&gt;From:&lt;/b&gt; %2&lt;br&gt;&lt;b&gt;To:&lt;/b&gt; %3&lt;br&gt;%4%5&lt;b&gt;Date:&lt;/b&gt; %6&lt;hr&gt;&lt;font face=fixed&gt;%7&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(no subject)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(no from)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(no recipient)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Cc:&lt;/b&gt; %1&lt;br&gt;</source>
diff --git a/i18n/fr/oipkg.ts b/i18n/fr/oipkg.ts
index af553d9..af93ff8 100644
--- a/i18n/fr/oipkg.ts
+++ b/i18n/fr/oipkg.ts
@@ -1,379 +1,355 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InstallDialog</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>feeds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ipkgfind</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Section: </source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Close Section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ipkgfind: </source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Clear Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, new version installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, old version installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ipkgfind&amp;killefiz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageListView</name>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettings</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettingsBase</name>
     <message>
         <source>Package Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Installation Setups</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Install destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Used servers:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rename</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>link to /</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>volatile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>removeable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used servers: (Highlighted feeds are active)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PmIpkg</name>
     <message>
         <source>
 All done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>please wait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while removing </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while installing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link: </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>Destination: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RunWindow</name>
     <message>
         <source>running...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/qpe.ts b/i18n/fr/qpe.ts
index 8ef2ad9..357c8b8 100644
--- a/i18n/fr/qpe.ts
+++ b/i18n/fr/qpe.ts
@@ -1,197 +1,17 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Calibrate</name>
-    <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
-    <message>
-        <source>Documents</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
-<context>
-    <name>DesktopApplication</name>
-    <message>
-        <source>Battery is running very low.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>business card</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
-<context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
-<context>
-    <name>Launcher</name>
-    <message>
-        <source>Launcher</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source> - Launcher</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No application</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
-<context>
-    <name>LauncherView</name>
-    <message>
-        <source>Type: %1</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Document View</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
-<context>
-    <name>MediumMountGui</name>
-    <message>
-        <source>Medium inserted</source>
-        <translation type="obsolete"></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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Link apps</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
-<context>
-    <name>Shutdown</name>
-    <message>
-        <source>Shut down...</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Terminate</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Terminate Opie</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Reboot</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Restart Opie</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Shutdown</source>
-        <translation type="obsolete"></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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete"></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/rotation.ts b/i18n/fr/rotation.ts
index beb6f41..8f282b7 100644
--- a/i18n/fr/rotation.ts
+++ b/i18n/fr/rotation.ts
@@ -1,32 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>RotationSettings</name>
     <message>
         <source>Rotation Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Select orientation from options at left.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatically restart Opie?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Rotation is not enabled in this demo, however this is a supported feature of Qt/Embedded.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>RotationSettingsBase</name>
-    <message>
-        <source>Rotation Settings</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The chosen rotation will only affect new applications.</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/fr/security.ts b/i18n/fr/security.ts
index 8ec7f1d..9d17e6f 100644
--- a/i18n/fr/security.ts
+++ b/i18n/fr/security.ts
@@ -1,97 +1,93 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.1.0/24 (default)</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/sound.ts b/i18n/fr/sound.ts
index eb678c8..44f4579 100644
--- a/i18n/fr/sound.ts
+++ b/i18n/fr/sound.ts
@@ -1,177 +1,113 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettingsBase</name>
     <message>
-        <source>Sound Settings</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Vmemo</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Sample Rate</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>11025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>22050</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>32000</source>
-        <translation type="obsolete"></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>Screen sounds</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Keyboard sounds</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Levels</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Loud</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Mic</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Silent</source>
-        <translation type="obsolete"></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>Location</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Record Key:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Taskbar Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Escape</source>
         <translation type="unfinished"></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>Recording Limit:</source>
-        <translation type="obsolete"></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>seconds</source>
-        <translation type="obsolete"></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>
 </context>
 </TS>
diff --git a/i18n/fr/sysinfo.ts b/i18n/fr/sysinfo.ts
index 704a00a..5b51bea 100644
--- a/i18n/fr/sysinfo.ts
+++ b/i18n/fr/sysinfo.ts
@@ -1,188 +1,172 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesDetail</name>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
-        <source> total: %1 kB</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProcessDetail</name>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
-        <source>CF Card</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SD Card</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Internal Storage</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Int. Storage</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CPU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/tabmanager.ts b/i18n/fr/tabmanager.ts
index b4a6155..d544c39 100644
--- a/i18n/fr/tabmanager.ts
+++ b/i18n/fr/tabmanager.ts
@@ -1,127 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppEdit</name>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exec</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Icon</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exec:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabManager</name>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t remove with applications
 still in the group.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you want to delete?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t remove.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Application edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t save.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t move application.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Gathering icons...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabManagerBase</name>
     <message>
-        <source>Tab Manger</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Applications</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Tab Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/textedit.ts b/i18n/fr/textedit.ts
index 409cfb1..6c11582 100644
--- a/i18n/fr/textedit.ts
+++ b/i18n/fr/textedit.ts
@@ -1,322 +1,240 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Taille</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">Fonte</translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation type="unfinished">Style Fonte</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="unfinished"></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="unfinished">Gras</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished">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="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save File As?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want
 to delete the current file
 from the disk?
 This is irreversable!!</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>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open File</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Text Editor has detected
  you selected a .desktop file.
 Open .desktop file or linked file?</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>
 </context>
 <context>
-    <name>fileBrowser</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Documents</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Hidden files</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Type: %1</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Change Directory</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Make Directory</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Rescan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete"></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>filePermissions</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>
 </context>
-<context>
-    <name>fileSaver</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nom</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Taille</translation>
-    </message>
-    <message>
-        <source>fileSaver</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>set file permissions</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/fr/today.ts b/i18n/fr/today.ts
index 4613907..1f54aff 100644
--- a/i18n/fr/today.ts
+++ b/i18n/fr/today.ts
@@ -1,134 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;b&gt;Please fill out the business card &lt;/b&gt;</source>
-        <translation type="obsolete"></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="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No more appointments today</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>No appointments today</source>
         <translation type="unfinished"></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  today</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should should 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Should today be
-autostarted on
-resume ? (Opie only)</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/todolist.ts b/i18n/fr/todolist.ts
index 919ab40..79e60a4 100644
--- a/i18n/fr/todolist.ts
+++ b/i18n/fr/todolist.ts
@@ -1,237 +1,217 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary:</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>
 </context>
 <context>
     <name>TodoTable</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Task</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete all tasks?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>all tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>