daily update, this time I also removed the obsolete messages.

Should clean up all the files.

210 files changed, 825 insertions, 2873 deletions

diff --git a/i18n/de/addressbook.ts b/i18n/de/addressbook.ts
index 3d3d845..0f34743 100644
--- a/i18n/de/addressbook.ts
+++ b/i18n/de/addressbook.ts
@@ -639,392 +639,384 @@ Dennoch beenden?</translation>
         <source>East Timor</source>
         <translation>Ost-Timor</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ecuador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Ägypten</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Äquatorial Guinea</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estland</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Äthiopien</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Falkland Inseln</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Färöer Inseln</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finnland</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Frankreich</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Franz. Guiana</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Franz. Polynesien</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgien</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Deutschland</translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Griechenland</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Grönland</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenada</translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation>Guadeloupe</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation>Guinea-Bissau</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Vatikanstadt</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Ungarn</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Island</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Indien</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonesien</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irland</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italien</translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japan</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordanien</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kasachstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenja</translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
-        <source>Kuait</source>
-        <translation type="obsolete">Kuwait</translation>
-    </message>
-    <message>
-        <source>Kyrgyztan</source>
-        <translation type="obsolete">Kirgisistan</translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Lettland</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Libanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberia</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Litauen</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxemburg</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Mazedonien</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagaskar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malaysia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Malediven</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauretanien</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Mexico</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Mikronesien</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldawien</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolei</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marokko</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibien</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Niederlanden</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Neukaledonien</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Neuseeland</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicaragua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigeria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norwegen</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation>Palästina</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Neu Guinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
diff --git a/i18n/de/advancedfm.ts b/i18n/de/advancedfm.ts
index b456873..25c2ed3 100644
--- a/i18n/de/advancedfm.ts
+++ b/i18n/de/advancedfm.ts
@@ -1,259 +1,255 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/appearance.ts b/i18n/de/appearance.ts
index 9ab04aa..13991fd 100644
--- a/i18n/de/appearance.ts
+++ b/i18n/de/appearance.ts
@@ -1,145 +1,141 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation>Erscheinungsbild</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farben</translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation>Suche...</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Hintergrund</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Aktuelles Schema</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation>Aktuelles Schema bearbeiten...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Schema löschen</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Kann das aktuelle Schema nicht löschen</translation>
     </message>
     <message>
         <source>Select</source>
         <translation>Auswählen</translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation>Hintergrundbild aktivieren</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Schrift</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation type="obsolete">Anwenden</translation>
-    </message>
-    <message>
         <source>Restart</source>
         <translation>Neustart</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation>Wollen Sie Opie nun neu starten?</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Schema editieren</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/appskey.ts b/i18n/de/appskey.ts
index 98a0cee..b20d131 100644
--- a/i18n/de/appskey.ts
+++ b/i18n/de/appskey.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppsKeyApp</name>
     <message>
         <source>Set Application Key</source>
         <translation>Anwendungstasten festlegen</translation>
     </message>
     <message>
-        <source>Calender</source>
-        <translation type="obsolete">Kalender</translation>
-    </message>
-    <message>
         <source>Address Book</source>
         <translation>Addressbuch</translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Popup Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/buzzword.ts b/i18n/de/buzzword.ts
index 17eace3..bca5f40 100644
--- a/i18n/de/buzzword.ts
+++ b/i18n/de/buzzword.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
         <translation>buZzword</translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation>&amp;Neues Spiel</translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete">&amp;Über</translation>
-    </message>
-    <message>
         <source>&amp;Game</source>
         <translation>&amp;Spiel</translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
         <translation>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/citytime.ts b/i18n/de/citytime.ts
index 4a3c931..a50e2d5 100644
--- a/i18n/de/citytime.ts
+++ b/i18n/de/citytime.ts
@@ -1,99 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation>Weltzeituhr</translation>
     </message>
-    <message>
-        <source>&lt;location 4&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 6 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 5&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 2&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 6&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 5 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 2 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 1 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 3&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 1&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 3 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 4 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/keypebble.ts b/i18n/de/keypebble.ts
index ab58148..7be0f0f 100644
--- a/i18n/de/keypebble.ts
+++ b/i18n/de/keypebble.ts
@@ -1,200 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connect...</source>
+        <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disconnect</source>
+        <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop Full Screen</source>
+        <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connected to remote host</source>
+        <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Logged in to remote host</source>
+        <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection closed</source>
+        <source>Open Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send Contrl-Alt-Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>KVNCConnectDlg</name>
+    <name>KVNCBookmarkDlgBase</name>
     <message>
-        <source>Connect to VNC server</source>
+        <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KVNCConnDlgBase</name>
     <message>
-        <source>Host Name:</source>
+        <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Number:</source>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VncOptionsBase</name>
     <message>
-        <source>VNC Viewer Options</source>
+        <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data Encoding</source>
+        <source>Host Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection</source>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libqpe.ts b/i18n/de/libqpe.ts
index c2c7eea..934c70c 100644
--- a/i18n/de/libqpe.ts
+++ b/i18n/de/libqpe.ts
@@ -524,213 +524,209 @@ Free some memory and try again.</source>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ram FS</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/light-and-power.ts b/i18n/de/light-and-power.ts
index bb99f4c..33a2f12 100644
--- a/i18n/de/light-and-power.ts
+++ b/i18n/de/light-and-power.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
-        <source>Light Settings</source>
-        <translation type="obsolete">Helligkeitseinstellungen</translation>
-    </message>
-    <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation>Energie sparen</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>Sekunden</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Licht aus nach</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Licht dimmen nach</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Ausschalten nach</translation>
     </message>
     <message>
         <source>Bright</source>
         <translation>Hell</translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation>&lt;blockquote&gt;Je heller der Bildschrim eingestellt ist, desto mehr Strom wird verbraucht.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Aus</translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation>LCD nur ausschalten, wenn Gerät deaktiviert</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation>Helligkeitseinstellungen</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/mail.ts b/i18n/de/mail.ts
index 8fdd872..d251908 100644
--- a/i18n/de/mail.ts
+++ b/i18n/de/mail.ts
@@ -44,388 +44,384 @@
         <source>&lt;b&gt;SMTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>993</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Abort sending</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan folder list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/de/showimg.ts b/i18n/de/showimg.ts
index 01acf9f..e5903e6 100644
--- a/i18n/de/showimg.ts
+++ b/i18n/de/showimg.ts
@@ -1,155 +1,123 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation>Helligkeit</translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Bildbetrachter</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Horizontal drehen</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Vertical drehen</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>180° drehen</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>90° Drehen</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation>- Bildbetrachter</translation>
     </message>
     <message>
-        <source>Loading image...</source>
-        <translation type="obsolete">Das Bild wird geladen...</translation>
-    </message>
-    <message>
-        <source>Could not load image</source>
-        <translation type="obsolete">Das Bild konnte nicht geladen werden</translation>
-    </message>
-    <message>
-        <source>No image - select Open from File menu.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1/%2 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source> True color</source>
         <translation>Echtfarben</translation>
     </message>
     <message>
-        <source>, %1 alpha levels</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, 8-bit alpha channel</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Vorschau</translation>
     </message>
     <message>
         <source>Slideshow</source>
         <translation>Diashow</translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation>Einstellungen..</translation>
     </message>
     <message>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation>Bildinformationen...</translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation>Öffnen...</translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation>270° Drehen</translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation>Helligkeit...</translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation>Schwarzweiß</translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation>Auf Bildschirmgröße vergrößern</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Daten</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation>%1 Farben</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>%1 Alphakanäle</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>8-bit alpha Kanal</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/sound.ts b/i18n/de/sound.ts
index 492cc73..4a644be 100644
--- a/i18n/de/sound.ts
+++ b/i18n/de/sound.ts
@@ -1,145 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
-        <source>Restart</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>To implement a new key switch
-Opie will have to be restarted./n&lt;B&gt;Restart&lt;/B&gt; Opie now?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Shows icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>11025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>22050</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>44100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vmemo Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>33075</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Escape</source>
         <translation type="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>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/textedit.ts b/i18n/de/textedit.ts
index 0ce831a..236c98a 100644
--- a/i18n/de/textedit.ts
+++ b/i18n/de/textedit.ts
@@ -1,277 +1,256 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation>Schrift</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Schrift</translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation>Stil</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>Neu</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Öffne</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Ausschneiden</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Finden...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Zoom in</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Zoom aus</translation>
     </message>
     <message>
         <source>Bold</source>
         <translation>Fett</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation>Kursiv</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Zeilenumbruch</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Mit neuer Datei beginnen</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editieren</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Nächten finden</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>&quot;Finden&quot; schließen</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Texteditor</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>Unbenannt</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Schrift</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Dateirechte</translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Über</translation>
     </message>
     <message>
-        <source>Text Editor has detected
- you selected a .desktop file.
-Open .desktop file or linked file?</source>
-        <translation type="obsolete">Texteditor hat festgestellt, 
-dass Sie eine .desktop-Datei
-ausgewählt haben. Wollen
-Sie diese oder die Verknüpfung
-editieren?</translation>
-    </message>
-    <message>
         <source>.desktop File</source>
         <translation>.desktop-Datei</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Verknüpfung</translation>
     </message>
     <message>
-        <source>Do you really want
-to delete the current file
-from the disk?
-This is irreversable!!</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>All</source>
         <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Dateirechte setzen</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Setze Dateirechte für:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>Besitzer</translation>
     </message>
     <message>
         <source>group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>andere</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Besitzer</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lesen</translation>
     </message>
     <message>
         <source>write</source>
         <translation>schreiben</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ausführen</translation>
     </message>
     <message>
-        <source>filePermissions</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Fehler- kein Nutzer</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Fehler- keine Gruppe</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Fehler beim Setzen des Benutzers oder der Gruppe</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Fehler beim Setzen des Modus</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/today.ts b/i18n/de/today.ts
index 6a0cb13..1827e5f 100644
--- a/i18n/de/today.ts
+++ b/i18n/de/today.ts
@@ -1,134 +1,130 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Heute</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; neue Nachricht(en), &lt;b&gt;%2&lt;/b&gt; ausgehende</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Es gibt &lt;b&gt;1&lt;/b&gt; aktive Aufgabe:&lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Es gibt &lt;b&gt;%1&lt;/b&gt; aktive Aufgaben:&lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Keine aktiven Aufgaben</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Heute keine Termine</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Dieses Gerät gehört </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Bitte füllen Sie die Visitenkarte aus</translation>
     </message>
     <message>
-        <source>No more  today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No more appointments today</source>
         <translation>Heute keine Termine mehr</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation>Opiemail ist nicht installiert</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Heute</translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation>Heute - Einstellungen</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation>Soll der Ort
 angezeigt
 werden?</translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation>Sollen die Notizen
 angezeigt werden?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation>Nur spätere Termine
 anzeigen</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation>Wieviele Aufgaben
 sollen angezeigt
 werden?</translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation>Aufgaben</translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation>Zeilenumbruch nach
 Buchstaben?</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Verschiedenes</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation>Wieviele Termine
 sollen angezeigt
 werden?</translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation>&apos;Heute&apos; automatisch
 starten? (Nur in Opie)</translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation>Autostart nach
 wievielen Minuten
 aktivieren?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/addressbook.ts b/i18n/en/addressbook.ts
index cbd6585..591e4fe 100644
--- a/i18n/en/addressbook.ts
+++ b/i18n/en/addressbook.ts
@@ -581,392 +581,384 @@ Quit anyway?</source>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuait</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Kyrgyztan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/en/advancedfm.ts b/i18n/en/advancedfm.ts
index b456873..25c2ed3 100644
--- a/i18n/en/advancedfm.ts
+++ b/i18n/en/advancedfm.ts
@@ -1,259 +1,255 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/appearance.ts b/i18n/en/appearance.ts
index 7c20f02..ec16822 100644
--- a/i18n/en/appearance.ts
+++ b/i18n/en/appearance.ts
@@ -1,145 +1,141 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/appskey.ts b/i18n/en/appskey.ts
index e989899..ece7213 100644
--- a/i18n/en/appskey.ts
+++ b/i18n/en/appskey.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppsKeyApp</name>
     <message>
         <source>Set Application Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calender</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Address Book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Popup Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/buzzword.ts b/i18n/en/buzzword.ts
index 279ac4e..076f679 100644
--- a/i18n/en/buzzword.ts
+++ b/i18n/en/buzzword.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/citytime.ts b/i18n/en/citytime.ts
index 8438210..62e2ce2 100644
--- a/i18n/en/citytime.ts
+++ b/i18n/en/citytime.ts
@@ -1,99 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;location 4&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 6 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 5&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 2&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 6&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 5 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 2 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 1 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 3&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 1&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 3 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 4 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/keypebble.ts b/i18n/en/keypebble.ts
index ab58148..7be0f0f 100644
--- a/i18n/en/keypebble.ts
+++ b/i18n/en/keypebble.ts
@@ -1,200 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connect...</source>
+        <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disconnect</source>
+        <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop Full Screen</source>
+        <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connected to remote host</source>
+        <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Logged in to remote host</source>
+        <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection closed</source>
+        <source>Open Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send Contrl-Alt-Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>KVNCConnectDlg</name>
+    <name>KVNCBookmarkDlgBase</name>
     <message>
-        <source>Connect to VNC server</source>
+        <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KVNCConnDlgBase</name>
     <message>
-        <source>Host Name:</source>
+        <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Number:</source>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VncOptionsBase</name>
     <message>
-        <source>VNC Viewer Options</source>
+        <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data Encoding</source>
+        <source>Host Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection</source>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libqpe.ts b/i18n/en/libqpe.ts
index 495056f..0e681cb 100644
--- a/i18n/en/libqpe.ts
+++ b/i18n/en/libqpe.ts
@@ -524,213 +524,209 @@ Free some memory and try again.</source>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ram FS</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/light-and-power.ts b/i18n/en/light-and-power.ts
index 5a89b8d..18b2baa 100644
--- a/i18n/en/light-and-power.ts
+++ b/i18n/en/light-and-power.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
-        <source>Light Settings</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/mail.ts b/i18n/en/mail.ts
index 8fdd872..d251908 100644
--- a/i18n/en/mail.ts
+++ b/i18n/en/mail.ts
@@ -44,388 +44,384 @@
         <source>&lt;b&gt;SMTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>993</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Abort sending</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan folder list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/en/showimg.ts b/i18n/en/showimg.ts
index 17b9a4c..c42e7d7 100644
--- a/i18n/en/showimg.ts
+++ b/i18n/en/showimg.ts
@@ -1,155 +1,123 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading image...</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Could not load image</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No image - select Open from File menu.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1/%2 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>, %1 alpha levels</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, 8-bit alpha channel</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/sound.ts b/i18n/en/sound.ts
index 492cc73..4a644be 100644
--- a/i18n/en/sound.ts
+++ b/i18n/en/sound.ts
@@ -1,145 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
-        <source>Restart</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>To implement a new key switch
-Opie will have to be restarted./n&lt;B&gt;Restart&lt;/B&gt; Opie now?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Shows icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>11025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>22050</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>44100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vmemo Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>33075</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Escape</source>
         <translation type="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>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/textedit.ts b/i18n/en/textedit.ts
index 457b18e..d1341c7 100644
--- a/i18n/en/textedit.ts
+++ b/i18n/en/textedit.ts
@@ -1,273 +1,256 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></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="obsolete"></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>Text Editor has detected
- you selected a .desktop file.
-Open .desktop file or linked file?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>filePermissions</source>
-        <translation type="obsolete"></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>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/today.ts b/i18n/en/today.ts
index 748913e..097f0fa 100644
--- a/i18n/en/today.ts
+++ b/i18n/en/today.ts
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="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 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="obsolete"></translation>
-    </message>
-    <message>
         <source>No more appointments 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>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>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/es/addressbook.ts b/i18n/es/addressbook.ts
index 7cc0d2b..56aa742 100644
--- a/i18n/es/addressbook.ts
+++ b/i18n/es/addressbook.ts
@@ -589,392 +589,384 @@ inténtelo de nuevo.
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>República Dominicama</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Timor Oriental</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ecuador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egipto</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Guinea Ecuatorial</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estonia</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiopía</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finlandia</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Guayana Francesa</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Polinesia Francesa</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabón</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grecia</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Groenlandia</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Granada</translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation>Guadalupe</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation>Guinea-bissau</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guayana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Hungría</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islandia</translation>
     </message>
     <message>
         <source>India</source>
         <translation>India</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonesia</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irlanda</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italia</translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordania</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenia</translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
-        <source>Kuait</source>
-        <translation type="obsolete">Kuwait</translation>
-    </message>
-    <message>
-        <source>Kyrgyztan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberia</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lituania</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxemburgo</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macao</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Macedonia</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malasia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Malvinas</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished">M
 alta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinica</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritania</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Mexico</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Micronesia</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldavia</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolia</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marruecos</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibia</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Países Bajos</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Nueva Caledonia</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nueva Zelanda</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicaragua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigeria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Omán</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistán</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation>Palestina</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panamá</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papúa Nueva Guinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Perú</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipinas</translation>
     </message>
diff --git a/i18n/es/advancedfm.ts b/i18n/es/advancedfm.ts
index ae5d514..3bbe9a8 100644
--- a/i18n/es/advancedfm.ts
+++ b/i18n/es/advancedfm.ts
@@ -1,261 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Mostrar ficheros ocultos</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Crear directorio</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Ejecutar comando</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Ejecutar comando con salida</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Pasar a local</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Pasar a remoto</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Seguro que quiere borrar
 </translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>No puedo renombrar</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ese directorio no existe</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Copiar como</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Salida Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation>¡el comando falló!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Emisión del Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Envío IR.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Cambiar directorio</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Ejecutar</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Abrir como texto</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Crear enlace simbólico</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
-        <source>Rescan</source>
-        <translation type="obsolete">Actualizar</translation>
-    </message>
-    <message>
         <source>File Info</source>
         <translation>Info fichero</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Fijar permisos</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Emitir fichero</translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation>ya existe
 ¿seguro que quiere borrarlo?</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Como</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copiar misma carpeta</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Salvar salida en fichero(sólo nombre)</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fijar Permisos Fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos para el fichero:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>otros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lectura</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escritura</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecución</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/appearance.ts b/i18n/es/appearance.ts
index 6635246..6f507b0 100644
--- a/i18n/es/appearance.ts
+++ b/i18n/es/appearance.ts
@@ -1,146 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation>Apariencia</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Esquema actual</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation>Hojear...</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fondo</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation>Editar esquema actual...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Realmente quiere borrar
 </translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Borrar esquema</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Incapaz de borrar el esquema actual.</translation>
     </message>
     <message>
         <source>Select</source>
         <translation>Seleccionar</translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation>Habilitar imagen de fondo</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Por omisión</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>El Rápido Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation type="obsolete">Aplicar</translation>
-    </message>
-    <message>
         <source>Restart</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation>¿Quiere reiniciar Opie ahora?</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>Configurar...</translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editar esquema</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/appskey.ts b/i18n/es/appskey.ts
index 260586e..7f0ab95 100644
--- a/i18n/es/appskey.ts
+++ b/i18n/es/appskey.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppsKeyApp</name>
     <message>
         <source>Set Application Key</source>
         <translation>Teclas de Aplicación</translation>
     </message>
     <message>
-        <source>Calender</source>
-        <translation type="obsolete">Calendario</translation>
-    </message>
-    <message>
         <source>Address Book</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Inicio</translation>
     </message>
     <message>
         <source>Popup Menu</source>
         <translation>Menú emergente</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/buzzword.ts b/i18n/es/buzzword.ts
index 279ac4e..076f679 100644
--- a/i18n/es/buzzword.ts
+++ b/i18n/es/buzzword.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/citytime.ts b/i18n/es/citytime.ts
index 266e633..72e3700 100644
--- a/i18n/es/citytime.ts
+++ b/i18n/es/citytime.ts
@@ -1,99 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation>Cambiando hora</translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation>Hubo problemas fijando la zona horaria %1</translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation>Reestableciendo zona horaria</translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation>Hubo problemas fijando su zona horaria. La hora puede ser incorrecta ahora...</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation>Hora Mundial</translation>
     </message>
-    <message>
-        <source>&lt;location 4&gt;</source>
-        <translation type="obsolete">&lt;posición 4&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 6 TIME&gt;</source>
-        <translation type="obsolete">&lt;Hora ciudad 6&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 5&gt;</source>
-        <translation type="obsolete">&lt;posición 5&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 2&gt;</source>
-        <translation type="obsolete">&lt;posición 2&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 6&gt;</source>
-        <translation type="obsolete">&lt;posición 6&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 5 TIME&gt;</source>
-        <translation type="obsolete">&lt;Hora ciudad 5&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 2 TIME&gt;</source>
-        <translation type="obsolete">&lt;Hora ciudad 2&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 1 TIME&gt;</source>
-        <translation type="obsolete">&lt;Hora ciudad 1&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 3&gt;</source>
-        <translation type="obsolete">&lt;posición 3&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 1&gt;</source>
-        <translation type="obsolete">&lt;posición 1&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 3 TIME&gt;</source>
-        <translation type="obsolete">&lt;Hora ciudad 3&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 4 TIME&gt;</source>
-        <translation type="obsolete">&lt;Hora ciudad 4&gt;</translation>
-    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation>Ciudad</translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation>No encuentro información horaria</translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation>&lt;p&gt;Incapaz de encontrar ninguna información horaria en %1</translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation>No encuentro el mapa</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation>&lt;p&gt;No puedo cargar mapa: %1, saliendo</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/keypebble.ts b/i18n/es/keypebble.ts
index 164d559..1a99deb 100644
--- a/i18n/es/keypebble.ts
+++ b/i18n/es/keypebble.ts
@@ -1,204 +1,240 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Conectado</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Conexión reusada</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Máquina no encontrada</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation>Error de lectura: QSocket informó de un error
 leyendo datos. La máquina remota probablemente
 se desconectó.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>QSocket devolvió un código de error no válido</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation>Esperando inicialización servidor...</translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation>Esperando nombre escritorio...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Conectado a %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Error de protocolo: Identificador de mensaje %1 cuando esperaba actualización.</translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Error de protocolo: Codificación desconocida del servidor %1</translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>Esperando versión del servidor...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Error: Versión del servidor no válida, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Error: Versión del servidor no contemplada,%1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Sesión iniciada</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Error: Este servidor requiere clave y no se ha especificado.
 </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Error: La clave especificada era incorrecta.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Error: Demasiados intentos fallidos.
 Por favor, inténtelo más tarde.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Indentificación fallida</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Demasiados fallos</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>Visor VNC</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Configuración</translation>
-    </message>
-    <message>
-        <source>Connect...</source>
-        <translation>Conectar...</translation>
-    </message>
-    <message>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Pantalla normal</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Conectado a máquina remota</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Identificado en máquina remota</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Conexión cerrada</translation>
     </message>
+    <message>
+        <source>New Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send Contrl-Alt-Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>KVNCConnectDlg</name>
+    <name>KVNCBookmarkDlgBase</name>
     <message>
-        <source>Connect to VNC server</source>
-        <translation>Conectar a servidor VNC</translation>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KVNCConnDlgBase</name>
     <message>
-        <source>Host Name:</source>
-        <translation>Nombre máquina:</translation>
+        <source>VNC Viewer Connection</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Number:</source>
-        <translation>Número pantalla:</translation>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Password</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation>Contraseña:</translation>
+        <translation type="unfinished">Contraseña:</translation>
+    </message>
+    <message>
+        <source>Bookmark Name:</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VncOptionsBase</name>
     <message>
-        <source>VNC Viewer Options</source>
-        <translation>Opciones Visor VNC</translation>
+        <source>Host Name:</source>
+        <translation type="unfinished">Nombre máquina:</translation>
+    </message>
+    <message>
+        <source>Display Number:</source>
+        <translation type="unfinished">Número pantalla:</translation>
     </message>
     <message>
-        <source>Data Encoding</source>
-        <translation>Codificación datos</translation>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
-        <translation>Comprobar pantalla cada:</translation>
+        <translation type="unfinished">Comprobar pantalla cada:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
-        <translation>Milisegundos</translation>
+        <translation type="unfinished">Milisegundos</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
-        <translation>Solicitar sesión 8 bits</translation>
+        <translation type="unfinished">Solicitar sesión 8 bits</translation>
     </message>
     <message>
         <source>Raise on bell</source>
-        <translation>Modo escucha</translation>
+        <translation type="unfinished">Modo escucha</translation>
     </message>
     <message>
         <source>Request shared session</source>
-        <translation>Solicitar sesión compartida</translation>
+        <translation type="unfinished">Solicitar sesión compartida</translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale Factor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection</source>
-        <translation>Conexión</translation>
+        <source>Encodings</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
-        <translation>Codificación Hextile</translation>
+        <translation type="unfinished">Codificación Hextile</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
-        <translation>Codificación CoRRE</translation>
+        <translation type="unfinished">Codificación CoRRE</translation>
     </message>
     <message>
         <source>RRE encoding</source>
-        <translation>Codificación RRE</translation>
+        <translation type="unfinished">Codificación RRE</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
-        <translation>Codificación copiar rectángulo</translation>
+        <translation type="unfinished">Codificación copiar rectángulo</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libqpe.ts b/i18n/es/libqpe.ts
index 97500b4..26b497a 100644
--- a/i18n/es/libqpe.ts
+++ b/i18n/es/libqpe.ts
@@ -534,214 +534,210 @@ Libere memoria e intételo de nuevo.</translation>
     <message>
         <source>Name Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>2º nombre</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apellidos</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Archivar como</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Cargo</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Departamento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Compañía</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Teléfono negocio</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax negocio</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Móvil negocio</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Correo-e omisión</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Correos-e</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Teléfono casa</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax casa</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Móvil personal</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Calle negocio</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Ciudad negocio</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Provincia negocio</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>CP negocio</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>País negocio</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Busca negocio</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Web negocio</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profesión</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Ayudante</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Superior</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Calle casa</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Ciudad casa</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Provincia casa</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Cód.portal casa</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>País casa</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Web personal</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Cónyuge</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Género</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Cumpleaños</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Apodo</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Hijos</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Tarjeta CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco duro</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Tarjeta SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco duro SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Almacenamiento interno</translation>
     </message>
     <message>
-        <source>Ram FS</source>
-        <translation type="obsolete">Ram FS</translation>
-    </message>
-    <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Incapaz de programar alarma.
 Libere memoria e intételo de nuevo</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/light-and-power.ts b/i18n/es/light-and-power.ts
index 616cc4c..c67aad6 100644
--- a/i18n/es/light-and-power.ts
+++ b/i18n/es/light-and-power.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
-        <source>Light Settings</source>
-        <translation type="obsolete">Configurar Iluminación</translation>
-    </message>
-    <message>
         <source>Adjust to environment</source>
         <translation>Ajustar a entorno</translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>Un sensor de luz ambiental ajusta automáticamente la iluminación de la pantalla. La configuración del brillo aún afecta el brillo medio.</translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation>Ahorro de energía</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation> segundos</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Bajar luz tras</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Suspender tras</translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation>Sólo desactivar la pantalla al suspender</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Sin luz tras</translation>
     </message>
     <message>
         <source>Bright</source>
         <translation>Brillante</translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation>&lt;blockquote&gt;Cuanto mas brillante es la luz de la pantalla, más batería se consume.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Apagada</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/mail.ts b/i18n/es/mail.ts
index d1c5a34..a521b7b 100644
--- a/i18n/es/mail.ts
+++ b/i18n/es/mail.ts
@@ -44,388 +44,384 @@
         <source>&lt;b&gt;SMTP:</source>
         <translation>&lt;b&gt;SMTP:</translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
         <translation>&lt;b&gt;Usuario:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
         <translation>&lt;b&gt;Calve:</translation>
     </message>
     <message>
         <source>Identity</source>
         <translation>Identidad</translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
         <translation>&lt;b&gt;Nombre:</translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
         <translation>&lt;b&gt;Correo-e:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
         <translation>&lt;b&gt;Org:</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation>Responder a</translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
         <translation>&lt;b&gt;Firma:</translation>
     </message>
     <message>
         <source>SSL</source>
         <translation>SSL</translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation>Usar SSL</translation>
     </message>
     <message>
         <source>993</source>
         <translation>993</translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>No hay entradas en la libreta de direcciones.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Tiene que seleccionar al menos una dirección.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation>Recoge direcciones</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation>Por favor, seleccione una entrada primero.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation>Fijar descripción</translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation>&lt;div align=center&gt;Descripción</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation>&lt;p&gt;Tiene que especificar un destinatario.&lt;br&gt;(pe: pepe@luis.es)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Hubo un problema enviando algún correo de la cola.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Success</source>
         <translation>Éxito</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation>&lt;p&gt;El correo fue puesto con éxito en la cola.&lt;/p&gt;&lt;p&gt;La cola contiene</translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation>correos.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation>&lt;font color=#ff0000&gt;Ocurrió un error durante el envío.&lt;/font&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation>&lt;p&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El correo fue enviando con éxito.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation>&lt;p&gt;Los correos en cola </translation>
     </message>
     <message>
         <source> of </source>
         <translation>de </translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation>Componer mensaje</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation>Enviar correo</translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation>Correo en cola</translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation>Adjuntar un fichero</translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation>Libreta direcciones</translation>
     </message>
     <message>
-        <source>Abort sending</source>
-        <translation type="obsolete">Cancelar envío</translation>
-    </message>
-    <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Responder</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Para</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation>Asto.</translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation>Prio.</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baja</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation>Añadir un adjunto</translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation>Eliminar adjunto</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation>Carbiar descripción</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Tiene que seleccionar una cuenta primero.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Pregunta</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;¿Seguro que quiere borrar la cuenta seleccionada?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation>Cuantas</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation>[Oculto]</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
         <source>Mail notification</source>
         <translation>Notificación de correo</translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation>Parpadeo LED</translation>
     </message>
     <message>
         <source>Play sound</source>
         <translation>Tocar sonido</translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
         <translation>&lt;b&gt;Comprobar&amp;tal cada</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>Disable mail notification</source>
         <translation>Desactivar notificación correo</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
         <translation>&lt;p&gt;&lt;b&gt;Mail(Correo) versión %1&lt;/b&gt;&lt;hr&gt;
 Patrocinado y programado por LISAsystems&lt;br&gt;
 Visite http://www.lisa.de/ para informarse.</translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Create folder</source>
         <translation>Crear carpeta</translation>
     </message>
     <message>
         <source>Rescan folder list</source>
         <translation>Releer lista carpetas</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
diff --git a/i18n/es/showimg.ts b/i18n/es/showimg.ts
index 919509c..7124cf7 100644
--- a/i18n/es/showimg.ts
+++ b/i18n/es/showimg.ts
@@ -1,155 +1,123 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Visor de Imágenes</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Espejo horizontal</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Espejo vertical</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Rotar 180º</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Rotar 90º</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation> - Visor de imágenes</translation>
     </message>
     <message>
-        <source>Loading image...</source>
-        <translation type="obsolete">Cargando imangen...</translation>
-    </message>
-    <message>
-        <source>Could not load image</source>
-        <translation type="obsolete">No puedo cargar imangen</translation>
-    </message>
-    <message>
-        <source>No image - select Open from File menu.</source>
-        <translation type="obsolete">Sin imagen - selecione Abrir del menú Fichero.</translation>
-    </message>
-    <message>
-        <source>, %1/%2 colors</source>
-        <translation type="obsolete">, %1/%2 colores</translation>
-    </message>
-    <message>
-        <source>, %1 colors</source>
-        <translation type="obsolete">, %1 colores</translation>
-    </message>
-    <message>
         <source> True color</source>
         <translation>Color verdadero</translation>
     </message>
     <message>
-        <source>, %1 alpha levels</source>
-        <translation type="obsolete">, %1 niveles alpha</translation>
-    </message>
-    <message>
-        <source>, 8-bit alpha channel</source>
-        <translation type="obsolete">, canal alpha de 8-bit</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Editar</translation>
-    </message>
-    <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation type="unfinished">Rotar 270º</translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/sound.ts b/i18n/es/sound.ts
index 8e45e45..147a5b4 100644
--- a/i18n/es/sound.ts
+++ b/i18n/es/sound.ts
@@ -1,145 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
-        <source>Restart</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>To implement a new key switch
-Opie will have to be restarted./n&lt;B&gt;Restart&lt;/B&gt; Opie now?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Shows icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>Vmemo Settings</source>
         <translation>Configuración de Vmemo</translation>
     </message>
     <message>
         <source>8000</source>
         <translation>8000</translation>
     </message>
     <message>
         <source>11025</source>
         <translation>11025</translation>
     </message>
     <message>
         <source>22050</source>
         <translation>22050</translation>
     </message>
     <message>
         <source>33075</source>
         <translation>33075</translation>
     </message>
     <message>
         <source>44100</source>
         <translation>44100</translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation>Estéreo</translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation>16 bit</translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation>Alertas visuales</translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation>Icono Barra Tareas</translation>
     </message>
     <message>
         <source>Key_Escape</source>
         <translation>Tecla_Escape</translation>
     </message>
     <message>
         <source>Key_Space</source>
         <translation>Tecla_Espacio</translation>
     </message>
     <message>
         <source>Key_Home</source>
         <translation>Tecla_Inicio</translation>
     </message>
     <message>
         <source>Key_Calender</source>
         <translation>Tecla_Calendario</translation>
     </message>
     <message>
         <source>Key_Contacts</source>
         <translation>Tecla_Contactos</translation>
     </message>
     <message>
         <source>Key_Menu</source>
         <translation>Tecla_Menú</translation>
     </message>
     <message>
         <source>Key_Mail</source>
         <translation>Tecla_Correo</translation>
     </message>
     <message>
         <source>30</source>
         <translation>30</translation>
     </message>
     <message>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation>Tasa muestreo:</translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation>Carpeta grabación:</translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation>Tecla grabación:</translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation>Límite grabación en segundos:</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Sin límite</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/textedit.ts b/i18n/es/textedit.ts
index e9c440d..2aca249 100644
--- a/i18n/es/textedit.ts
+++ b/i18n/es/textedit.ts
@@ -1,277 +1,256 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FontDialog</name>
     <message>
         <source>FontDialog</source>
         <translation>DiálogoLetra</translation>
     </message>
     <message>
         <source>Font Dialog</source>
         <translation>Diálogo de Letra</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation>Estilo de letra</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>El Rápido Zorro Marrón Saltó Por Encima Del Perro Perezoso</translation>
     </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Guardar como</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Buscar...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Acercar</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Alejar</translation>
     </message>
     <message>
         <source>Bold</source>
         <translation>Negrilla</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation>Cursiva</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Cortar líneas</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Empezar con Nuevo</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Buscar siguiente</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Cerrar Buscar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editor Textos</translation>
     </message>
     <message>
-        <source>Text Editor has detected
- you selected a .desktop file.
-Open .desktop file or linked file?</source>
-        <translation type="obsolete">El Editor de Texto ha detectado
-que ha seleccionado un .desktop
-¿Abrir el .desktop o su enlace?</translation>
-    </message>
-    <message>
         <source>.desktop File</source>
         <translation>Fichero .desktop</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Documento enlazado</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>Sin nombre</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Permisos</translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation>DiálogoLetras</translation>
     </message>
     <message>
-        <source>Do you really want
-to delete the current file
-from the disk?
-This is irreversable!!</source>
-        <translation type="obsolete">¿Seguro que quiere borrar
-el fichero actual del disco?
-¡Esto es irreversible!</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
-        <source>filePermissions</source>
-        <translation type="obsolete">Permisos fichero</translation>
-    </message>
-    <message>
         <source>Set File Permissions</source>
         <translation>Fijar permisos fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos fichero para:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>otros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>leer</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escribir</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecutar</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Error - sin usuario</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Error - sin grupo</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Error fijando propietario o grupo</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Error fijando modo</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/today.ts b/i18n/es/today.ts
index 687c2e7..e17aa2a 100644
--- a/i18n/es/today.ts
+++ b/i18n/es/today.ts
@@ -1,131 +1,127 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Pertenece a </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Por favor, rellene su información personal</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>No hay citas para hoy</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; correos nuevos, &lt;b&gt;%2&lt;/b&gt; salientes</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Hay &lt;b&gt; 1&lt;/b&gt; tarea pendiente: &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Hay &lt;b&gt; %1 &lt;/b&gt; tareas pendientes: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>No hay tareas pendientes</translation>
     </message>
     <message>
-        <source>No more  today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Opiemail not installed</source>
         <translation>Opiemail no está instalado</translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation>Configuración de Hoy</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation>¿Debo mostrar el
 lugar de las citas?</translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation>¿Debo mostrar las
 notas de las citas?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation>Mostrar únicamente
 las citas futuras</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation>¿Cuantas citas 
 debo mostrar?</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation>¿Cuantas tareas
 debo mostrar?</translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation>Tareas </translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation>Saltar de línea tras
 cuántas letras</translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation>¿Arrancar Hoy
 al encender?
 (sólo Opie)</translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation>¿Activar Hoy tras
 cuántos minutos
 apagado?</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varios</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/addressbook.ts b/i18n/fr/addressbook.ts
index ad15246..f97a6f0 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 email à</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Entrée</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Mes informations personnelles</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation>Configurer les champs</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Plus de mémoire disponible</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation>Pas assez d&apos;espace disponible 
 pour créer les fichiers de démarrage
 
 Libérer de la mémoire avant de pouvoir
 saisir des données !</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossible d&apos;accéder aux données, synchronisation en cours</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editer mes informations personnelles</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editer une adresse</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contacts - Mes informations personnelles</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Plus de mémoire disponible</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossible d&apos;enregistrer les informations
 Libérer de la mémoire
 et réessayer
 
 Quitter ?</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titre</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Bureau</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>Fonction</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>Bureau</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Maison</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Code postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Etats Unies</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Grande Bretagne</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japon</translation>
     </message>
     <message>
         <source>France</source>
         <translation>France</translation>
     </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>Féminin</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>Bénin</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>
@@ -630,392 +590,384 @@ Quitter ?</translation>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominique</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>République Dominicaine</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Timor Oriental</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Equateur</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egypte</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Guinée Equatoriale</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrée</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estonie</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Ethiopie</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Iles Falkland</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Iles Faroe</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finlande</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Guyane Française</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Polynésie Française</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambie</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgie</translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation>Gahna</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltare</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grèce</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Greenland</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenade</translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation>Guadeloupe</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinée</translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation>Guinée Bissau</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyane</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haïti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Saint Siège</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Hongrie</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islande</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Inde</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonésie</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irelande</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italie</translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation>Jamaïque</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordanie</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kénya</translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation>Kribati</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Corée</translation>
     </message>
     <message>
-        <source>Kuait</source>
-        <translation type="obsolete">Koweit</translation>
-    </message>
-    <message>
-        <source>Kyrgyztan</source>
-        <translation type="obsolete">Kyrgyztan</translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Lettonie</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Liban</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Libéria</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lithuanie</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxembourg</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Macédoine</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malaisie</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldives</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malte</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritanie</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Maurice</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Mexique</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Micronésie</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldavie</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolie</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Maroc</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibie</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Népal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Pays-Bas</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Nouvelle Calédonie</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nouvelle Zélande</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicaragua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigéria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Belau</translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation>Palestine</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papouasie Nouvelle Guinée</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Pérou</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Philippines</translation>
     </message>
     <message>
diff --git a/i18n/fr/advancedfm.ts b/i18n/fr/advancedfm.ts
index d266fc0..c0150fb 100644
--- a/i18n/fr/advancedfm.ts
+++ b/i18n/fr/advancedfm.ts
@@ -1,261 +1,257 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>AdvancedFm</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Montrer les fichiers cachés</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Créer un répertoire</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renommer</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Exécuter une commande</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Exécuter une commande avec une sortie</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Basculer vers &quot;Local&quot;</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Basculer vers &quot;Remote&quot;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>A propos</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Voulez-vous vraiment effacer</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Impossible de renommer</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Répertoire inexistant</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Copier sous</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Sortie d&apos;AdvancedFm</translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation>la commande n&apos;a pas fonctionnée !</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>A traduire</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Envoie Ir.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Changer de répertoire</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Exécuter</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Ouvrir comme texte</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Créer un lien symbolique</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Déplacer</translation>
     </message>
     <message>
-        <source>Rescan</source>
-        <translation type="obsolete">Rafraichir</translation>
-    </message>
-    <message>
         <source>File Info</source>
         <translation>Information sur le fichier</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Définir les droits</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriétés</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>A traduire</translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation>existe déjà
 Souhaitez-vous vraiment l&apos;effacer ?</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Copier</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Sous</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copier le même répertoire</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Sauvegarder la sortie dans un fichier</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Définir les droits</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Définir les droits pour :</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propriétaire</translation>
     </message>
     <message>
         <source>group</source>
         <translation>groupe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>autres</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propriétaire</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Groupe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lire</translation>
     </message>
     <message>
         <source>write</source>
         <translation>écrire</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>exécuter</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/appearance.ts b/i18n/fr/appearance.ts
index 2c337fa..2db7722 100644
--- a/i18n/fr/appearance.ts
+++ b/i18n/fr/appearance.ts
@@ -1,295 +1,142 @@
 <!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 effacer</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 type="obsolete">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>
     <message>
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></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/appskey.ts b/i18n/fr/appskey.ts
index 2b3ed68..582a97d 100644
--- a/i18n/fr/appskey.ts
+++ b/i18n/fr/appskey.ts
@@ -1,34 +1,30 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AppsKeyApp</name>
     <message>
         <source>Set Application Key</source>
         <translation>Définir les touches du PDA</translation>
     </message>
     <message>
-        <source>Calender</source>
-        <translation type="obsolete">Calendrier</translation>
-    </message>
-    <message>
         <source>Address Book</source>
         <translation>Carnet d&apos;adresses</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Répertoire personnel</translation>
     </message>
     <message>
         <source>Popup Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Email</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/buzzword.ts b/i18n/fr/buzzword.ts
index 279ac4e..076f679 100644
--- a/i18n/fr/buzzword.ts
+++ b/i18n/fr/buzzword.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/citytime.ts b/i18n/fr/citytime.ts
index a4681f7..e47bf91 100644
--- a/i18n/fr/citytime.ts
+++ b/i18n/fr/citytime.ts
@@ -1,100 +1,52 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation>Changement d&apos;horaire</translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation>Il a eu un problème dans la mise en place de la zone de temps %1</translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation>Restaurer la zone de temps</translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation>Il a eu un problème dans la mise en place de la zone de temps. Votre horloge n&apos;est sans doute pas bonne...</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation>City Time</translation>
     </message>
-    <message>
-        <source>&lt;location 4&gt;</source>
-        <translation type="obsolete">&lt;location 4&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 6 TIME&gt;</source>
-        <translation type="obsolete">&lt;CITY 6 TIME&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 5&gt;</source>
-        <translation type="obsolete">&lt;location 5&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 2&gt;</source>
-        <translation type="obsolete">&lt;location 2&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 6&gt;</source>
-        <translation type="obsolete">&lt;location 6&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 5 TIME&gt;</source>
-        <translation type="obsolete">&lt;CITY 5 TIME&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 2 TIME&gt;</source>
-        <translation type="obsolete">&lt;CITY 2 TIME&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 1 TIME&gt;</source>
-        <translation type="obsolete">&lt;CITY 1 TIME&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 3&gt;</source>
-        <translation type="obsolete">&lt;location 3&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 1&gt;</source>
-        <translation type="obsolete">&lt;location 1&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 3 TIME&gt;</source>
-        <translation type="obsolete">&lt;CITY 3 TIME&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 4 TIME&gt;</source>
-        <translation type="obsolete">&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 des zones de temps</translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation>&lt;p&gt;Impossible de trouver les informations de zones de temps dans %1</translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation>Impossible de trouver la carte</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation>&lt;p&gt;Impossible de charger la carte : %1, sortie de l&apos;application</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/clock.ts b/i18n/fr/clock.ts
index 635f567..b84215e 100644
--- a/i18n/fr/clock.ts
+++ b/i18n/fr/clock.ts
@@ -1,103 +1,95 @@
 <!DOCTYPE TS><TS>
 <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>Après-midi</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>
     <message>
         <source>Clock: Alarm was missed.</source>
         <translation type="unfinished"></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>Délai avant de faire du bruit
 (minutes)</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 fa9ee28..4d14091 100644
--- a/i18n/fr/datebook.ts
+++ b/i18n/fr/datebook.ts
@@ -1,646 +1,619 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Calendrier</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 aux données, 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 disponible</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>Quotidien...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Hebdomadaire...</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>
diff --git a/i18n/fr/kcheckers.ts b/i18n/fr/kcheckers.ts
index 0bb7640..4ec14df 100644
--- a/i18n/fr/kcheckers.ts
+++ b/i18n/fr/kcheckers.ts
@@ -1,198 +1,130 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <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>Qu&apos;est-ce que c&apos;est </translation>
     </message>
     <message>
-        <source>About KCheckers</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>About &amp;Qt</source>
         <translation>A propos de &amp;Qt</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>C&apos;est parti !</translation>
     </message>
     <message>
         <source>Congratulation! You have won!</source>
         <translation>Félicitation ! Vous avez gagné !</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Patientez s&apos;il vous plait...</translation>
     </message>
     <message>
         <source>You have lost. Game over.</source>
         <translation>Vous avez perdu.</translation>
     </message>
     <message>
         <source>Incorrect course.</source>
         <translation>Coup non autorisé.</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nouveau</translation>
     </message>
     <message>
         <source>&amp;Undo Move</source>
         <translation>&amp;Annuler le déplacement</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
         <source>&amp;Beginner</source>
         <translation>&amp;Débutant</translation>
     </message>
     <message>
         <source>&amp;Novice</source>
         <translation>&amp;Novice</translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation>&amp;Moyen</translation>
     </message>
     <message>
         <source>&amp;Good</source>
         <translation>&amp;Bon</translation>
     </message>
     <message>
         <source>&amp;Expert</source>
         <translation>&amp;Expert</translation>
     </message>
     <message>
         <source>&amp;Master</source>
         <translation>&amp;Maître</translation>
     </message>
     <message>
         <source>&amp;Show Numeration</source>
         <translation>&amp;Afficher les repères</translation>
     </message>
     <message>
         <source>&amp;English Rules</source>
         <translation>Règles &amp;anglaises</translation>
     </message>
     <message>
         <source>&amp;Russian Rules</source>
         <translation>Règles &amp;russes</translation>
     </message>
     <message>
         <source>&amp;Green Board</source>
         <translation>Echiquier &amp;Vert</translation>
     </message>
     <message>
         <source>&amp;Marble Board</source>
         <translation>Echiquier en &amp;marbre</translation>
     </message>
     <message>
         <source>&amp;Wooden Board</source>
         <translation>Echiquier en &amp;bois</translation>
     </message>
     <message>
         <source>&amp;Rules of Play</source>
         <translation>&amp;Règles du jeu</translation>
     </message>
     <message>
         <source>&amp;About KCheckers</source>
         <translation>&amp;A propos de KCheckers</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Jeux</translation>
     </message>
     <message>
         <source>&amp;Skill</source>
         <translation>&amp;Niveau de jeu</translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation>&amp;Options</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
         <source> New Game </source>
         <translation>Nouvelle partie</translation>
     </message>
     <message>
         <source> Undo Move </source>
         <translation>Annuler le déplacement</translation>
     </message>
     <message>
         <source> Rules of Play </source>
         <translation>Règles du jeux</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/keypebble.ts b/i18n/fr/keypebble.ts
index 3b093e3..e1e27aa 100644
--- a/i18n/fr/keypebble.ts
+++ b/i18n/fr/keypebble.ts
@@ -1,205 +1,241 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Connecté</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Connection refusée</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Hôte introuvable</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation>Erreur de lecure : QSocket a rapporté une erreur de lecture
 des données, l&apos;hôte distant a probablement clos la
 connection.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>QSocket a rapporter un code d&apos;erreur invalide</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation>Attente de l&apos;initialisation du serveur...</translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation>En attente du nom du poste...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Connecté à %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Erreur de protocole : Le message d&apos;Id %1 a été recu lors de l&apos;attente d&apos;un nouveau message.</translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Erreur de protocole : Un encodage inconnu a été utilisé par le serveur %1</translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>En attente la version du serveur...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Erreur : Version de serveur non valide, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Erreur : La version du serveur n&apos;est pas supportée, %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Loggé</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Erreur : Le serveur demande un mot de passe, mais aucun n&apos;a été fourni.
 </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Erreur : Le mot de passe fourni n&apos;est pas correct.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Erreur : Trop de tentatives de login infructueuses ont été faites
 sous ce compte, essayez plus tard.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Echec du login</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Trop d&apos;échecs</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>Visualisateur VNC</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Plein écran</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Préférences</translation>
-    </message>
-    <message>
-        <source>Connect...</source>
-        <translation>Connecté...</translation>
-    </message>
-    <message>
         <source>Disconnect</source>
         <translation>Déconnecté</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Cesser le mode &quot;plein écran&quot;</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Connecté à l&apos;hôte distant</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Loggé sur l&apos;hôte distant</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Connection terminée</translation>
     </message>
+    <message>
+        <source>New Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send Contrl-Alt-Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>KVNCConnectDlg</name>
+    <name>KVNCBookmarkDlgBase</name>
     <message>
-        <source>Connect to VNC server</source>
-        <translation>Connection au servur VNC</translation>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KVNCConnDlgBase</name>
     <message>
-        <source>Host Name:</source>
-        <translation>Hôte :</translation>
+        <source>VNC Viewer Connection</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Number:</source>
-        <translation>Numéro de &quot;display&quot; :</translation>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Password</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation>Mot de passe :</translation>
+        <translation type="unfinished">Mot de passe :</translation>
+    </message>
+    <message>
+        <source>Bookmark Name:</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VncOptionsBase</name>
     <message>
-        <source>VNC Viewer Options</source>
-        <translation>Options du visualisateur VNC</translation>
+        <source>Host Name:</source>
+        <translation type="unfinished">Hôte :</translation>
+    </message>
+    <message>
+        <source>Display Number:</source>
+        <translation type="unfinished">Numéro de &quot;display&quot; :</translation>
     </message>
     <message>
-        <source>Data Encoding</source>
-        <translation>Encodage des données</translation>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
-        <translation>Vérifier la mise à jour de l&apos;écran toutes les :</translation>
+        <translation type="unfinished">Vérifier la mise à jour de l&apos;écran toutes les :</translation>
     </message>
     <message>
         <source>Milliseconds</source>
-        <translation>Millisecondes</translation>
+        <translation type="unfinished">Millisecondes</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
-        <translation>Demande de session &quot;8 bits&quot;</translation>
+        <translation type="unfinished">Demande de session &quot;8 bits&quot;</translation>
     </message>
     <message>
         <source>Raise on bell</source>
-        <translation>Réveil à la cloche</translation>
+        <translation type="unfinished">Réveil à la cloche</translation>
     </message>
     <message>
         <source>Request shared session</source>
-        <translation>Demande de session partagée</translation>
+        <translation type="unfinished">Demande de session partagée</translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale Factor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection</source>
-        <translation>Connection</translation>
+        <source>Encodings</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
-        <translation>Encodage Hextile</translation>
+        <translation type="unfinished">Encodage Hextile</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
-        <translation>Encodage CoRRE</translation>
+        <translation type="unfinished">Encodage CoRRE</translation>
     </message>
     <message>
         <source>RRE encoding</source>
-        <translation>Encodage RRE</translation>
+        <translation type="unfinished">Encodage RRE</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
-        <translation>Copier l&apos;encodage rectangle</translation>
+        <translation type="unfinished">Copier l&apos;encodage rectangle</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libcardmonapplet.ts b/i18n/fr/libcardmonapplet.ts
index 7b823d4..b6af2e5 100644
--- a/i18n/fr/libcardmonapplet.ts
+++ b/i18n/fr/libcardmonapplet.ts
@@ -1,62 +1,34 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <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>Echec de l&apos;éjection de la carte CF/PCMCIA !</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>Echec de l&apos;éjection de la carte SD/MMC !</translation>
     </message>
     <message>
         <source>New card: </source>
         <translation>Nouvelle carte :</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>Ejecté :</translation>
     </message>
     <message>
         <source>Eject SD/MMC card</source>
         <translation>Ejection de la carte SD/MMC</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>Ejecter la carte 0 : %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>Ejecter la carte 1 : %1</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libirdaapplet.ts b/i18n/fr/libirdaapplet.ts
index e08ffa9..60a3287 100644
--- a/i18n/fr/libirdaapplet.ts
+++ b/i18n/fr/libirdaapplet.ts
@@ -1,46 +1,42 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>IrdaApplet</name>
     <message>
         <source>Discovered Device:</source>
         <translation>Périphérique découvert : </translation>
     </message>
     <message>
-        <source>None</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Disable IrDA</source>
         <translation>Désactiver l&apos;IrDA</translation>
     </message>
     <message>
         <source>Enable IrDA</source>
         <translation>Activer l&apos;IrDA</translation>
     </message>
     <message>
         <source>Disable Discovery</source>
         <translation>Désactiver la recherche</translation>
     </message>
     <message>
         <source>Enable Discovery</source>
         <translation>Activer la recherche</translation>
     </message>
     <message>
         <source>Disable Receive</source>
         <translation>Désactiver la réception</translation>
     </message>
     <message>
         <source>Enable Receive</source>
         <translation>Activer la réception</translation>
     </message>
     <message>
         <source>Found:</source>
         <translation>Trouvé :</translation>
     </message>
     <message>
         <source>Lost:</source>
         <translation>Perdu :</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libqdvorak.ts b/i18n/fr/libqdvorak.ts
index efe032d..a5e2858 100644
--- a/i18n/fr/libqdvorak.ts
+++ b/i18n/fr/libqdvorak.ts
@@ -1,10 +1,3 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
-<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 e755e88..093ec02 100644
--- a/i18n/fr/libqhandwriting.ts
+++ b/i18n/fr/libqhandwriting.ts
@@ -1,144 +1,137 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation>Aide de la reconnaissance d&apos;écriture</translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation>&lt;ul&gt;&lt;li&gt;Lorsque vous commencez à utiliser la reconnaissance d&apos;écriture, écrivez lentement, avec précision et franchement.&lt;li&gt;Utilisez les guides pour dessinervos caractères.&lt;li&gt;Lorsque vous dessiner un caractère avec plusieurs traits, chaque trait doit avoir été dessiné avant la disparition des traits précédents qui apparaissent en grisés.&lt;li&gt;Entrainez-vous à écrire.&lt;li&gt;Lorsque vous créer vos propres formes de caractères, assurez vous qu&apos;elles sont suffisament différentes des autres formes.&lt;/ul&gt;</translation>
     </message>
     <message>
         <source>Tips</source>
         <translation>Astuces</translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation>Entrainement</translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
         <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
         <translation>Sélectionner un caractère dans la liste. La one d&apos;écriture à gauche présente les caractères de référence. Entrainez-vous à écrire sur la zone à droite.</translation>
     </message>
     <message>
         <source>Matched: </source>
         <translation>Ressemblance :</translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation>Similaire à :</translation>
     </message>
     <message>
         <source>%1%</source>
         <translation>%1%</translation>
     </message>
 </context>
 <context>
-    <name>InputMethods</name>
-    <message>
-        <source>Handwriting</source>
-        <translation type="obsolete"></translation>
-    </message>
-</context>
-<context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation>Nouveau...</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Enlever</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Par défaut</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation>Entrée un nouveau caractère</translation>
     </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation>Délais d&apos;écriture des caractères multi-trait :</translation>
     </message>
     <message>
         <source>ms</source>
         <translation>ms</translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation>Affichage des zones d&apos;écriture</translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation>Zones majuscule et minuscule</translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation>Zone minuscule (enlever la zone majuscule)</translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation>Paramètrage de la reconnaissance d&apos;écriture</translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation>Profile du caractère :</translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation>Péférences</translation>
     </message>
     <message>
         <source>Customize</source>
         <translation>Personnaliser</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Plus de mémoire</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Enregistrement des informations
 Impossible.
 Libérer de la mémoire et réessayer.
 
 Quitter ?</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/libqpe.ts b/i18n/fr/libqpe.ts
index 6dcae42..282effa 100644
--- a/i18n/fr/libqpe.ts
+++ b/i18n/fr/libqpe.ts
@@ -526,213 +526,209 @@ Free some memory and try again.</source>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ram FS</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/light-and-power.ts b/i18n/fr/light-and-power.ts
index cc8fd56..44dfa2f 100644
--- a/i18n/fr/light-and-power.ts
+++ b/i18n/fr/light-and-power.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
-        <source>Light Settings</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/mail.ts b/i18n/fr/mail.ts
index 8fdd872..d251908 100644
--- a/i18n/fr/mail.ts
+++ b/i18n/fr/mail.ts
@@ -44,388 +44,384 @@
         <source>&lt;b&gt;SMTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>993</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Abort sending</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan folder list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/fr/showimg.ts b/i18n/fr/showimg.ts
index 17b9a4c..c42e7d7 100644
--- a/i18n/fr/showimg.ts
+++ b/i18n/fr/showimg.ts
@@ -1,155 +1,123 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading image...</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Could not load image</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No image - select Open from File menu.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1/%2 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>, %1 alpha levels</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, 8-bit alpha channel</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/sound.ts b/i18n/fr/sound.ts
index 492cc73..4a644be 100644
--- a/i18n/fr/sound.ts
+++ b/i18n/fr/sound.ts
@@ -1,145 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
-        <source>Restart</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>To implement a new key switch
-Opie will have to be restarted./n&lt;B&gt;Restart&lt;/B&gt; Opie now?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Shows icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>11025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>22050</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>44100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vmemo Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>33075</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Escape</source>
         <translation type="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>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/textedit.ts b/i18n/fr/textedit.ts
index fcc7214..0cf6569 100644
--- a/i18n/fr/textedit.ts
+++ b/i18n/fr/textedit.ts
@@ -1,273 +1,256 @@
 <!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>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="obsolete"></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>Text Editor has detected
- you selected a .desktop file.
-Open .desktop file or linked file?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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="obsolete"></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>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/today.ts b/i18n/fr/today.ts
index 748913e..097f0fa 100644
--- a/i18n/fr/today.ts
+++ b/i18n/fr/today.ts
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="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 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="obsolete"></translation>
-    </message>
-    <message>
         <source>No more appointments 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>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>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/hu/addressbook.ts b/i18n/hu/addressbook.ts
index cbd6585..591e4fe 100644
--- a/i18n/hu/addressbook.ts
+++ b/i18n/hu/addressbook.ts
@@ -581,392 +581,384 @@ Quit anyway?</source>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuait</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Kyrgyztan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/hu/advancedfm.ts b/i18n/hu/advancedfm.ts
index b456873..25c2ed3 100644
--- a/i18n/hu/advancedfm.ts
+++ b/i18n/hu/advancedfm.ts
@@ -1,259 +1,255 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/appearance.ts b/i18n/hu/appearance.ts
index 7c20f02..ec16822 100644
--- a/i18n/hu/appearance.ts
+++ b/i18n/hu/appearance.ts
@@ -1,145 +1,141 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/appskey.ts b/i18n/hu/appskey.ts
index e989899..ece7213 100644
--- a/i18n/hu/appskey.ts
+++ b/i18n/hu/appskey.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppsKeyApp</name>
     <message>
         <source>Set Application Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calender</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Address Book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Popup Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/buzzword.ts b/i18n/hu/buzzword.ts
index 279ac4e..076f679 100644
--- a/i18n/hu/buzzword.ts
+++ b/i18n/hu/buzzword.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/citytime.ts b/i18n/hu/citytime.ts
index 8438210..62e2ce2 100644
--- a/i18n/hu/citytime.ts
+++ b/i18n/hu/citytime.ts
@@ -1,99 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;location 4&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 6 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 5&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 2&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 6&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 5 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 2 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 1 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 3&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 1&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 3 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 4 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/keypebble.ts b/i18n/hu/keypebble.ts
index ab58148..7be0f0f 100644
--- a/i18n/hu/keypebble.ts
+++ b/i18n/hu/keypebble.ts
@@ -1,200 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connect...</source>
+        <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disconnect</source>
+        <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop Full Screen</source>
+        <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connected to remote host</source>
+        <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Logged in to remote host</source>
+        <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection closed</source>
+        <source>Open Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send Contrl-Alt-Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>KVNCConnectDlg</name>
+    <name>KVNCBookmarkDlgBase</name>
     <message>
-        <source>Connect to VNC server</source>
+        <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KVNCConnDlgBase</name>
     <message>
-        <source>Host Name:</source>
+        <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Number:</source>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VncOptionsBase</name>
     <message>
-        <source>VNC Viewer Options</source>
+        <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data Encoding</source>
+        <source>Host Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection</source>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libqpe.ts b/i18n/hu/libqpe.ts
index 495056f..0e681cb 100644
--- a/i18n/hu/libqpe.ts
+++ b/i18n/hu/libqpe.ts
@@ -524,213 +524,209 @@ Free some memory and try again.</source>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ram FS</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/light-and-power.ts b/i18n/hu/light-and-power.ts
index 5a89b8d..18b2baa 100644
--- a/i18n/hu/light-and-power.ts
+++ b/i18n/hu/light-and-power.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
-        <source>Light Settings</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/mail.ts b/i18n/hu/mail.ts
index 8fdd872..d251908 100644
--- a/i18n/hu/mail.ts
+++ b/i18n/hu/mail.ts
@@ -44,388 +44,384 @@
         <source>&lt;b&gt;SMTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>993</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Abort sending</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan folder list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/hu/showimg.ts b/i18n/hu/showimg.ts
index 17b9a4c..c42e7d7 100644
--- a/i18n/hu/showimg.ts
+++ b/i18n/hu/showimg.ts
@@ -1,155 +1,123 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading image...</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Could not load image</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No image - select Open from File menu.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1/%2 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>, %1 alpha levels</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, 8-bit alpha channel</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/sound.ts b/i18n/hu/sound.ts
index 492cc73..4a644be 100644
--- a/i18n/hu/sound.ts
+++ b/i18n/hu/sound.ts
@@ -1,145 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
-        <source>Restart</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>To implement a new key switch
-Opie will have to be restarted./n&lt;B&gt;Restart&lt;/B&gt; Opie now?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Shows icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>11025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>22050</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>44100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vmemo Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>33075</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Escape</source>
         <translation type="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>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/textedit.ts b/i18n/hu/textedit.ts
index 457b18e..d1341c7 100644
--- a/i18n/hu/textedit.ts
+++ b/i18n/hu/textedit.ts
@@ -1,273 +1,256 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></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="obsolete"></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>Text Editor has detected
- you selected a .desktop file.
-Open .desktop file or linked file?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>filePermissions</source>
-        <translation type="obsolete"></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>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/today.ts b/i18n/hu/today.ts
index 748913e..097f0fa 100644
--- a/i18n/hu/today.ts
+++ b/i18n/hu/today.ts
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="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 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="obsolete"></translation>
-    </message>
-    <message>
         <source>No more appointments 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>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>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/it/addressbook.ts b/i18n/it/addressbook.ts
index adb2a55..665aaa3 100644
--- a/i18n/it/addressbook.ts
+++ b/i18n/it/addressbook.ts
@@ -633,392 +633,384 @@ Uscire comunque?</translation>
         <source>East Timor</source>
         <translation>Timor East</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Equador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egitto</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Guinea Equatoriale</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estonia</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiopia</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Isole Falkland</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Isole Faroe</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finlandia</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Francia</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Guinea Francese</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Polinesia Francese</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Germania</translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation>Gahna</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibilterra</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grecia</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Groenlandia</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Granada</translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation>Guadalupe</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation>Guinea-bissau</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Holy See</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Ungheria</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islanda</translation>
     </message>
     <message>
         <source>India</source>
         <translation>India</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonesia</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irlanda</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israele</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italia</translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation>Giamaica</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Giappone</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Giordania</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenya</translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation>Kribati</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
-        <source>Kuait</source>
-        <translation type="obsolete">Kuwait</translation>
-    </message>
-    <message>
-        <source>Kyrgyztan</source>
-        <translation type="obsolete">Kyrgyztan</translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Latvia</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Lebanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberia</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lituania</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Lussemburgo</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Macedonia</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malaysia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldive</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinica</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritania</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Messico</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Micronesia</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldova</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolia</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marocco</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambico</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibia</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Paesi Bassi</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Nuova Caledonia</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nuova Zelandia</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicaragua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigeria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norvegia</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation>Territorio Palestinese</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Nuova Guinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Perù</translation>
     </message>
     <message>
diff --git a/i18n/it/libqpe.ts b/i18n/it/libqpe.ts
index a8d3a2c..cae443a 100644
--- a/i18n/it/libqpe.ts
+++ b/i18n/it/libqpe.ts
@@ -530,219 +530,215 @@ riprovare.</translation>
     <message>
         <source>Nickname: </source>
         <translation>Alias: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Secondo Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Cognome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffisso</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Visualizza come</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Dipartimento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Società</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Telefono Lavoro</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax Lavoro</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Cellulare Lavoro</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Email Principale</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Altre Email</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Telefono Abitazione</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax Abitazione</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Cellulare Abitazione</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Indirizzo Lavoro</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Città Lavoro</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Stato Lavoro</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>CAP Lavoro</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Paese Lavoro</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Cercapersone Lavoro</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Pagina Web Lavoro</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ufficio</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Professione</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Direttore</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Indirizzo Abitazione</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Città Abitazione</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Stato Abitazione</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>CAP Abitazione</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Paese Abitazione</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Pagina Web Abitazione</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Coniuge</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sesso</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Compleanno</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Alias</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Figli</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Gruppi</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Card CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Hard Disk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Card SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Hard Disk SCSI</translation>
     </message>
     <message>
-        <source>Ram FS</source>
-        <translation type="obsolete">Ram FS</translation>
-    </message>
-    <message>
         <source>Internal Storage</source>
         <translation>Memoria Interna</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Spazio Esaurito</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Impossibile programmare l&apos;allarme.
 Liberare dello spazio di memoria e
 riprovare</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/tetrix.ts b/i18n/it/tetrix.ts
index ed1f772..aa8a572 100644
--- a/i18n/it/tetrix.ts
+++ b/i18n/it/tetrix.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QTetrix</name>
     <message>
-        <source>QTetrix</source>
-        <translation type="obsolete">QTetrix</translation>
-    </message>
-    <message>
         <source>Next</source>
         <translation>Successivo</translation>
     </message>
     <message>
         <source>Score</source>
         <translation>Punteggio</translation>
     </message>
     <message>
         <source>Level</source>
         <translation>Livello</translation>
     </message>
     <message>
         <source>Removed</source>
         <translation>Cancellate</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inizia</translation>
     </message>
     <message>
         <source>Tetrix</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/addressbook.ts b/i18n/ja/addressbook.ts
index cbd6585..591e4fe 100644
--- a/i18n/ja/addressbook.ts
+++ b/i18n/ja/addressbook.ts
@@ -581,392 +581,384 @@ Quit anyway?</source>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuait</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Kyrgyztan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ja/advancedfm.ts b/i18n/ja/advancedfm.ts
index b456873..25c2ed3 100644
--- a/i18n/ja/advancedfm.ts
+++ b/i18n/ja/advancedfm.ts
@@ -1,259 +1,255 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/appearance.ts b/i18n/ja/appearance.ts
index 7c20f02..ec16822 100644
--- a/i18n/ja/appearance.ts
+++ b/i18n/ja/appearance.ts
@@ -1,145 +1,141 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/appskey.ts b/i18n/ja/appskey.ts
index e989899..ece7213 100644
--- a/i18n/ja/appskey.ts
+++ b/i18n/ja/appskey.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppsKeyApp</name>
     <message>
         <source>Set Application Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calender</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Address Book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Popup Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/buzzword.ts b/i18n/ja/buzzword.ts
index 279ac4e..076f679 100644
--- a/i18n/ja/buzzword.ts
+++ b/i18n/ja/buzzword.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/citytime.ts b/i18n/ja/citytime.ts
index 8438210..62e2ce2 100644
--- a/i18n/ja/citytime.ts
+++ b/i18n/ja/citytime.ts
@@ -1,99 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;location 4&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 6 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 5&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 2&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 6&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 5 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 2 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 1 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 3&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 1&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 3 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 4 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/keypebble.ts b/i18n/ja/keypebble.ts
index ab58148..7be0f0f 100644
--- a/i18n/ja/keypebble.ts
+++ b/i18n/ja/keypebble.ts
@@ -1,200 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connect...</source>
+        <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disconnect</source>
+        <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop Full Screen</source>
+        <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connected to remote host</source>
+        <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Logged in to remote host</source>
+        <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection closed</source>
+        <source>Open Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send Contrl-Alt-Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>KVNCConnectDlg</name>
+    <name>KVNCBookmarkDlgBase</name>
     <message>
-        <source>Connect to VNC server</source>
+        <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KVNCConnDlgBase</name>
     <message>
-        <source>Host Name:</source>
+        <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Number:</source>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VncOptionsBase</name>
     <message>
-        <source>VNC Viewer Options</source>
+        <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data Encoding</source>
+        <source>Host Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection</source>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libqpe.ts b/i18n/ja/libqpe.ts
index 495056f..0e681cb 100644
--- a/i18n/ja/libqpe.ts
+++ b/i18n/ja/libqpe.ts
@@ -524,213 +524,209 @@ Free some memory and try again.</source>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ram FS</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/light-and-power.ts b/i18n/ja/light-and-power.ts
index 5a89b8d..18b2baa 100644
--- a/i18n/ja/light-and-power.ts
+++ b/i18n/ja/light-and-power.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
-        <source>Light Settings</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/mail.ts b/i18n/ja/mail.ts
index 8fdd872..d251908 100644
--- a/i18n/ja/mail.ts
+++ b/i18n/ja/mail.ts
@@ -44,388 +44,384 @@
         <source>&lt;b&gt;SMTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>993</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Abort sending</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan folder list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ja/showimg.ts b/i18n/ja/showimg.ts
index 17b9a4c..c42e7d7 100644
--- a/i18n/ja/showimg.ts
+++ b/i18n/ja/showimg.ts
@@ -1,155 +1,123 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading image...</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Could not load image</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No image - select Open from File menu.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1/%2 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>, %1 alpha levels</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, 8-bit alpha channel</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/sound.ts b/i18n/ja/sound.ts
index 492cc73..4a644be 100644
--- a/i18n/ja/sound.ts
+++ b/i18n/ja/sound.ts
@@ -1,145 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
-        <source>Restart</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>To implement a new key switch
-Opie will have to be restarted./n&lt;B&gt;Restart&lt;/B&gt; Opie now?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Shows icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>11025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>22050</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>44100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vmemo Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>33075</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Escape</source>
         <translation type="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>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/textedit.ts b/i18n/ja/textedit.ts
index 457b18e..d1341c7 100644
--- a/i18n/ja/textedit.ts
+++ b/i18n/ja/textedit.ts
@@ -1,273 +1,256 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></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="obsolete"></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>Text Editor has detected
- you selected a .desktop file.
-Open .desktop file or linked file?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>filePermissions</source>
-        <translation type="obsolete"></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>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/today.ts b/i18n/ja/today.ts
index 748913e..097f0fa 100644
--- a/i18n/ja/today.ts
+++ b/i18n/ja/today.ts
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="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 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="obsolete"></translation>
-    </message>
-    <message>
         <source>No more appointments 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>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>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/ko/addressbook.ts b/i18n/ko/addressbook.ts
index 61eb074..9b90992 100644
--- a/i18n/ko/addressbook.ts
+++ b/i18n/ko/addressbook.ts
@@ -590,392 +590,384 @@ Quit anyway?</source>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuait</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Kyrgyztan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ko/advancedfm.ts b/i18n/ko/advancedfm.ts
index b456873..25c2ed3 100644
--- a/i18n/ko/advancedfm.ts
+++ b/i18n/ko/advancedfm.ts
@@ -1,259 +1,255 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/appearance.ts b/i18n/ko/appearance.ts
index aa6c4ab..5274e0a 100644
--- a/i18n/ko/appearance.ts
+++ b/i18n/ko/appearance.ts
@@ -1,146 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation>태마</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>스타일</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>현재 태마</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>저장</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>색깔</translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation>찾기...</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>배경화면</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation>현재 태마 편집...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>지우기</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>정말로 지울까요</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>예</translation>
     </message>
     <message>
         <source>No</source>
         <translation>아니오</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>태마 지우기</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>태마를 지울수 없습니다</translation>
     </message>
     <message>
         <source>Select</source>
         <translation>선택</translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation>배경 이미지를 사용</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>기본</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>글꼴</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>크기</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>The Quick Brown Fox Jumps Over The Lazy Dog
 가나다라마바사</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation type="obsolete">적용</translation>
-    </message>
-    <message>
         <source>Restart</source>
         <translation>재시작</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation>지금 오삐를 재시작 할까요?</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>설정...</translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation>탭의 종류:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>탭</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>탭과 아이콘</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>드랍다운 리스트</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>아이콘 있는 드랍다운 리스트</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>위</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>아래</translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
         <translation>오삐 프로그램들의 고급 옵션들을 키기</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>고급</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>태마 편집</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/appskey.ts b/i18n/ko/appskey.ts
index e989899..ece7213 100644
--- a/i18n/ko/appskey.ts
+++ b/i18n/ko/appskey.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppsKeyApp</name>
     <message>
         <source>Set Application Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calender</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Address Book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Popup Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/buzzword.ts b/i18n/ko/buzzword.ts
index 279ac4e..076f679 100644
--- a/i18n/ko/buzzword.ts
+++ b/i18n/ko/buzzword.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/citytime.ts b/i18n/ko/citytime.ts
index 8438210..62e2ce2 100644
--- a/i18n/ko/citytime.ts
+++ b/i18n/ko/citytime.ts
@@ -1,99 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;location 4&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 6 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 5&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 2&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 6&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 5 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 2 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 1 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 3&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 1&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 3 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 4 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/keypebble.ts b/i18n/ko/keypebble.ts
index ab58148..7be0f0f 100644
--- a/i18n/ko/keypebble.ts
+++ b/i18n/ko/keypebble.ts
@@ -1,200 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connect...</source>
+        <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disconnect</source>
+        <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop Full Screen</source>
+        <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connected to remote host</source>
+        <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Logged in to remote host</source>
+        <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection closed</source>
+        <source>Open Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send Contrl-Alt-Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>KVNCConnectDlg</name>
+    <name>KVNCBookmarkDlgBase</name>
     <message>
-        <source>Connect to VNC server</source>
+        <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KVNCConnDlgBase</name>
     <message>
-        <source>Host Name:</source>
+        <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Number:</source>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VncOptionsBase</name>
     <message>
-        <source>VNC Viewer Options</source>
+        <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data Encoding</source>
+        <source>Host Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection</source>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libqpe.ts b/i18n/ko/libqpe.ts
index 495056f..0e681cb 100644
--- a/i18n/ko/libqpe.ts
+++ b/i18n/ko/libqpe.ts
@@ -524,213 +524,209 @@ Free some memory and try again.</source>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ram FS</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/light-and-power.ts b/i18n/ko/light-and-power.ts
index 5a89b8d..18b2baa 100644
--- a/i18n/ko/light-and-power.ts
+++ b/i18n/ko/light-and-power.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
-        <source>Light Settings</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/mail.ts b/i18n/ko/mail.ts
index 8fdd872..d251908 100644
--- a/i18n/ko/mail.ts
+++ b/i18n/ko/mail.ts
@@ -44,388 +44,384 @@
         <source>&lt;b&gt;SMTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>993</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Abort sending</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan folder list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ko/showimg.ts b/i18n/ko/showimg.ts
index 17b9a4c..c42e7d7 100644
--- a/i18n/ko/showimg.ts
+++ b/i18n/ko/showimg.ts
@@ -1,155 +1,123 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading image...</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Could not load image</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No image - select Open from File menu.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1/%2 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>, %1 alpha levels</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, 8-bit alpha channel</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/sound.ts b/i18n/ko/sound.ts
index 492cc73..4a644be 100644
--- a/i18n/ko/sound.ts
+++ b/i18n/ko/sound.ts
@@ -1,145 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
-        <source>Restart</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>To implement a new key switch
-Opie will have to be restarted./n&lt;B&gt;Restart&lt;/B&gt; Opie now?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Shows icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>11025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>22050</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>44100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vmemo Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>33075</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Escape</source>
         <translation type="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>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/textedit.ts b/i18n/ko/textedit.ts
index 58814d1..a4cc96e 100644
--- a/i18n/ko/textedit.ts
+++ b/i18n/ko/textedit.ts
@@ -1,279 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation>글꼴</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>크기</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>글꼴</translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation>글꼴</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>The Quick Brown Fox Jumps Over The Lazy Dog
 가나다라마바사</translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation>글꼴</translation>
     </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>새글</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>열기</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>저장</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>새 이름으로</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>자르기</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>복사</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>붙이기</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>찾기...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>확대</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>축소</translation>
     </message>
     <message>
         <source>Bold</source>
         <translation>볼드</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation>이탈릭</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>줄을 감기</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>새 문서으로 시작하기</translation>
     </message>
     <message>
         <source>File</source>
         <translation>파일</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>편집</translation>
     </message>
     <message>
         <source>View</source>
         <translation>보기</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>다음 찾기</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>닫기</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>지우기</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>텍스트 편집기</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>무명</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>글꼴</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>권한</translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation>글꼴</translation>
     </message>
     <message>
-        <source>Do you really want
-to delete the current file
-from the disk?
-This is irreversable!!</source>
-        <translation type="obsolete">정말로 이 파일을
-디스크에서 지우고
-시프신가요?
-되돌릴수 없어요!</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>예</translation>
     </message>
     <message>
         <source>No</source>
         <translation>아니오</translation>
     </message>
     <message>
         <source>About</source>
         <translation>정보</translation>
     </message>
     <message>
-        <source>Text Editor has detected
- you selected a .desktop file.
-Open .desktop file or linked file?</source>
-        <translation type="obsolete">.desktop 파일을 
-선택한것을 발견했습니다.
-.desktop 파일 아니면 링크되어있는 파일을 열까요?</translation>
-    </message>
-    <message>
         <source>.desktop File</source>
         <translation>.desktop 파일</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>링크된 문서</translation>
     </message>
     <message>
         <source>All</source>
         <translation>모두</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>텍스트</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>파일 권한 설정</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>파일 권한 설정:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>주인</translation>
     </message>
     <message>
         <source>group</source>
         <translation>그룹</translation>
     </message>
     <message>
         <source>others</source>
         <translation>기타</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>주인</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>그룹</translation>
     </message>
     <message>
         <source>read</source>
         <translation>읽기</translation>
     </message>
     <message>
         <source>write</source>
         <translation>쓰기</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>실행</translation>
     </message>
     <message>
-        <source>filePermissions</source>
-        <translation type="obsolete">파일권한</translation>
-    </message>
-    <message>
         <source>Warning</source>
         <translation>경고</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>에러- 유저가 없음</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>에러- 그룹이 없음</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>소유권이나 그룹을 설정하는데 에러 발생</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>모드 설정하는데 에러 발생</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/today.ts b/i18n/ko/today.ts
index 748913e..097f0fa 100644
--- a/i18n/ko/today.ts
+++ b/i18n/ko/today.ts
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="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 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="obsolete"></translation>
-    </message>
-    <message>
         <source>No more appointments 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>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>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/no/addressbook.ts b/i18n/no/addressbook.ts
index cbd6585..591e4fe 100644
--- a/i18n/no/addressbook.ts
+++ b/i18n/no/addressbook.ts
@@ -581,392 +581,384 @@ Quit anyway?</source>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuait</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Kyrgyztan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/no/advancedfm.ts b/i18n/no/advancedfm.ts
index b456873..25c2ed3 100644
--- a/i18n/no/advancedfm.ts
+++ b/i18n/no/advancedfm.ts
@@ -1,259 +1,255 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/appearance.ts b/i18n/no/appearance.ts
index 7c20f02..ec16822 100644
--- a/i18n/no/appearance.ts
+++ b/i18n/no/appearance.ts
@@ -1,145 +1,141 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/appskey.ts b/i18n/no/appskey.ts
index e989899..ece7213 100644
--- a/i18n/no/appskey.ts
+++ b/i18n/no/appskey.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppsKeyApp</name>
     <message>
         <source>Set Application Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calender</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Address Book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Popup Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/buzzword.ts b/i18n/no/buzzword.ts
index 279ac4e..076f679 100644
--- a/i18n/no/buzzword.ts
+++ b/i18n/no/buzzword.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/citytime.ts b/i18n/no/citytime.ts
index 8438210..62e2ce2 100644
--- a/i18n/no/citytime.ts
+++ b/i18n/no/citytime.ts
@@ -1,99 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;location 4&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 6 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 5&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 2&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 6&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 5 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 2 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 1 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 3&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 1&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 3 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 4 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/keypebble.ts b/i18n/no/keypebble.ts
index ab58148..7be0f0f 100644
--- a/i18n/no/keypebble.ts
+++ b/i18n/no/keypebble.ts
@@ -1,200 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connect...</source>
+        <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disconnect</source>
+        <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop Full Screen</source>
+        <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connected to remote host</source>
+        <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Logged in to remote host</source>
+        <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection closed</source>
+        <source>Open Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send Contrl-Alt-Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>KVNCConnectDlg</name>
+    <name>KVNCBookmarkDlgBase</name>
     <message>
-        <source>Connect to VNC server</source>
+        <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KVNCConnDlgBase</name>
     <message>
-        <source>Host Name:</source>
+        <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Number:</source>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VncOptionsBase</name>
     <message>
-        <source>VNC Viewer Options</source>
+        <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data Encoding</source>
+        <source>Host Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection</source>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libqpe.ts b/i18n/no/libqpe.ts
index 495056f..0e681cb 100644
--- a/i18n/no/libqpe.ts
+++ b/i18n/no/libqpe.ts
@@ -524,213 +524,209 @@ Free some memory and try again.</source>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ram FS</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/light-and-power.ts b/i18n/no/light-and-power.ts
index 5a89b8d..18b2baa 100644
--- a/i18n/no/light-and-power.ts
+++ b/i18n/no/light-and-power.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
-        <source>Light Settings</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/mail.ts b/i18n/no/mail.ts
index 8fdd872..d251908 100644
--- a/i18n/no/mail.ts
+++ b/i18n/no/mail.ts
@@ -44,388 +44,384 @@
         <source>&lt;b&gt;SMTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>993</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Abort sending</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan folder list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/no/showimg.ts b/i18n/no/showimg.ts
index 17b9a4c..c42e7d7 100644
--- a/i18n/no/showimg.ts
+++ b/i18n/no/showimg.ts
@@ -1,155 +1,123 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading image...</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Could not load image</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No image - select Open from File menu.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1/%2 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>, %1 alpha levels</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, 8-bit alpha channel</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/sound.ts b/i18n/no/sound.ts
index 492cc73..4a644be 100644
--- a/i18n/no/sound.ts
+++ b/i18n/no/sound.ts
@@ -1,145 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
-        <source>Restart</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>To implement a new key switch
-Opie will have to be restarted./n&lt;B&gt;Restart&lt;/B&gt; Opie now?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Shows icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>11025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>22050</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>44100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vmemo Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>33075</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Escape</source>
         <translation type="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>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/textedit.ts b/i18n/no/textedit.ts
index 457b18e..d1341c7 100644
--- a/i18n/no/textedit.ts
+++ b/i18n/no/textedit.ts
@@ -1,273 +1,256 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></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="obsolete"></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>Text Editor has detected
- you selected a .desktop file.
-Open .desktop file or linked file?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>filePermissions</source>
-        <translation type="obsolete"></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>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/today.ts b/i18n/no/today.ts
index 748913e..097f0fa 100644
--- a/i18n/no/today.ts
+++ b/i18n/no/today.ts
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="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 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="obsolete"></translation>
-    </message>
-    <message>
         <source>No more appointments 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>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>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/pl/addressbook.ts b/i18n/pl/addressbook.ts
index 4268446..f4be76d 100644
--- a/i18n/pl/addressbook.ts
+++ b/i18n/pl/addressbook.ts
@@ -560,392 +560,384 @@ Zakonczyc?</translation>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuait</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Kyrgyztan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pl/advancedfm.ts b/i18n/pl/advancedfm.ts
index b456873..25c2ed3 100644
--- a/i18n/pl/advancedfm.ts
+++ b/i18n/pl/advancedfm.ts
@@ -1,259 +1,255 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/appearance.ts b/i18n/pl/appearance.ts
index 8f87b84..25beb69 100644
--- a/i18n/pl/appearance.ts
+++ b/i18n/pl/appearance.ts
@@ -1,146 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation>Wyglad</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Styl</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation>Edytuj aktualny schemat...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Kolory</translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation>Wyszukaj...</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Tlo</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Usun schemat</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Naprade chcesz skasowac schemat?
 </translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Nie mozna usunac aktualnego schematu.</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Aktualny schemat</translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Rozmiar</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Edytuj schemat</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/appskey.ts b/i18n/pl/appskey.ts
index e989899..ece7213 100644
--- a/i18n/pl/appskey.ts
+++ b/i18n/pl/appskey.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppsKeyApp</name>
     <message>
         <source>Set Application Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calender</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Address Book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Popup Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/buzzword.ts b/i18n/pl/buzzword.ts
index 279ac4e..076f679 100644
--- a/i18n/pl/buzzword.ts
+++ b/i18n/pl/buzzword.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/citytime.ts b/i18n/pl/citytime.ts
index bfb5f73..67b736d 100644
--- a/i18n/pl/citytime.ts
+++ b/i18n/pl/citytime.ts
@@ -1,99 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation>Czas zmieniony</translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation>Jest problem z ustawieniem strony czasowej %1</translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation>Przywracam Strefe Czasowa</translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation>Jest problem z ustwaieniem twojej strefy czasowej. Twoj czas moze byc bledny...</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation>Czasy w miastach</translation>
     </message>
-    <message>
-        <source>&lt;location 4&gt;</source>
-        <translation type="obsolete">&lt;location 4&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 6 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 5&gt;</source>
-        <translation type="obsolete">&lt;location 5&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 2&gt;</source>
-        <translation type="obsolete">&lt;location 2&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 6&gt;</source>
-        <translation type="obsolete">&lt;location 6&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 5 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 2 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 1 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 3&gt;</source>
-        <translation type="obsolete">&lt;location 3&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 1&gt;</source>
-        <translation type="obsolete">&lt;location 1&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 3 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 4 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation>Miasto</translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation>Nie moge znalesc informacji o strefie czasowej</translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation>&lt;p&gt;Nie moge znalesc zadnej strefy czasowej w %1</translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/keypebble.ts b/i18n/pl/keypebble.ts
index 00b9a7d..d4cd2ba 100644
--- a/i18n/pl/keypebble.ts
+++ b/i18n/pl/keypebble.ts
@@ -1,200 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Polaczony</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Polaczenie odrzucone</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Nie znaleziono serwera</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation>Oczekiwanie na inicjalizacje serwera...</translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation>Oczekiwanie na nazwe pulpitu...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Polaczony do %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>Oczekiwanie na wersje serwera...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Zalogowany</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Blad logowania</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Zbyt duzo bledow</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>Klient VNC</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Caly ekran</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Ustawienia</translation>
-    </message>
-    <message>
-        <source>Connect...</source>
-        <translation>Lacze...</translation>
-    </message>
-    <message>
         <source>Disconnect</source>
         <translation>Rozlaczono</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Do okna</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Polaczono do zdalnego serwera</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Zalogowano na zdalnym serwerze</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Polaczenie zamkniete</translation>
     </message>
+    <message>
+        <source>New Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send Contrl-Alt-Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>KVNCConnectDlg</name>
+    <name>KVNCBookmarkDlgBase</name>
     <message>
-        <source>Connect to VNC server</source>
-        <translation>Polacz do serwera VNC</translation>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KVNCConnDlgBase</name>
     <message>
-        <source>Host Name:</source>
-        <translation>Nazwa serwera:</translation>
+        <source>VNC Viewer Connection</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Number:</source>
-        <translation>Numer pulpitu:</translation>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Password</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation>Haslo:</translation>
+        <translation type="unfinished">Haslo:</translation>
+    </message>
+    <message>
+        <source>Bookmark Name:</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VncOptionsBase</name>
     <message>
-        <source>VNC Viewer Options</source>
-        <translation>Opcje klienta VNC</translation>
+        <source>Host Name:</source>
+        <translation type="unfinished">Nazwa serwera:</translation>
+    </message>
+    <message>
+        <source>Display Number:</source>
+        <translation type="unfinished">Numer pulpitu:</translation>
     </message>
     <message>
-        <source>Data Encoding</source>
-        <translation>Dekodowanie danych</translation>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
-        <translation>Sprawdz zmiany na pulpicie co:</translation>
+        <translation type="unfinished">Sprawdz zmiany na pulpicie co:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
-        <translation>Milisekund</translation>
+        <translation type="unfinished">Milisekund</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
-        <translation>Zarzadaj 8-bit sesji</translation>
+        <translation type="unfinished">Zarzadaj 8-bit sesji</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request shared session</source>
-        <translation>Zarzadaj wspoldzielonej sesji</translation>
+        <translation type="unfinished">Zarzadaj wspoldzielonej sesji</translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale Factor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection</source>
-        <translation>Polaczenie</translation>
+        <source>Encodings</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libqpe.ts b/i18n/pl/libqpe.ts
index 1bd5d44..29037e6 100644
--- a/i18n/pl/libqpe.ts
+++ b/i18n/pl/libqpe.ts
@@ -534,214 +534,210 @@ Zwolnij wiecej pamieci</translation>
     <message>
         <source>Name Title</source>
         <translation>Tytul</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Imie</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Drugie imie</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nazwisko</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Tytul</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Nazwa zawodu</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Wydzial</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Biznasowy telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Biznasowy faks</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Biznasowa komorka</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Domyslny e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-maile</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Domowy telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Domowy faks</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Domowa komorka</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Biznes ulica</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Biznes miasto</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Biznes wojewodztwo</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Biznes kod pocztowy</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Biznes Panstwo</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Biznes pager</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Biznes WWW</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Biuro</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Zawod</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Asystent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Dom ulica</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Dom miasto</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Dom wojewodztwo</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Dom kod pocztowy</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Dom Panstwo&gt;</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Dom WWW</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>malzonek</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Plec</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Urodziny</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Rocznica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Pseudonim</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Dzieci</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notatka</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupy</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ram FS</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Brak miejsca</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Nie moge ustawic alarmu.
 Zwolnij wiecej miejsca w pamieci</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/light-and-power.ts b/i18n/pl/light-and-power.ts
index 37c1d03..23a1981 100644
--- a/i18n/pl/light-and-power.ts
+++ b/i18n/pl/light-and-power.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
-        <source>Light Settings</source>
-        <translation type="obsolete">Ustawienia podswietlania</translation>
-    </message>
-    <message>
         <source>Adjust to environment</source>
         <translation>Wyrownaj do srodowiska</translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>Sensor swiatla ustawi poziom podswietlenia automatycznie</translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation>Oszczednosc energii</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation> sekund</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Wylacz swiatlo po</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Przyciemnij swiatlo po</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Zasnij po</translation>
     </message>
     <message>
         <source>Bright</source>
         <translation>Jasnosc</translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation>&lt;blockquote&gt;Im jasniej tym wiecej potrzeba energii.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Wylacz</translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/mail.ts b/i18n/pl/mail.ts
index 8fdd872..d251908 100644
--- a/i18n/pl/mail.ts
+++ b/i18n/pl/mail.ts
@@ -44,388 +44,384 @@
         <source>&lt;b&gt;SMTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>993</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Abort sending</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan folder list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pl/showimg.ts b/i18n/pl/showimg.ts
index 68425cc..5aa7313 100644
--- a/i18n/pl/showimg.ts
+++ b/i18n/pl/showimg.ts
@@ -1,155 +1,123 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Przegladarka obrazow</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Odbicie oiziome</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Odbicie pionowe</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Otworz</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Obroc o 180</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Obroc o 90</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Pelny ekran</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation> - Przegladarka obrazow</translation>
     </message>
     <message>
-        <source>Loading image...</source>
-        <translation type="obsolete">Laduje obraz</translation>
-    </message>
-    <message>
-        <source>Could not load image</source>
-        <translation type="obsolete">Nie moge zaladowac obrazu</translation>
-    </message>
-    <message>
-        <source>No image - select Open from File menu.</source>
-        <translation type="obsolete">Brak obrazu - wybierz Otworz z menu Plik</translation>
-    </message>
-    <message>
-        <source>, %1/%2 colors</source>
-        <translation type="obsolete">, %1/%2 kolorow</translation>
-    </message>
-    <message>
-        <source>, %1 colors</source>
-        <translation type="obsolete">, %1 kolorow</translation>
-    </message>
-    <message>
         <source> True color</source>
         <translation> Pelny kolor</translation>
     </message>
     <message>
-        <source>, %1 alpha levels</source>
-        <translation type="obsolete"> %1 poziomow alfa</translation>
-    </message>
-    <message>
-        <source>, 8-bit alpha channel</source>
-        <translation type="obsolete"> 8-bit kanal alfa</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation type="unfinished">Obroc o 270</translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/sound.ts b/i18n/pl/sound.ts
index 492cc73..4a644be 100644
--- a/i18n/pl/sound.ts
+++ b/i18n/pl/sound.ts
@@ -1,145 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
-        <source>Restart</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>To implement a new key switch
-Opie will have to be restarted./n&lt;B&gt;Restart&lt;/B&gt; Opie now?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Shows icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>11025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>22050</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>44100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vmemo Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>33075</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Escape</source>
         <translation type="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>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/textedit.ts b/i18n/pl/textedit.ts
index 60d4647..d34fc6f 100644
--- a/i18n/pl/textedit.ts
+++ b/i18n/pl/textedit.ts
@@ -1,275 +1,256 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FontDialog</name>
     <message>
         <source>FontDialog</source>
         <translation>WyborCzcionki</translation>
     </message>
     <message>
         <source>Font Dialog</source>
         <translation>Wybor czcionki</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation>Styl</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Otworz</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Zapisz jako</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Wytnij</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Znajdz...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Powieksz</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Pomniejsz</translation>
     </message>
     <message>
         <source>Bold</source>
         <translation>Pogrobiona</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation>Pochyla</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Zawijal linie</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Zacznij w nowym pliku</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Plik</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edycja</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Znajdz nastepny</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Zamknij wyszukiwanie</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Edytor tekstu</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>Nienazwany</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Uprawnienia</translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation>WyborCzcionki</translation>
     </message>
     <message>
-        <source>Do you really want
-to delete the current file
-from the disk?
-This is irreversable!!</source>
-        <translation type="obsolete">Czy naprawde
-chcesz usunac ten plikz dysku?
-To jest nieodwracalne!</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text Editor has detected
- you selected a .desktop file.
-Open .desktop file or linked file?</source>
-        <translation type="obsolete"></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">Wszystkie</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
-        <source>filePermissions</source>
-        <translation type="obsolete">UprawnieniaPlikow</translation>
-    </message>
-    <message>
         <source>Set File Permissions</source>
         <translation>Ustaw uprawnienia</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Ustaw uprawnienia dla:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>wlasciciel</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupa</translation>
     </message>
     <message>
         <source>others</source>
         <translation>inni</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Wlasciciel</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupa</translation>
     </message>
     <message>
         <source>read</source>
         <translation>odczyt</translation>
     </message>
     <message>
         <source>write</source>
         <translation>zapis</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>wykonywanie</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Uwaga</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Blad- nie ma uzytkownika</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Blad- brak grupy</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Blad ustawiania uprawnien</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Blad ustawienia trybu</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/today.ts b/i18n/pl/today.ts
index 922d74e..8d6b9f1 100644
--- a/i18n/pl/today.ts
+++ b/i18n/pl/today.ts
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>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 appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="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  today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opiemail not installed</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
 be shown?</source>
         <translation type="unfinished"></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="unfinished"></translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/addressbook.ts b/i18n/pt/addressbook.ts
index 5aafb9a..9a79b6a 100644
--- a/i18n/pt/addressbook.ts
+++ b/i18n/pt/addressbook.ts
@@ -589,392 +589,384 @@ Sair na mesma?</translation>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Républica Dominicana</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Timor Leste</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Equador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egipto</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Guiné Equatorial</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estónia</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiópia</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fidji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finlândia</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Guiné Francesa</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Polinésia Francesa</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabão</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gâmbia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grécia</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Granada</translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation>Guadalupe</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guiné</translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation>Guiné-Bissau</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Hungria</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islândia</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Índia</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonésia</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irlanda</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Itália</translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordania</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Casaquistão</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Quénia</translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Coreia</translation>
     </message>
     <message>
-        <source>Kuait</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Kyrgyztan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Libéria</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lituânia</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxemburgo</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Macedónia</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malásia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldivas</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritânia</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>México</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Micronésia</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Mónaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongólia</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marrocos</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Moçambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namíbia</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Holanda</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nova Zelândia</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicarágua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigéria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Paquistão</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation>Território Palestino</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panamá</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguai</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipinas</translation>
     </message>
     <message>
diff --git a/i18n/pt/advancedfm.ts b/i18n/pt/advancedfm.ts
index 12ef760..32fc41a 100644
--- a/i18n/pt/advancedfm.ts
+++ b/i18n/pt/advancedfm.ts
@@ -1,259 +1,255 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation>Ficheiro</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Mostrar Escondidos</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Criar Directoria</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Executar</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
-        <source>Rescan</source>
-        <translation type="obsolete">Re-Lêr</translation>
-    </message>
-    <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriedades</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>outros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>ler</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escrever</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>executar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/appearance.ts b/i18n/pt/appearance.ts
index d04c594..8765458 100644
--- a/i18n/pt/appearance.ts
+++ b/i18n/pt/appearance.ts
@@ -1,146 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation>Aparência</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation>Editar o esquema actual...</translation>
     </message>
     <message>
         <source>Select</source>
         <translation>Selecionar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Cores</translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation>Activar imagem de fundo</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Omissão</translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation>Procurar...</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fundo</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Apagar esquema</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Tem a certeza que quer apagar
 </translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>O esquema actual não pode ser apagado.</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Esquema actual</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>A rápida raposa castanha salta sobre o cão molenga</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation type="obsolete">Aplicar</translation>
-    </message>
-    <message>
         <source>Restart</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation>Reiniciar o Opie agora?</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editar esquema</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/appskey.ts b/i18n/pt/appskey.ts
index ca9fa6b..f6fe8b3 100644
--- a/i18n/pt/appskey.ts
+++ b/i18n/pt/appskey.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppsKeyApp</name>
     <message>
         <source>Set Application Key</source>
         <translation>Botões</translation>
     </message>
     <message>
-        <source>Calender</source>
-        <translation type="obsolete">Calendário</translation>
-    </message>
-    <message>
         <source>Address Book</source>
         <translation>Endereços</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Menu Principal</translation>
     </message>
     <message>
         <source>Popup Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Email</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/buzzword.ts b/i18n/pt/buzzword.ts
index 279ac4e..076f679 100644
--- a/i18n/pt/buzzword.ts
+++ b/i18n/pt/buzzword.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/citytime.ts b/i18n/pt/citytime.ts
index 6d566f9..456d1bb 100644
--- a/i18n/pt/citytime.ts
+++ b/i18n/pt/citytime.ts
@@ -1,99 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation>Fusos Horários</translation>
     </message>
-    <message>
-        <source>&lt;location 4&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 6 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 5&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 2&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 6&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 5 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 2 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 1 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 3&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 1&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 3 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 4 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/keypebble.ts b/i18n/pt/keypebble.ts
index cd225b3..4eac967 100644
--- a/i18n/pt/keypebble.ts
+++ b/i18n/pt/keypebble.ts
@@ -1,200 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Ligado</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Ligação Recusada</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Endereço não encontrado</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connect...</source>
+        <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disconnect</source>
+        <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop Full Screen</source>
+        <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connected to remote host</source>
+        <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Logged in to remote host</source>
+        <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection closed</source>
+        <source>Open Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send Contrl-Alt-Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>KVNCConnectDlg</name>
+    <name>KVNCBookmarkDlgBase</name>
     <message>
-        <source>Connect to VNC server</source>
+        <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KVNCConnDlgBase</name>
     <message>
-        <source>Host Name:</source>
+        <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Number:</source>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VncOptionsBase</name>
     <message>
-        <source>VNC Viewer Options</source>
+        <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data Encoding</source>
+        <source>Host Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection</source>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libqpe.ts b/i18n/pt/libqpe.ts
index 7f55dbd..eb252e6 100644
--- a/i18n/pt/libqpe.ts
+++ b/i18n/pt/libqpe.ts
@@ -525,213 +525,209 @@ Free some memory and try again.</source>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Ficheiro Como</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished">Esposa</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Nascimento</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Cartão CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Cartão SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Armazenamento Interno</translation>
     </message>
     <message>
-        <source>Ram FS</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/light-and-power.ts b/i18n/pt/light-and-power.ts
index a38da4c..be40e99 100644
--- a/i18n/pt/light-and-power.ts
+++ b/i18n/pt/light-and-power.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
-        <source>Light Settings</source>
-        <translation type="obsolete">Configuração da Luz</translation>
-    </message>
-    <message>
         <source>Adjust to environment</source>
         <translation>Ajustar ao ambiente</translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>A luz do ecrâ será ajustada automaticamente mediante a luz ambiente. O parametro do brilho afectará o brilho médio.</translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation>Poupança de energia</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>segundos</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Reduzir brilho ao fim de</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Suspender ao fim de</translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation>Desactivar o LCD apenas ao suspender</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Desligar luz ao fim de</translation>
     </message>
     <message>
         <source>Bright</source>
         <translation>Brilho</translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation>&lt;blockquote&gt;Gastará mais bateria quanto mais brilhante seja o ecrâ.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Desligar</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/mail.ts b/i18n/pt/mail.ts
index c8984e7..3f4d385 100644
--- a/i18n/pt/mail.ts
+++ b/i18n/pt/mail.ts
@@ -44,388 +44,384 @@
         <source>&lt;b&gt;SMTP:</source>
         <translation>&lt;b&gt;SMTP:</translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
         <translation>&lt;b&gt;Utilizador:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
         <translation>&lt;b&gt;Password:</translation>
     </message>
     <message>
         <source>Identity</source>
         <translation>Identidade</translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
         <translation>&lt;b&gt;Nome:</translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
         <translation>&lt;b&gt;E-Mail:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
         <translation>&lt;b&gt;Organização:</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avançado</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
         <translation>&lt;b&gt;Assinatura:</translation>
     </message>
     <message>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>993</source>
         <translation>993</translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished">Correio</translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Abort sending</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation>Para</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished">Cc</translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished">Bcc</translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation>Assunto.</translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation>Prio.</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baixa</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Apagar</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation>Contas</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation>Piscar luz</translation>
     </message>
     <message>
         <source>Play sound</source>
         <translation>Tocar som</translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Create folder</source>
         <translation>Criar pasta</translation>
     </message>
     <message>
         <source>Rescan folder list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
diff --git a/i18n/pt/showimg.ts b/i18n/pt/showimg.ts
index a0591fd..ce6be16 100644
--- a/i18n/pt/showimg.ts
+++ b/i18n/pt/showimg.ts
@@ -1,155 +1,123 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Leitor Imagens</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Virar Horizontalmente</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Virar Verticalmente</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Rodar 180º</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Rodar 90º</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Ecrâ Todo</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation>- Leitor Imagens</translation>
     </message>
     <message>
-        <source>Loading image...</source>
-        <translation type="obsolete">A ler a imagem...</translation>
-    </message>
-    <message>
-        <source>Could not load image</source>
-        <translation type="obsolete">Erro ao carregar a imagem</translation>
-    </message>
-    <message>
-        <source>No image - select Open from File menu.</source>
-        <translation type="obsolete">Sem imagens - seleccione Abrir no menu.</translation>
-    </message>
-    <message>
-        <source>, %1/%2 colors</source>
-        <translation type="obsolete">, %1/%2 cores</translation>
-    </message>
-    <message>
-        <source>, %1 colors</source>
-        <translation type="obsolete">, %1 cores</translation>
-    </message>
-    <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>, %1 alpha levels</source>
-        <translation type="obsolete">, %1 níveis</translation>
-    </message>
-    <message>
-        <source>, 8-bit alpha channel</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation type="unfinished">Rodar 270º</translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/sound.ts b/i18n/pt/sound.ts
index 0b902a9..762f609 100644
--- a/i18n/pt/sound.ts
+++ b/i18n/pt/sound.ts
@@ -1,145 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
-        <source>Restart</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>To implement a new key switch
-Opie will have to be restarted./n&lt;B&gt;Restart&lt;/B&gt; Opie now?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Shows icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>Vmemo Settings</source>
         <translation>Configuração Vmemo</translation>
     </message>
     <message>
         <source>8000</source>
         <translation>8000</translation>
     </message>
     <message>
         <source>11025</source>
         <translation>11025</translation>
     </message>
     <message>
         <source>22050</source>
         <translation>22050</translation>
     </message>
     <message>
         <source>33075</source>
         <translation>33075</translation>
     </message>
     <message>
         <source>44100</source>
         <translation>44100</translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation>Estéreo</translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation>16 bits</translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation>Alertas Visuais</translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation>Icon na Barra de Tarefas</translation>
     </message>
     <message>
         <source>Key_Escape</source>
         <translation>Key_Escape</translation>
     </message>
     <message>
         <source>Key_Space</source>
         <translation>Key_Space</translation>
     </message>
     <message>
         <source>Key_Home</source>
         <translation>Key_Home</translation>
     </message>
     <message>
         <source>Key_Calender</source>
         <translation>Key_Calendar</translation>
     </message>
     <message>
         <source>Key_Contacts</source>
         <translation>Key_Contacts</translation>
     </message>
     <message>
         <source>Key_Menu</source>
         <translation>Key_Menu</translation>
     </message>
     <message>
         <source>Key_Mail</source>
         <translation>Key_Mail</translation>
     </message>
     <message>
         <source>30</source>
         <translation type="unfinished">30</translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished">20</translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished">15</translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished">10</translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished">5</translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/textedit.ts b/i18n/pt/textedit.ts
index 3bd882c..5f5ce57 100644
--- a/i18n/pt/textedit.ts
+++ b/i18n/pt/textedit.ts
@@ -1,273 +1,256 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FontDialog</name>
     <message>
         <source>FontDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text Editor has detected
- you selected a .desktop file.
-Open .desktop file or linked file?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></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="obsolete"></translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
-        <source>filePermissions</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <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"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/today.ts b/i18n/pt/today.ts
index 27dccbc..26901de 100644
--- a/i18n/pt/today.ts
+++ b/i18n/pt/today.ts
@@ -1,129 +1,125 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; novo(s) email(s), &lt;b&gt;%2&lt;/b&gt; na caixa de saída</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Existe &lt;b&gt; 1&lt;/b&gt; tarefa activa: &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Existem &lt;b&gt; %1&lt;/b&gt; tarefas activas: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Não existem tarefas activas</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Não existem eventos hoje</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>De</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Deve preencher o cartão de visita</translation>
     </message>
     <message>
-        <source>No more  today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation>O OpieMail não está instalado</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation>Mostrar
 localização?</translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation>Mostrar
 notas?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation>Mostrar apenas
 os últimos eventos</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation>Mostrar quantas 
 tarefas?</translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation>Tarefas</translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation>Cortar ao fim
 de quantas letras</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vários</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation>Mostrar quantos
 eventos?</translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation>Lançar ao ligar? 
 (Apenas no Opie)</translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation>Mostrar ao fim de 
 quantos minutos?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/addressbook.ts b/i18n/pt_BR/addressbook.ts
index e3f77fa..d4e76f8 100644
--- a/i18n/pt_BR/addressbook.ts
+++ b/i18n/pt_BR/addressbook.ts
@@ -589,392 +589,384 @@ Sair assim mesmo?</translation>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuait</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Kyrgyztan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/advancedfm.ts b/i18n/pt_BR/advancedfm.ts
index b456873..25c2ed3 100644
--- a/i18n/pt_BR/advancedfm.ts
+++ b/i18n/pt_BR/advancedfm.ts
@@ -1,259 +1,255 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/appearance.ts b/i18n/pt_BR/appearance.ts
index 391a1c8..bee8fa2 100644
--- a/i18n/pt_BR/appearance.ts
+++ b/i18n/pt_BR/appearance.ts
@@ -1,146 +1,142 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation type="unfinished">Aparncia</translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/appskey.ts b/i18n/pt_BR/appskey.ts
index e989899..ece7213 100644
--- a/i18n/pt_BR/appskey.ts
+++ b/i18n/pt_BR/appskey.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppsKeyApp</name>
     <message>
         <source>Set Application Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calender</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Address Book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Popup Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/buzzword.ts b/i18n/pt_BR/buzzword.ts
index 279ac4e..076f679 100644
--- a/i18n/pt_BR/buzzword.ts
+++ b/i18n/pt_BR/buzzword.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/citytime.ts b/i18n/pt_BR/citytime.ts
index 5394f93..60e48f6 100644
--- a/i18n/pt_BR/citytime.ts
+++ b/i18n/pt_BR/citytime.ts
@@ -1,100 +1,52 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation>Mudando Horário</translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation>Restaurar Zona Horária</translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation>Houve um problema ajustando a zona horária %1</translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation>Houve um problema ajustando sua zona horária.Sua hora pode ficar errada agora...</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;location 4&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 6 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 5&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 2&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 6&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 5 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 2 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 1 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 3&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 1&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 3 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 4 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation>Cidade</translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation>Impossível localizar informações sobre zona horária</translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation>&lt;p&gt;Impossível localizar informações sobre zona horária %1</translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation>Não foi Possível Localizar o Mapa</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation>&lt;p&gt;Não pude carregar o mapa: %1, saindo</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/keypebble.ts b/i18n/pt_BR/keypebble.ts
index 5e68984..7a007dd 100644
--- a/i18n/pt_BR/keypebble.ts
+++ b/i18n/pt_BR/keypebble.ts
@@ -1,205 +1,241 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Host not found</source>
         <translation>Computador não localizado</translation>
     </message>
     <message>
         <source>Connected</source>
         <translation>Conectado</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Conexão Recusada</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>QSocket reportou um código de erro inválido</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation>Erro de Leitura: QSocket informou um erro lendo
 dados, o computador remoto provavelmente derrubou
 a conexão.</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for desktop name...</source>
         <translation>Esperando pelo nome da área de trabalho...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Conectado a %1</translation>
     </message>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation>Eperando a inicialização do servidor...</translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Erro de Protocolo: Uma codificação desconhecida foi usada pelo servidor %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Erro de Protocolo: A mensagem Id %1 foi </translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Erro: Versão do servidor inválida, %1</translation>
     </message>
     <message>
         <source>Waiting for server version...</source>
         <translation>Aguardando por versão do servidor...</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Login Falhou</translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>A senha especificada estava incorreta.</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Muitas Falhas</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Erro: Muitas tentativas inválidas de login foram feitas
 nesta conta. Por favor tente mais tarde.</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Conectado</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Erro: Versão do servidor não suportada, %1</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Erro: Este servidor requer uma senha, mas nenhuma foi especificada.
 </translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
-        <source>Connect...</source>
-        <translation>Conectar...</translation>
-    </message>
-    <message>
         <source>Connected to remote host</source>
         <translation>Conectado ao computador remoto</translation>
     </message>
     <message>
         <source>VNC Viewer</source>
         <translation>VNC Viewer</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Tela Cheia</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Sair da tela cheia</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Conectado ao computador remoto</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Configurações</translation>
-    </message>
-    <message>
         <source>Connection closed</source>
         <translation>Conexão fechada</translation>
     </message>
+    <message>
+        <source>New Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send Contrl-Alt-Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>KVNCConnectDlg</name>
+    <name>KVNCBookmarkDlgBase</name>
     <message>
-        <source>Host Name:</source>
-        <translation>Nome do Computador:</translation>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KVNCConnDlgBase</name>
     <message>
-        <source>Connect to VNC server</source>
-        <translation>Conectar a um servidor VNC</translation>
+        <source>VNC Viewer Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Password</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation>Senha:</translation>
+        <translation type="unfinished">Senha:</translation>
     </message>
     <message>
-        <source>Display Number:</source>
-        <translation>Número da Tela:</translation>
+        <source>Bookmark Name:</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VncOptionsBase</name>
     <message>
-        <source>CoRRE encoding</source>
-        <translation type="unfinished">Codificação CoRRE</translation>
+        <source>Host Name:</source>
+        <translation type="unfinished">Nome do Computador:</translation>
     </message>
     <message>
-        <source>RRE encoding</source>
-        <translation type="unfinished">RRE encoding</translation>
+        <source>Display Number:</source>
+        <translation type="unfinished">Número da Tela:</translation>
     </message>
     <message>
-        <source>Connection</source>
-        <translation type="unfinished">Conexão</translation>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Copy rectangle encoding</source>
-        <translation type="unfinished">Codificação copia de retângulo</translation>
+        <source>Check for screen updates every:</source>
+        <translation type="unfinished">Verificar atualizações da tela a cada:</translation>
+    </message>
+    <message>
+        <source>Milliseconds</source>
+        <translation type="unfinished">Milisegundos</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished">Requisitar sessão 8-bits</translation>
     </message>
     <message>
-        <source>VNC Viewer Options</source>
-        <translation type="unfinished">Opções do VNC Viewer</translation>
+        <source>Raise on bell</source>
+        <translation type="unfinished">Trazer para frente com campainha</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation type="unfinished">Requisitar sessão compartilhada</translation>
     </message>
     <message>
-        <source>Milliseconds</source>
-        <translation type="unfinished">Milisegundos</translation>
+        <source>1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data Encoding</source>
-        <translation type="unfinished">Codificação dos dados</translation>
+        <source>2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check for screen updates every:</source>
-        <translation type="unfinished">Verificar atualizações da tela a cada:</translation>
+        <source>4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Raise on bell</source>
-        <translation type="unfinished">Trazer para frente com campainha</translation>
+        <source>Scale Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encodings</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation type="unfinished">Codificação Hextile</translation>
     </message>
+    <message>
+        <source>CoRRE encoding</source>
+        <translation type="unfinished">Codificação CoRRE</translation>
+    </message>
+    <message>
+        <source>RRE encoding</source>
+        <translation type="unfinished">RRE encoding</translation>
+    </message>
+    <message>
+        <source>Copy rectangle encoding</source>
+        <translation type="unfinished">Codificação copia de retângulo</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libclockapplet.ts b/i18n/pt_BR/libclockapplet.ts
index a5e2858..4eb9e18 100644
--- a/i18n/pt_BR/libclockapplet.ts
+++ b/i18n/pt_BR/libclockapplet.ts
@@ -1,3 +1,2 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 </TS>
diff --git a/i18n/pt_BR/libqpe.ts b/i18n/pt_BR/libqpe.ts
index 6512875..c345ffd 100644
--- a/i18n/pt_BR/libqpe.ts
+++ b/i18n/pt_BR/libqpe.ts
@@ -535,214 +535,210 @@ tente novamente.</translation>
     <message>
         <source>Name Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Sobrenome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Arquivar Como</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Título Prof</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Departamento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Companhia</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Fone Comercial</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax Comercial</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Celular Comercial</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>E-mail Padrão</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-mails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Fone Res</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax Resid</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Celular Pess</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Endereço Comercial</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Cidade Comercial</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>UF Comercial</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>CEP Comercial</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>País Comercial</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pager Comercial</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Pág. Web Comercial</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profissão</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Gerente</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Endereço Res</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Cidade Res</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>UF Res</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>CEP Res</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>país Res</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Pág. Web Pessoal</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Esposo(a)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniv. de Casamento</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Crianças</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco Rígido SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Armazenamento Interno</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Cartão SD</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>Cartão CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco Rígido</translation>
     </message>
     <message>
-        <source>Ram FS</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Impossível agendar alarme.
 Por Favor libere algum espaço e tente novamente</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/light-and-power.ts b/i18n/pt_BR/light-and-power.ts
index d33cbae..001691b 100644
--- a/i18n/pt_BR/light-and-power.ts
+++ b/i18n/pt_BR/light-and-power.ts
@@ -1,58 +1,54 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>Off</source>
         <translation type="unfinished">Desligada</translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished">Conservação de enegria</translation>
     </message>
     <message>
-        <source>Light Settings</source>
-        <translation type="obsolete">Configuração de iluminação</translation>
-    </message>
-    <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished">&lt;blockquote&gt;Quanto mais clara a luz mais bateria será usada.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished">Apagar luz após</translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished">Detectando a luz ambiente do local onde você está usando o dispositivo a iluminação pode ser ajustada automaticamente. A configuração de brilho ainda afeta a média de blilho.</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished">Diminuir a luz após</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"> segundos</translation>
     </message>
     <message>
         <source>Adjust to environment</source>
         <translation type="unfinished">Ajustar ao meio-ambiente</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished">Suspender após</translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/mail.ts b/i18n/pt_BR/mail.ts
index 8fdd872..d251908 100644
--- a/i18n/pt_BR/mail.ts
+++ b/i18n/pt_BR/mail.ts
@@ -44,388 +44,384 @@
         <source>&lt;b&gt;SMTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>993</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Abort sending</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan folder list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/showimg.ts b/i18n/pt_BR/showimg.ts
index 76ab82c..4345f13 100644
--- a/i18n/pt_BR/showimg.ts
+++ b/i18n/pt_BR/showimg.ts
@@ -1,156 +1,124 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Visualizador de Imagens</translation>
     </message>
     <message>
-        <source>No image - select Open from File menu.</source>
-        <translation type="obsolete">Sem imagem - selecione Abrir no menu Arquivo.</translation>
-    </message>
-    <message>
-        <source>, %1 alpha levels</source>
-        <translation type="obsolete">, %1 níveis alfa</translation>
-    </message>
-    <message>
-        <source>, %1/%2 colors</source>
-        <translation type="obsolete">, %1%2 cores</translation>
-    </message>
-    <message>
-        <source>, 8-bit alpha channel</source>
-        <translation type="obsolete">, canal alfa de 8 bits</translation>
-    </message>
-    <message>
-        <source>Could not load image</source>
-        <translation type="obsolete">Não foi possível carregar imagem</translation>
-    </message>
-    <message>
-        <source>, %1 colors</source>
-        <translation type="obsolete">, %1 cores</translation>
-    </message>
-    <message>
         <source> True color</source>
         <translation>Cores reais</translation>
     </message>
     <message>
-        <source>Loading image...</source>
-        <translation type="obsolete">Carregando imagem...</translation>
-    </message>
-    <message>
         <source>Vertical flip</source>
         <translation>Giro vertical</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Giro horizontal</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/sound.ts b/i18n/pt_BR/sound.ts
index 499e52e..c75f8c9 100644
--- a/i18n/pt_BR/sound.ts
+++ b/i18n/pt_BR/sound.ts
@@ -1,146 +1,129 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>SoundSettings</name>
     <message>
-        <source>Restart</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>To implement a new key switch
-Opie will have to be restarted./n&lt;B&gt;Restart&lt;/B&gt; Opie now?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Shows icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>Stereo</source>
         <translation type="unfinished">Estéreo</translation>
     </message>
     <message>
         <source>11025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>22050</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>44100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vmemo Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>33075</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Escape</source>
         <translation type="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>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/textedit.ts b/i18n/pt_BR/textedit.ts
index 1feb3f5..1d59c8b 100644
--- a/i18n/pt_BR/textedit.ts
+++ b/i18n/pt_BR/textedit.ts
@@ -1,274 +1,257 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>The Quick Brown Fox Jumps Over The Lazy Dog</translation>
     </message>
     <message>
         <source>Font Dialog</source>
         <translation>Diálogo de Fontes</translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation>Estilo da Fonte</translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Bold</source>
         <translation>Negrito</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Arquivo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Aproximar</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Quebrar linhas</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Localizar Próx.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editor de Texto</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation>Itálico</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Afastar</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Fechar Localização</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Salvar Como</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>Sem Nome</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Localizar...</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Iniciar com novo arquivo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">Fonte</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="obsolete"></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>Text Editor has detected
- you selected a .desktop file.
-Open .desktop file or linked file?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>read</source>
         <translation>ler</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Dono</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>dono</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escrever</translation>
     </message>
     <message>
         <source>others</source>
         <translation>outros</translation>
     </message>
     <message>
         <source>Set File Permissions</source>
         <translation>Ajustar Permissões de Arquivo</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>executar</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Ajustar permissões de arquivo para:</translation>
     </message>
     <message>
-        <source>filePermissions</source>
-        <translation type="obsolete"></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>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/today.ts b/i18n/pt_BR/today.ts
index 0c3ecf8..b33be6c 100644
--- a/i18n/pt_BR/today.ts
+++ b/i18n/pt_BR/today.ts
@@ -1,129 +1,125 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; nova(s) mensagem(ns), &lt;b&gt;%2&lt;/b&gt; saída</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Existem &lt;b&gt; 1&lt;/b&gt; tarefas ativas:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Existem &lt;b&gt; %1&lt;/b&gt; tarefas ativas: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Nenhuma tarefa ativa</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished">Nenhum compromisso hoje</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="obsolete"></translation>
-    </message>
-    <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation>Opiemail não instalado</translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished">Hoje</translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation>Quantas
 tarefas devem 
 ser mostradas ?</translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation>Tarefas</translation>
     </message>
     <message>
         <source>Today config</source>
         <translation>Configuração do Hoje</translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation>As notas devem 
 ser mostradas ?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation>Mostrar apenas
 compr. atrasados</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation>A localização 
 deve ser 
 mostrada ?</translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation>Truncar após
 quantas letras</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Misc</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/sl/addressbook.ts b/i18n/sl/addressbook.ts
index 82907c9..9c91c60 100644
--- a/i18n/sl/addressbook.ts
+++ b/i18n/sl/addressbook.ts
@@ -589,392 +589,384 @@ Izhod?</translation>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Dominikanska Republika</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Vzhodni Timor</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ekvador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egipt</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Ekvatorialna Gvineja</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Ertireja</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estonia</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiopija</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Falkland Islands</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Faroe Island</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fidži</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finska</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Francoska Gvineja</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Francoska Polinezija</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gamia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Džordžija </translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation>Gana</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grčija</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Grenlandija</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenada</translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation>Gvadelup</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Gvatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Gvineja</translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation>Guinea-bissau</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Holy See</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Madžarska</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islandija</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Indija</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonezija</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irska</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Izrael</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italija</translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation>Jamajka</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordan</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenija</translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation>Kribati</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
-        <source>Kuait</source>
-        <translation type="obsolete">Kuvajt</translation>
-    </message>
-    <message>
-        <source>Kyrgyztan</source>
-        <translation type="obsolete">Kyrgyztan</translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Latvia</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Libanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lestosha</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberija</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lituana</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luksemburg</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Makedonija</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagaskar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malezija</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldivi</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritania</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Mehika</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Mikronezija</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldova</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monako</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolija</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Maroko</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambik</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibia</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Nizozemska</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Nova Kaledonija</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nova Zelandija</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nikarakvu</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigerija</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation>Palestinsko ozemlje</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papva Nova Gvineja</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paragvaj</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipini</translation>
     </message>
     <message>
diff --git a/i18n/sl/advancedfm.ts b/i18n/sl/advancedfm.ts
index 2da0ac3..33224a0 100644
--- a/i18n/sl/advancedfm.ts
+++ b/i18n/sl/advancedfm.ts
@@ -1,260 +1,256 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>NapredniDu</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datoteka</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Prikaži skrite datoteke</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Ustvari imenik</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Preimenuj</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Poženi ukaz</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Poženi ukaz z izhodom</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Preklopi na lokalen</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Preklopi na oddaljen</translation>
     </message>
     <message>
         <source>About</source>
         <translation>O</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Ali res želite izbrisati
 </translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Note</source>
         <translation></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Ne morem preimenovati</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ta imenik ne obstaja</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Prekopiraj kot</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>NapredniDu izhod</translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation>ukaz spodletel!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Vredu</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Naprednidu prežarči ven</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir poslan.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Zamenjaj imenik</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Izvrši</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Odpri kot besedilo</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Ustvari povezavo</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Prestavi</translation>
     </message>
     <message>
-        <source>Rescan</source>
-        <translation type="obsolete">Preglej</translation>
-    </message>
-    <message>
         <source>File Info</source>
         <translation>Informacije o datoteki</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Nastavi pravice</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Lastnosti</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Prežarči datoteko</translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation>že obstaja Ali res želite izbrisati?</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Kot</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Kopiraj isti imenik</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Shrani izhod v datoteko (samo ime)</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Nastavi datotečne pravice</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Nastavi datotečne pravice za:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>lastnik</translation>
     </message>
     <message>
         <source>group</source>
         <translation>skupina</translation>
     </message>
     <message>
         <source>others</source>
         <translation>drugi</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Lastnik</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
     <message>
         <source>read</source>
         <translation>beri</translation>
     </message>
     <message>
         <source>write</source>
         <translation>piši</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>izvrši</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/appearance.ts b/i18n/sl/appearance.ts
index 4d1fcef..d052631 100644
--- a/i18n/sl/appearance.ts
+++ b/i18n/sl/appearance.ts
@@ -1,146 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation>Videz</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Trenutna shema</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Shrani</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Barve</translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation>Prebrskaj...</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Ozadje</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation>Nastavi trenutno shemo...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Ali res želite izbrisati
 </translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Izbriši shemo</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Ne morem izbrisati trenutne sheme.</translation>
     </message>
     <message>
         <source>Select</source>
         <translation>Izberi</translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation>Vklopi sliko ozadja</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Privzeto</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Hitra lisica skoči čez lenega psa</translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation type="obsolete">Uveljavi</translation>
-    </message>
-    <message>
         <source>Restart</source>
         <translation>Ponovno zaženi</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation>Ali želite zdaj ponovno zagnati Opie?</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>Nastavitve...</translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Uredi shemo</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/appskey.ts b/i18n/sl/appskey.ts
index a9df778..7959c81 100644
--- a/i18n/sl/appskey.ts
+++ b/i18n/sl/appskey.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppsKeyApp</name>
     <message>
         <source>Set Application Key</source>
         <translation>Nastavi programsko tipko</translation>
     </message>
     <message>
-        <source>Calender</source>
-        <translation type="obsolete">Koledar</translation>
-    </message>
-    <message>
         <source>Address Book</source>
         <translation>Knjiga naslovov</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Popup Menu</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Pošta</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/buzzword.ts b/i18n/sl/buzzword.ts
index 279ac4e..076f679 100644
--- a/i18n/sl/buzzword.ts
+++ b/i18n/sl/buzzword.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/citytime.ts b/i18n/sl/citytime.ts
index 26dc051..cbf7b33 100644
--- a/i18n/sl/citytime.ts
+++ b/i18n/sl/citytime.ts
@@ -1,99 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation>Menjam čas</translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation>Prišlo je do problema pri nastavitvi časovnega pasu %1</translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation>Restoriraj časovni pas</translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation>Prišlo je do problema pri nastavitvi časovnega pasu. Čas bo mogoče napačen...</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation>Mestni čas</translation>
     </message>
-    <message>
-        <source>&lt;location 4&gt;</source>
-        <translation type="obsolete">&lt;lokacija 4&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 6 TIME&gt;</source>
-        <translation type="obsolete">&lt;MESTO 6 ČAS&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 5&gt;</source>
-        <translation type="obsolete">&lt;lokacija 5&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 2&gt;</source>
-        <translation type="obsolete">&lt;lokacija 2&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 6&gt;</source>
-        <translation type="obsolete">&lt;lokacija 6&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 5 TIME&gt;</source>
-        <translation type="obsolete">&lt;MESTO 5 ČAS&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 2 TIME&gt;</source>
-        <translation type="obsolete">&lt;MESTO 2 ČAS&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 1 TIME&gt;</source>
-        <translation type="obsolete">&lt;MESTO 1 ČAS&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 3&gt;</source>
-        <translation type="obsolete">&lt;lokacija 3&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;location 1&gt;</source>
-        <translation type="obsolete">&lt;lokacija 1&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 3 TIME&gt;</source>
-        <translation type="obsolete">&lt;MESTO 3 ČAS&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;CITY 4 TIME&gt;</source>
-        <translation type="obsolete">&lt;MESTO 4 ČAS&gt;</translation>
-    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation>MESTO</translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation>Ne najdem informacije o časovnem pasu</translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation>&lt;p&gt;Ne najdem informacije o časovnem pasu %1</translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation>Ne najdem mape</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation>&lt;p&gt;Ne morem naložiti mape: %1, končujem</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/keypebble.ts b/i18n/sl/keypebble.ts
index 70df3ef..bbf8349 100644
--- a/i18n/sl/keypebble.ts
+++ b/i18n/sl/keypebble.ts
@@ -1,204 +1,240 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Povezan</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Povezava zavrnjena</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Ne najdem gostitelja</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation>Napak branja: QSocket je prijavil napako pri branju
 podatkov, oddaljeni gostitelj je verjetno prekinil
 povezavo.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>QSocket je prijavil neveljavno kodo napake</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation>Čakam na zagon strežnika...</translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation>Čakam na ime omizja...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Povezan z %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Napaka protokola: Sporočilo %1 je bilo najdeno pri pričakovanju posodobitvenega sporočila.</translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Napaka prtokola: Strežnik %1 je uporabil neznano kodiranje </translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>Čakam na različico strežnika...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Napaka: Neveljavena različica strežnika, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Napaka: Nepodprta različica strežnika, %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Prijavljen</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Napaka: Ta strežnik potrebuje geslo, a nobeno ni bilo podano.
  </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Napaka: Geslo, ki ste ga posredovali ni pravilno.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Napaka: Preveč neveljavnih prijav se je izvršilo
 na ta račun, prosim poizkusite kasneje.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Neuspešna prijava</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Preveč napak</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>VNC Pregledovalnik</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Cel zaslon</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Nastavitve</translation>
-    </message>
-    <message>
-        <source>Connect...</source>
-        <translation>Poveži...</translation>
-    </message>
-    <message>
         <source>Disconnect</source>
         <translation>Prekini povezavo</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Ustavi cel zaslon</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Povezan z oddaljenim gostiteljem</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Prijavlen v oddaljenega gostitelja</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Povezava prekinjena</translation>
     </message>
+    <message>
+        <source>New Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send Contrl-Alt-Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>KVNCConnectDlg</name>
+    <name>KVNCBookmarkDlgBase</name>
     <message>
-        <source>Connect to VNC server</source>
-        <translation>Prijavite se v VNC strežnik</translation>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KVNCConnDlgBase</name>
     <message>
-        <source>Host Name:</source>
-        <translation>Ime gostitelja:</translation>
+        <source>VNC Viewer Connection</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Number:</source>
-        <translation>Številka prikazovalnika:</translation>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Password</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation>Geslo:</translation>
+        <translation type="unfinished">Geslo:</translation>
+    </message>
+    <message>
+        <source>Bookmark Name:</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VncOptionsBase</name>
     <message>
-        <source>VNC Viewer Options</source>
-        <translation>Možnosti</translation>
+        <source>Host Name:</source>
+        <translation type="unfinished">Ime gostitelja:</translation>
+    </message>
+    <message>
+        <source>Display Number:</source>
+        <translation type="unfinished">Številka prikazovalnika:</translation>
     </message>
     <message>
-        <source>Data Encoding</source>
-        <translation>Kodiranje podatkov</translation>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
-        <translation>Posodobi zaslon vsakih:</translation>
+        <translation type="unfinished">Posodobi zaslon vsakih:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
-        <translation>Milisekund</translation>
+        <translation type="unfinished">Milisekund</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
-        <translation>Zahtevaj 8-bitno sejo</translation>
+        <translation type="unfinished">Zahtevaj 8-bitno sejo</translation>
     </message>
     <message>
         <source>Raise on bell</source>
-        <translation>Vstani na zvonec</translation>
+        <translation type="unfinished">Vstani na zvonec</translation>
     </message>
     <message>
         <source>Request shared session</source>
-        <translation>Zahtevaj deljeno sejo</translation>
+        <translation type="unfinished">Zahtevaj deljeno sejo</translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale Factor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection</source>
-        <translation>Povezava</translation>
+        <source>Encodings</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
-        <translation>Hextile kodiranje</translation>
+        <translation type="unfinished">Hextile kodiranje</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
-        <translation>CoRRE kodiranje</translation>
+        <translation type="unfinished">CoRRE kodiranje</translation>
     </message>
     <message>
         <source>RRE encoding</source>
-        <translation>RRE kodiranje</translation>
+        <translation type="unfinished">RRE kodiranje</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
-        <translation>Kopiraj pravokotno kodiranje</translation>
+        <translation type="unfinished">Kopiraj pravokotno kodiranje</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libqpe.ts b/i18n/sl/libqpe.ts
index 01ce458..e0f50d2 100644
--- a/i18n/sl/libqpe.ts
+++ b/i18n/sl/libqpe.ts
@@ -534,214 +534,210 @@ Sprostite nekaj spomina in poizkusite ponovno.</translation>
     <message>
         <source>Name Title</source>
         <translation>Imenski naziv</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Medimek</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Priimek</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Pripona</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Datoteka kot</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Naziv službenega mesta</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Oddelek</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Podjetje</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Službeni telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Službeni faks</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Službeni mobitel</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Privzeta Epošta</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Epošta</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Domači telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Domači faks</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Domači mobitel</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Ulica službe</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Mesto službe</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Okrožje službe</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Službena poštna številka</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Država službe</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Službeni pager</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Službena spletna stran</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Pisarna</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Poklic</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Pomočnik</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Upravnik</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Domač naslov</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Domče mesto</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Domače okrožje</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Domača poštna številka</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Domača država</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Domača spletna stran</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Sopotnik</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Spol</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Rojstni dan</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Obletnica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Vzdevek</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Otroci</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Zapiski</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Skupine</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF kartica</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Trdi disk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD kartica</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI trdi disk</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Notranja shramba</translation>
     </message>
     <message>
-        <source>Ram FS</source>
-        <translation type="obsolete">Ran FS</translation>
-    </message>
-    <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Ne morem izvršiti alarma.
 Prosim sprostite malo prostora in poizkusite ponovno</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/light-and-power.ts b/i18n/sl/light-and-power.ts
index c6c16dc..aff763f 100644
--- a/i18n/sl/light-and-power.ts
+++ b/i18n/sl/light-and-power.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
-        <source>Light Settings</source>
-        <translation type="obsolete">Nastavitve osvetlitve</translation>
-    </message>
-    <message>
         <source>Adjust to environment</source>
         <translation>Prilagodi okolju</translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>S tipanjem svetlobe kjer uporabljate napravo, lahko nastavite avtomatično nastavljanje osvetlitve. Svetlobne nastavitve vplivajo na povprečno osvetlitev.</translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation>Varčevanje energije</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>sekundah</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Zatemni po</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Izključi po</translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation>Ugasni LCS samo pri izključitvi</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Ugasni po</translation>
     </message>
     <message>
         <source>Bright</source>
         <translation>Svetlo</translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation>&lt;blockquote&gt;Svetlejši je zaslon, več baterije je porabljeno.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Ugasnjeno</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/mail.ts b/i18n/sl/mail.ts
index 1f61179..98e5ec6 100644
--- a/i18n/sl/mail.ts
+++ b/i18n/sl/mail.ts
@@ -44,388 +44,384 @@
         <source>&lt;b&gt;SMTP:</source>
         <translation>&lt;b&gt;SMTP:</translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
         <translation>&lt;b&gt;Uporabnik:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
         <translation>&lt;b&gt;Geslo:</translation>
     </message>
     <message>
         <source>Identity</source>
         <translation>Identiteta</translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
         <translation>&lt;b&gt;Ime:</translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
         <translation>&lt;b&gt;E-pošta:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
         <translation>&lt;b&gt;Org:</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Napredno</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Kp</translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation>Skp</translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation>Odgovori</translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
         <translation>&lt;b&gt;Podpis:</translation>
     </message>
     <message>
         <source>SSL</source>
         <translation>SSL</translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation>Uporabi SSL</translation>
     </message>
     <message>
         <source>993</source>
         <translation>993</translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>Ni nobenih vnosov v imeniku.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Napaka</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Izbrati morate najmanj en naslov.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation>Pobiralec naslovov</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation>Napaka</translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation>Prosim prvo izberite vnos.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation>Nastavi opis</translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation>&lt;div align=center&gt;Opis</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation>&lt;p&gt;Morate izbrati naslovnika.&lt;br&gt;(primer: nekdo@nekje.si)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Prišlo je do problema pri pošiljanju čakajoče pošte.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Success</source>
         <translation>Uspeh</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation>&lt;p&gt;Sporočilo uspešno čaka v vrsti.&lt;/p&gt;&lt;p&gt;Vrsta vsebuje</translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation>sporočil.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation>&lt;font color=#ff0000&gt;Napaka se je pojavila pri pošiljanju.&lt;/font&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation>&lt;p&gt;%1&lt;/p</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Sporočilo je bilo uspešno poslano.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation>&lt;p&gt;Čakajoča sporočila</translation>
     </message>
     <message>
         <source> of </source>
         <translation>od</translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation>Sestavi sporočilo</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Pošta</translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation>Pošlji pošto</translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation>Postavi pošto v vrsto</translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation>Pripni datoteko</translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation>Imenik</translation>
     </message>
     <message>
-        <source>Abort sending</source>
-        <translation type="obsolete">Prekini pošiljanje</translation>
-    </message>
-    <message>
         <source>From</source>
         <translation>Od</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Odgovori</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Za</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Kp</translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation>Skp</translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation>Zad.</translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation>Prio.</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Nizka</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normalna</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Visoka</translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation>Dodaj prilogo</translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation>Odstrani prilogo</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Preimenuj</translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation>Zamenjaj opis</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation>Napaka</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Najprej morate izbrati račun.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Vprašanje</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Ali res želite izbrisati izbrani račun?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation>Nastavitve</translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation>Računi</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation>[Skrit]</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Splošno</translation>
     </message>
     <message>
         <source>Mail notification</source>
         <translation>Poštno obveščanje</translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation>LED naj utripa</translation>
     </message>
     <message>
         <source>Play sound</source>
         <translation>Predvajaj zvok</translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
         <translation>&lt;b&gt;Preveri&amp;nbsp;vsakih</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>Disable mail notification</source>
         <translation>Onemogoči poštno obveščanje</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
         <translation>&lt;p&gt;&lt;b&gt;Različica pošte %1&lt;/b&gt;&lt;hr&gt;
 Sponzoriral in sprogramiral LISAsystems&lt;br&gt;
 Obiščite http://www.lisa.de/ za informacije.
 </translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
         <translation>Preimenuj</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Premakni</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source>Create folder</source>
         <translation>Ustvari imenik</translation>
     </message>
     <message>
         <source>Rescan folder list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
diff --git a/i18n/sl/showimg.ts b/i18n/sl/showimg.ts
index dbb58c5..9c0afbb 100644
--- a/i18n/sl/showimg.ts
+++ b/i18n/sl/showimg.ts
@@ -1,155 +1,123 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Pregledovalnik slik</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Horizontalni obrat</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Vertikalni obrat</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Odpri</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Obrni za 180</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Obrni za 90</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Cel zaslon</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation>- Pregledovalnik slik</translation>
     </message>
     <message>
-        <source>Loading image...</source>
-        <translation type="obsolete">Nalagam sliko...</translation>
-    </message>
-    <message>
-        <source>Could not load image</source>
-        <translation type="obsolete">Ne uspem naložiti slike</translation>
-    </message>
-    <message>
-        <source>No image - select Open from File menu.</source>
-        <translation type="obsolete">Ni slike - izberite Odpri iz Datoteka menuja.</translation>
-    </message>
-    <message>
-        <source>, %1/%2 colors</source>
-        <translation type="obsolete">, %1/%2 barv</translation>
-    </message>
-    <message>
-        <source>, %1 colors</source>
-        <translation type="obsolete">, %1 barv</translation>
-    </message>
-    <message>
         <source> True color</source>
         <translation>Resnične barve</translation>
     </message>
     <message>
-        <source>, %1 alpha levels</source>
-        <translation type="obsolete">, %1 alfa stopnje</translation>
-    </message>
-    <message>
-        <source>, 8-bit alpha channel</source>
-        <translation type="obsolete">, 8-bit alfa kanal</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Uredi</translation>
-    </message>
-    <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation type="unfinished">Obrni za 270</translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/sound.ts b/i18n/sl/sound.ts
index 3b2fa00..2ab5809 100644
--- a/i18n/sl/sound.ts
+++ b/i18n/sl/sound.ts
@@ -1,145 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
-        <source>Restart</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>To implement a new key switch
-Opie will have to be restarted./n&lt;B&gt;Restart&lt;/B&gt; Opie now?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Shows icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>11025</source>
         <translation>11025</translation>
     </message>
     <message>
         <source>22050</source>
         <translation>22050</translation>
     </message>
     <message>
         <source>44100</source>
         <translation>44100</translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation>Stereo</translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation>16 bit</translation>
     </message>
     <message>
         <source>Vmemo Settings</source>
         <translation>Vmemo nastavitve</translation>
     </message>
     <message>
         <source>8000</source>
         <translation>8000</translation>
     </message>
     <message>
         <source>33075</source>
         <translation>33075</translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation>Vizualni alarmi</translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation>Ikona opravilne vrstice</translation>
     </message>
     <message>
         <source>Key_Escape</source>
         <translation>Tipka_escape</translation>
     </message>
     <message>
         <source>Key_Space</source>
         <translation>Tipka_presledek</translation>
     </message>
     <message>
         <source>Key_Home</source>
         <translation>Tipka_dom</translation>
     </message>
     <message>
         <source>Key_Calender</source>
         <translation>Tipka_koledar</translation>
     </message>
     <message>
         <source>Key_Contacts</source>
         <translation>Tipka_Kontakti</translation>
     </message>
     <message>
         <source>Key_Menu</source>
         <translation>Tipka_menu</translation>
     </message>
     <message>
         <source>Key_Mail</source>
         <translation>Tipka_pošta</translation>
     </message>
     <message>
         <source>30</source>
         <translation>30</translation>
     </message>
     <message>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation>Vzorčna stopnja:</translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation>Snemalni imenik:</translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation>Snemalna tipka:</translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation>Omejitev snemanja v sekundah:</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Neomejeno</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/textedit.ts b/i18n/sl/textedit.ts
index cc2b99c..1c7d8ea 100644
--- a/i18n/sl/textedit.ts
+++ b/i18n/sl/textedit.ts
@@ -1,278 +1,256 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation>Dialog pisave</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation>Stil pisave</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Hitra rjava lisica skače čez počasnega psa</translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation>DialogPisave</translation>
     </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Odpri</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Shrani</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Shrani kot</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Izreži</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Prilepi</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Najdi...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Povečaj</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Pomanjšaj</translation>
     </message>
     <message>
         <source>Bold</source>
         <translation>Odebeljeno</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation>Poševno</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Objami vrstice</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Začni z novo datoteko</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datoteka</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Najdi naslednjega</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Zapri Najdi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Urejevalnik besedila</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>Neimenovano</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Pravice</translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation>DialogPisave</translation>
     </message>
     <message>
-        <source>Do you really want
-to delete the current file
-from the disk?
-This is irreversable!!</source>
-        <translation type="obsolete">Ali res želite
-izbrisati trenutno
-datoteko iz diska?
-To se ne da preklicati!!</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>About</source>
         <translation>O</translation>
     </message>
     <message>
-        <source>Text Editor has detected
- you selected a .desktop file.
-Open .desktop file or linked file?</source>
-        <translation type="obsolete">Urejevalnik besedil je zaznal,
-da ste izbrali .desktop datoteko.
-Odprem .desktop datoteko ali povezano datoteko?</translation>
-    </message>
-    <message>
         <source>.desktop File</source>
         <translation>.desktop datoteka</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Povezan dokument</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Besedilo</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Nastavi datotečne pravice</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Nastavi datotečne pravice za:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>lastnik</translation>
     </message>
     <message>
         <source>group</source>
         <translation>skupina</translation>
     </message>
     <message>
         <source>others</source>
         <translation>drugi</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Lastnik</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
     <message>
         <source>read</source>
         <translation>beri</translation>
     </message>
     <message>
         <source>write</source>
         <translation>piši</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>izvrši</translation>
     </message>
     <message>
-        <source>filePermissions</source>
-        <translation type="obsolete">Pravicedatoteke</translation>
-    </message>
-    <message>
         <source>Warning</source>
         <translation>Opozorilo</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Napaka- ni uporabnika</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Napaka- ni skupine</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Napaka pri nastavitvi lastništva ali skupine</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Napaka pri nastavitvi načina</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/today.ts b/i18n/sl/today.ts
index c618ac0..acc3567 100644
--- a/i18n/sl/today.ts
+++ b/i18n/sl/today.ts
@@ -1,135 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Danes</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Trenutno je &lt;b&gt; 1&lt;/b&gt; tekoče opravilo:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Trenutno je &lt;b&gt; %1&lt;/b&gt; tekočih opravil: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Ni tekočih opravil</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; novih sporočil, &lt;b&gt;%2&lt;/b&gt; izhodnih</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Danes ni sestankov</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Lastnik je</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Prosim izplonite poslovno kartico</translation>
     </message>
     <message>
-        <source>No more  today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation>OpiePošta ni nameščena</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Danes</translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation>Nastavitve Danes</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation>Naj bo 
 lokacija 
 prikazana?</translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation>Naj bodo zapiski 
 prikazani?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation>Prikaži samo kasnejše
 zmenke</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Koledar</translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation>Koliko opravil
 naj bo 
 prikazanih?</translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation>Opravila</translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation>Odščipni po koliko
 znakih</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Različno</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation>Koliko
 sestankov
 naj bo
 prikazanih?</translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation>Naj se danes
 avtomatsko zažene
 ob nadaljevanju? (samo Opie)</translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation>Aktiviraj
 avtomatski zagon po
 koliko minutah?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/addressbook.ts b/i18n/zh_CN/addressbook.ts
index cbd6585..591e4fe 100644
--- a/i18n/zh_CN/addressbook.ts
+++ b/i18n/zh_CN/addressbook.ts
@@ -581,392 +581,384 @@ Quit anyway?</source>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuait</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Kyrgyztan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_CN/advancedfm.ts b/i18n/zh_CN/advancedfm.ts
index b456873..25c2ed3 100644
--- a/i18n/zh_CN/advancedfm.ts
+++ b/i18n/zh_CN/advancedfm.ts
@@ -1,259 +1,255 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/appearance.ts b/i18n/zh_CN/appearance.ts
index 7c20f02..ec16822 100644
--- a/i18n/zh_CN/appearance.ts
+++ b/i18n/zh_CN/appearance.ts
@@ -1,145 +1,141 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/appskey.ts b/i18n/zh_CN/appskey.ts
index e989899..ece7213 100644
--- a/i18n/zh_CN/appskey.ts
+++ b/i18n/zh_CN/appskey.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppsKeyApp</name>
     <message>
         <source>Set Application Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calender</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Address Book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Popup Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/buzzword.ts b/i18n/zh_CN/buzzword.ts
index 279ac4e..076f679 100644
--- a/i18n/zh_CN/buzzword.ts
+++ b/i18n/zh_CN/buzzword.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/citytime.ts b/i18n/zh_CN/citytime.ts
index 8438210..62e2ce2 100644
--- a/i18n/zh_CN/citytime.ts
+++ b/i18n/zh_CN/citytime.ts
@@ -1,99 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;location 4&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 6 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 5&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 2&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 6&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 5 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 2 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 1 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 3&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 1&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 3 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 4 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/keypebble.ts b/i18n/zh_CN/keypebble.ts
index ab58148..7be0f0f 100644
--- a/i18n/zh_CN/keypebble.ts
+++ b/i18n/zh_CN/keypebble.ts
@@ -1,200 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connect...</source>
+        <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disconnect</source>
+        <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop Full Screen</source>
+        <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connected to remote host</source>
+        <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Logged in to remote host</source>
+        <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection closed</source>
+        <source>Open Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send Contrl-Alt-Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>KVNCConnectDlg</name>
+    <name>KVNCBookmarkDlgBase</name>
     <message>
-        <source>Connect to VNC server</source>
+        <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KVNCConnDlgBase</name>
     <message>
-        <source>Host Name:</source>
+        <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Number:</source>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VncOptionsBase</name>
     <message>
-        <source>VNC Viewer Options</source>
+        <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data Encoding</source>
+        <source>Host Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection</source>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libqpe.ts b/i18n/zh_CN/libqpe.ts
index 495056f..0e681cb 100644
--- a/i18n/zh_CN/libqpe.ts
+++ b/i18n/zh_CN/libqpe.ts
@@ -524,213 +524,209 @@ Free some memory and try again.</source>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ram FS</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/light-and-power.ts b/i18n/zh_CN/light-and-power.ts
index 5a89b8d..18b2baa 100644
--- a/i18n/zh_CN/light-and-power.ts
+++ b/i18n/zh_CN/light-and-power.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
-        <source>Light Settings</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/mail.ts b/i18n/zh_CN/mail.ts
index 8fdd872..d251908 100644
--- a/i18n/zh_CN/mail.ts
+++ b/i18n/zh_CN/mail.ts
@@ -44,388 +44,384 @@
         <source>&lt;b&gt;SMTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>993</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Abort sending</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan folder list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_CN/showimg.ts b/i18n/zh_CN/showimg.ts
index 17b9a4c..c42e7d7 100644
--- a/i18n/zh_CN/showimg.ts
+++ b/i18n/zh_CN/showimg.ts
@@ -1,155 +1,123 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading image...</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Could not load image</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No image - select Open from File menu.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1/%2 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>, %1 alpha levels</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, 8-bit alpha channel</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/sound.ts b/i18n/zh_CN/sound.ts
index 492cc73..4a644be 100644
--- a/i18n/zh_CN/sound.ts
+++ b/i18n/zh_CN/sound.ts
@@ -1,145 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
-        <source>Restart</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>To implement a new key switch
-Opie will have to be restarted./n&lt;B&gt;Restart&lt;/B&gt; Opie now?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Shows icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>11025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>22050</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>44100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vmemo Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>33075</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Escape</source>
         <translation type="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>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/textedit.ts b/i18n/zh_CN/textedit.ts
index 457b18e..d1341c7 100644
--- a/i18n/zh_CN/textedit.ts
+++ b/i18n/zh_CN/textedit.ts
@@ -1,273 +1,256 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></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="obsolete"></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>Text Editor has detected
- you selected a .desktop file.
-Open .desktop file or linked file?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>filePermissions</source>
-        <translation type="obsolete"></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>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/today.ts b/i18n/zh_CN/today.ts
index 748913e..097f0fa 100644
--- a/i18n/zh_CN/today.ts
+++ b/i18n/zh_CN/today.ts
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="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 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="obsolete"></translation>
-    </message>
-    <message>
         <source>No more appointments 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>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>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/zh_TW/addressbook.ts b/i18n/zh_TW/addressbook.ts
index cbd6585..591e4fe 100644
--- a/i18n/zh_TW/addressbook.ts
+++ b/i18n/zh_TW/addressbook.ts
@@ -581,392 +581,384 @@ Quit anyway?</source>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuait</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Kyrgyztan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/advancedfm.ts b/i18n/zh_TW/advancedfm.ts
index b456873..25c2ed3 100644
--- a/i18n/zh_TW/advancedfm.ts
+++ b/i18n/zh_TW/advancedfm.ts
@@ -1,259 +1,255 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/appearance.ts b/i18n/zh_TW/appearance.ts
index 7c20f02..ec16822 100644
--- a/i18n/zh_TW/appearance.ts
+++ b/i18n/zh_TW/appearance.ts
@@ -1,145 +1,141 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/appskey.ts b/i18n/zh_TW/appskey.ts
index e989899..ece7213 100644
--- a/i18n/zh_TW/appskey.ts
+++ b/i18n/zh_TW/appskey.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppsKeyApp</name>
     <message>
         <source>Set Application Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calender</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Address Book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Popup Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/buzzword.ts b/i18n/zh_TW/buzzword.ts
index 279ac4e..076f679 100644
--- a/i18n/zh_TW/buzzword.ts
+++ b/i18n/zh_TW/buzzword.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/citytime.ts b/i18n/zh_TW/citytime.ts
index 8438210..62e2ce2 100644
--- a/i18n/zh_TW/citytime.ts
+++ b/i18n/zh_TW/citytime.ts
@@ -1,99 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;location 4&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 6 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 5&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 2&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 6&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 5 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 2 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 1 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 3&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 1&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 3 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 4 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/keypebble.ts b/i18n/zh_TW/keypebble.ts
index ab58148..7be0f0f 100644
--- a/i18n/zh_TW/keypebble.ts
+++ b/i18n/zh_TW/keypebble.ts
@@ -1,200 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connect...</source>
+        <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disconnect</source>
+        <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop Full Screen</source>
+        <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connected to remote host</source>
+        <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Logged in to remote host</source>
+        <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection closed</source>
+        <source>Open Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send Contrl-Alt-Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>KVNCConnectDlg</name>
+    <name>KVNCBookmarkDlgBase</name>
     <message>
-        <source>Connect to VNC server</source>
+        <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KVNCConnDlgBase</name>
     <message>
-        <source>Host Name:</source>
+        <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Number:</source>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VncOptionsBase</name>
     <message>
-        <source>VNC Viewer Options</source>
+        <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data Encoding</source>
+        <source>Host Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection</source>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqpe.ts b/i18n/zh_TW/libqpe.ts
index 495056f..0e681cb 100644
--- a/i18n/zh_TW/libqpe.ts
+++ b/i18n/zh_TW/libqpe.ts
@@ -524,213 +524,209 @@ Free some memory and try again.</source>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ram FS</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/light-and-power.ts b/i18n/zh_TW/light-and-power.ts
index 5a89b8d..18b2baa 100644
--- a/i18n/zh_TW/light-and-power.ts
+++ b/i18n/zh_TW/light-and-power.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
-        <source>Light Settings</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/mail.ts b/i18n/zh_TW/mail.ts
index 8fdd872..d251908 100644
--- a/i18n/zh_TW/mail.ts
+++ b/i18n/zh_TW/mail.ts
@@ -44,388 +44,384 @@
         <source>&lt;b&gt;SMTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>993</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Abort sending</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable mail notification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan folder list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/showimg.ts b/i18n/zh_TW/showimg.ts
index 17b9a4c..c42e7d7 100644
--- a/i18n/zh_TW/showimg.ts
+++ b/i18n/zh_TW/showimg.ts
@@ -1,155 +1,123 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading image...</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Could not load image</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No image - select Open from File menu.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1/%2 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>, %1 alpha levels</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, 8-bit alpha channel</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/sound.ts b/i18n/zh_TW/sound.ts
index 492cc73..4a644be 100644
--- a/i18n/zh_TW/sound.ts
+++ b/i18n/zh_TW/sound.ts
@@ -1,145 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
-        <source>Restart</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>To implement a new key switch
-Opie will have to be restarted./n&lt;B&gt;Restart&lt;/B&gt; Opie now?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Shows icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>11025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>22050</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>44100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vmemo Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>33075</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Escape</source>
         <translation type="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>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/textedit.ts b/i18n/zh_TW/textedit.ts
index 457b18e..d1341c7 100644
--- a/i18n/zh_TW/textedit.ts
+++ b/i18n/zh_TW/textedit.ts
@@ -1,273 +1,256 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></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="obsolete"></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>Text Editor has detected
- you selected a .desktop file.
-Open .desktop file or linked file?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>filePermissions</source>
-        <translation type="obsolete"></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>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/today.ts b/i18n/zh_TW/today.ts
index 748913e..097f0fa 100644
--- a/i18n/zh_TW/today.ts
+++ b/i18n/zh_TW/today.ts
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="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 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="obsolete"></translation>
-    </message>
-    <message>
         <source>No more appointments 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>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>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>