make lupdate

124 files changed, 5653 insertions, 2551 deletions

diff --git a/i18n/da/addressbook.ts b/i18n/da/addressbook.ts
index c7fe2e1..032b165 100644
--- a/i18n/da/addressbook.ts
+++ b/i18n/da/addressbook.ts
@@ -150,48 +150,60 @@ og prøv igen.
 Afslut alligevel?</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Ikke fundet</translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation>Kunne ikke finde en kontakt med
 dette søge mønster!</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Kort</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ikke-arkiverede</translation>
     </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to select a contact !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Blandet</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Søge indstillinger</translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation>Forespørgsels metode</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Brug regulære udtryk</translation>
     </message>
     <message>
@@ -303,48 +315,68 @@ Opie-Mail fås gratis!</translation>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Flyt den valgte attribut en linie op</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Flyt den valgte attribut en linie ned</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Liste over alle mulige attributter</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Tilføj den valgte attribut fra listen herunder til den øverste liste</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Fjern den valgte attribut fra den øverste liste</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Rækkefølge (op -&gt; ned) definerer den primære kontakt vist i den anden kolonne i listen</translation>
     </message>
+    <message>
+        <source>Tool-/Menubar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation>Fuldt navn...</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Job titel</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisation</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Gem som</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategori</translation>
     </message>
     <message>
diff --git a/i18n/da/advancedfm.ts b/i18n/da/advancedfm.ts
index 8a4857a..a4acd22 100644
--- a/i18n/da/advancedfm.ts
+++ b/i18n/da/advancedfm.ts
@@ -1,46 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Mappen eksisterer ikke</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>Advanced FileManager
-er copyright 2002 af
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-og er licenseret som GPL</translation>
-    </message>
-    <message>
         <source>Show Hidden Files</source>
         <translation>Vis skjulte filer</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Skift mappe</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Kør</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Åben som tekst</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Handlinger</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Opret mappe</translation>
     </message>
     <message>
@@ -103,96 +93,88 @@ og er licenseret som GPL</translation>
         <source>File</source>
         <translation>Fil</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Kør kommando med output</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Vælg alle</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Skift til lokal</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Skift til ekstern</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation>Om</translation>
-    </message>
-    <message>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>Vil du slette
 %1 filer?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Slet mappe?</translation>
     </message>
     <message>
         <source>Really delete
 </source>
         <translation>Slet
 </translation>
     </message>
     <message>
-        <source>Delete Directory</source>
-        <translation>Slet mappe</translation>
-    </message>
-    <message>
         <source>Could not rename</source>
         <translation>Kunne ikke omdøbe</translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
         <translation>Vil du kopiere
 %1 filer?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>Filen eksisterer!</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>
 eksisterer. Overskriv?</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>Kunne ikke kopiere
 </translation>
@@ -226,48 +208,76 @@ eksisterer. Overskriv?</translation>
         <translation>Advancedfm send ud</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir sendt.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation> eksisterer allerede.
 Vil du slette den?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation>%1 eksisterer. Overskriv?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation>Kunne ikke kopiere %1 til %2</translation>
     </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished">Advanced FileManager
+er copyright 2002-2003 af
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+og er licenseret som GPL</translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>Output</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Gem output i filen (kun navn)</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Indstil fil-rettighederne</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Indstil fil-rettighederne for:</translation>
     </message>
     <message>
         <source>owner</source>
diff --git a/i18n/da/appearance.ts b/i18n/da/appearance.ts
index 9463b7b..90bf226 100644
--- a/i18n/da/appearance.ts
+++ b/i18n/da/appearance.ts
@@ -206,48 +206,52 @@ Dette område lader dig vælge et program og hvilke indstillinger to vil slå fr
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Klik her for at vælge en stil-art til fane-dialogvinduer (såsom dette program). De mulige stil-arter er::
 
 1. Faner - standard faner, kun med tekst mærkater
 2. Faner m. ikoner - faner med et ikon for hver fane, tekst mærkat vises kun på den valgte fane
 3. Drop-down liste - en lodret liste af faner
 4. Drop-down liste m. ikoner - en lodret liste af faner med ikoner</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Klik her så faner vises øverst i vinduet.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Klik her så faner vises nederst i vinduet.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Dette er et eksempel vindue. Brug dette til at se det nye udseende når du ændrer på indstillingerne.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Udseende indstillinger</translation>
     </message>
+    <message>
+        <source>Rotation direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Redigér skema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Klik her for at vælge en farve til: </translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Eksempel</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Normalt element</translation>
     </message>
     <message>
         <source>Disabled Item</source>
diff --git a/i18n/da/aqpkg.ts b/i18n/da/aqpkg.ts
index 7abea5d..5dec587 100644
--- a/i18n/da/aqpkg.ts
+++ b/i18n/da/aqpkg.ts
@@ -1,125 +1,174 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
-        <translation>Kategori filter</translation>
+        <translation type="unfinished">Kategori filter</translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Afbryd</translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
-        <translation>Vælg hvilke grupper der skal vises</translation>
+        <source>Select one or more groups</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Læser konfiguration...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Afbryd</translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
-        <translation>Installér</translation>
+        <source>Close</source>
+        <translation>Luk</translation>
     </message>
     <message>
-        <source>Start</source>
-        <translation>Start</translation>
+        <source>Remove
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation>Indstillinger</translation>
+        <source>Install
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
-        <translation>Output</translation>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation>Destination</translation>
+        <translation type="unfinished">Destination</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation>Ledig plads</translation>
+        <translation type="unfinished">Ledig plads</translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
-        <translation>Luk</translation>
+        <source>Output</source>
+        <translation type="unfinished">Output</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">Start</translation>
+    </message>
+    <message>
+        <source>Options</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>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
-        <translation>Valgmuligheder</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation>--force-depends</translation>
+        <translation type="unfinished">--force-depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation>--force-reinstall</translation>
+        <translation type="unfinished">--force-reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation>--force-removal</translation>
+        <translation type="unfinished">--force-removal</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation>--force-overwrite</translation>
+        <translation type="unfinished">--force-overwrite</translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
-        <translation>--verbose-wget</translation>
+        <source>Information Level</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
-        <translation>OK</translation>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Pakkestyring</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Indtast teksten du vil søge efter her.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klik her for at gemme Quick Jump værktøjslinien.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Opdatér lister</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Klik her for at opdatere pakke lister fra serverne.</translation>
     </message>
@@ -207,104 +256,80 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klik her for at finde det næste pakke navn indeholdende den tekst du søger efter.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Quick Jump tastplade</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Klik her for at vise/skjule tastpladen for hurtig søgning i pakke listen.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurér</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klik her for at konfigurere dette program.</translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation>Hjælp</translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation>Klik her for hjælp.</translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation>Om</translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation>Klik her for information omkring softwaren.</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation>Valgmuligheder</translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Klik her for at skjule søge værktøjslinien.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servere:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klik her for at vælge et pakke feed.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakker</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Dette er en liste over alle pakker fra det server feed der er valgt foroven.
 
 En blå prik ved siden af pakke navnet indikerer at pakken allerede er installeret.
 
 En blå prik med en stjerne indikerer at en nyere version af pakken er tilgængelig fra det valgte server feed.
 
 Klik inde i boksen til venstre for at vælge en pakke.</translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation>Om AQPkg</translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Klik her for at afinstallere den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Bygger server liste:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Bygger pakke liste for:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation>Installeret på - %1</translation>
     </message>
     <message>
@@ -414,109 +439,109 @@ Er du sikker?
         <translation>Fjern eller geninstallér</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Geninstallér</translation>
     </message>
     <message>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Vil du fjerne eller opgradere
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Fjern eller opgradér</translation>
     </message>
     <message>
         <source>U</source>
         <translation>U</translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
-        <translation>Konfiguration</translation>
+        <translation type="unfinished">Konfiguration</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation>Servere</translation>
-    </message>
-    <message>
-        <source>Active Server</source>
-        <translation>Aktive servere</translation>
+        <translation type="unfinished">Servere</translation>
     </message>
     <message>
-        <source>Name:</source>
-        <translation>Navn:</translation>
+        <source>Destinations</source>
+        <translation type="unfinished">Destinationer</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Proxies</source>
+        <translation type="unfinished">Proxyer</translation>
     </message>
     <message>
-        <source>Change</source>
-        <translation>Ændre</translation>
+        <source>New</source>
+        <translation type="unfinished">Ny</translation>
     </message>
     <message>
-        <source>Remove</source>
-        <translation>Fjern</translation>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation>Ny</translation>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Destinations</source>
-        <translation>Destinationer</translation>
+        <source>Name:</source>
+        <translation type="unfinished">Navn:</translation>
     </message>
     <message>
-        <source>Link To Root</source>
-        <translation>Link til rod</translation>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
-        <translation>Proxyer</translation>
+        <source>Active Server</source>
+        <translation type="unfinished">Aktive servere</translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
-        <translation>HTTP Proxy</translation>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Kodeord</translation>
+        <source>Destination</source>
+        <translation type="unfinished">Destination</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Aktiveret</translation>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
-        <translation>FTP Proxy</translation>
+        <source>Link to root</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Brugernavn</translation>
+        <source>HTTP Proxy</source>
+        <translation type="unfinished">HTTP Proxy</translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
-        <translation>&amp;Anvend</translation>
+        <source>Enabled</source>
+        <translation type="unfinished">Aktiveret</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Generelt</translation>
+        <source>FTP Proxy</source>
+        <translation type="unfinished">FTP Proxy</translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
-        <translation>(Aktiveres ved genstart)</translation>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
-        <translation>Vis hop-til-bogstaver</translation>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/datebook.ts b/i18n/da/datebook.ts
index 24443f6..3c310d2 100644
--- a/i18n/da/datebook.ts
+++ b/i18n/da/datebook.ts
@@ -21,56 +21,48 @@
         <source>Today</source>
         <translation>Idag</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Uge</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Uge liste</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Måned</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Find</translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation>Alarm og start tid...</translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation>Standard visning</translation>
-    </message>
-    <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Begivenhedens varighed er
 potientielt længere end
 intervallet mellem gentagelserne.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kan ikke redigere data, synkronisering er igang</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Rediger begivenhed</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minutter)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -87,48 +79,52 @@ dine ændringer.
 Frigør noget lagerplads og prøv igen.
 
 Afslut alligevel?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Ukendt)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Fejl!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Ret</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Fortsæt</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>O</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>L</translation>
     </message>
     <message>
@@ -259,60 +255,107 @@ Afslut alligevel?</translation>
         <source> minutes</source>
         <translation> minutter</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Blandet</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Række stil:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medium</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Stor</translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
-        <translation>Hop til nuværende tidspunkt (dagsvis.)</translation>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished">Dag</translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished">Uge</translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished">Måned</translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Ingen</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">Start</translation>
+    </message>
+    <message>
+        <source>Start-End</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Denne begivenhed varer hele dagen.</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished">uge</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation>Å: </translation>
     </message>
     <message>
         <source>W: </source>
         <translation>U: </translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation>U: %1</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/da/drawpad.ts b/i18n/da/drawpad.ts
index 3955fc5..ab1ca77 100644
--- a/i18n/da/drawpad.ts
+++ b/i18n/da/drawpad.ts
@@ -127,58 +127,126 @@
     </message>
     <message>
         <source>Fill Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</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>Do you want to delete
 the current page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DrawPad</source>
+        <source>Do you want to delete
+all the pages?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Page</source>
+        <source>Click here to add a new sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to delete
-all the pages?</source>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to undo the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to re-perform the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the first page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the previous page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the next page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the last page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw lines.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw rectangles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw ellipses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the text drawing tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the fill tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the eraser tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the width of the drawing pen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when drawing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when filling in areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DrawPad - Page %1/%2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>DrawPad - Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Range</source>
         <translation type="unfinished"></translation>
@@ -271,77 +339,97 @@ all the pages?</source>
     <message>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Title:</source>
+        <source>Title: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
+        <source>Dimension: %1x%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
+        <source>Date: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</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 Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet up one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet down one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/libbatteryapplet.ts b/i18n/da/libbatteryapplet.ts
index 9cffaa8..3bd3f47 100644
--- a/i18n/da/libbatteryapplet.ts
+++ b/i18n/da/libbatteryapplet.ts
@@ -1,32 +1,28 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery Status</source>
-        <translation>Batteri status</translation>
-    </message>
-    <message>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Oplader</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation>Procent batteri tilbage</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Batteri status: </translation>
     </message>
     <message>
         <source>Good</source>
         <translation>God</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Lav</translation>
     </message>
     <message>
@@ -36,26 +32,54 @@
     <message>
         <source>Critical</source>
         <translation>Kritisk</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>På backup strøm</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Strøm on-line</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Ekstern strøm afbrudt</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation>Batteri tid tilbage</translation>
     </message>
+    <message>
+        <source>Battery status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>could not open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charging both devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Percentage battery remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery time remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No jacket with battery inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/libqpe.ts b/i18n/da/libqpe.ts
index 22fef07..03e0914 100644
--- a/i18n/da/libqpe.ts
+++ b/i18n/da/libqpe.ts
@@ -329,52 +329,48 @@ redigere kategorierne.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Lav en kopi af dette dokument.</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Send dette dokument til en anden enhed.</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Ejer information</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation></translation>
-    </message>
-    <message>
         <source>1</source>
         <translation></translation>
     </message>
     <message>
         <source>2</source>
         <translation></translation>
     </message>
     <message>
         <source>3</source>
         <translation></translation>
     </message>
     <message>
         <source>4</source>
         <translation></translation>
     </message>
     <message>
         <source>5</source>
         <translation></translation>
     </message>
     <message>
         <source>6</source>
         <translation></translation>
     </message>
     <message>
diff --git a/i18n/de/addressbook.ts b/i18n/de/addressbook.ts
index 20a1bb7..e0f57d4 100644
--- a/i18n/de/addressbook.ts
+++ b/i18n/de/addressbook.ts
@@ -151,48 +151,60 @@ Dennoch beenden?</translation>
         <translation>Suchmuster konnte nicht gefunden werden !</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Die ausgewählte Datei endet
 nicht mit &quot;.vcf&quot;. 
 Wollen Sie sie trotzdem öffnen ?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Kontakt hinzufügen?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Wollen Sie den Kontakt %1 wirklich
 hinzufügen?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Ja, alle</translation>
     </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to select a contact !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Eingabemuster</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Benutze reguläre Ausdrücke</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Benutze Wildcards (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Beachte Großschreibung</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
@@ -303,48 +315,68 @@ ist frei erhältlich !</translation>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Ausgewähltes Element eine Zeile nach oben verschieben</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Ausgewähltes Element eine Zeile nach unten verschieben</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Liste aller verfügbaren Elemente</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Hinzufügen des gewählten Elements von der unteren zur oberen Liste</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Entfrnen des gewählten Elements aus der oberen Liste</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Reihenfolge (von oben nach unten) definiert den primären Kontakt der in der rechten Spalte angezeigt wird</translation>
     </message>
+    <message>
+        <source>Tool-/Menubar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Vorname</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Mittlerer Name</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nachname</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffix</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
diff --git a/i18n/de/advancedfm.ts b/i18n/de/advancedfm.ts
index cd9ce42..8dc7c39 100644
--- a/i18n/de/advancedfm.ts
+++ b/i18n/de/advancedfm.ts
@@ -25,52 +25,48 @@
         <source>Rename</source>
         <translation>Umbenennen</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Befehl ausführen</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Befehl ausführen mit Ausgabe</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Lokalansicht</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Fernansicht</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation>Über</translation>
-    </message>
-    <message>
         <source>Size</source>
         <translation>Größe</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>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
@@ -155,118 +151,132 @@
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>In selbes Verzeichnis kopieren</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>Konnte nicht kopieren
 </translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>nach
 </translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>Nicht verschiebbar
 </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>Dateimanager
-Copyright 2002 von
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-unter der GPL</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>Zu den Dokumenten hinzufügen</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Aktionen</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Alle auswählen</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>Wirklich %1 Dateien löschen?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Verzeichnis löschen?</translation>
     </message>
     <message>
         <source>Really delete
 </source>
         <translation>Wirklich löschen
 
 </translation>
     </message>
     <message>
-        <source>Delete Directory</source>
-        <translation>Verzeichnis löschen</translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation>Wirklich %1 Dateien kopieren?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>Datei existiert bereits!</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>
 existiert. Überschreiben?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation>existiert bereits.
 Soll wirklich gelöscht werden?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation>%1 existiert. Überschreiben?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation>%1 konnte nicht zu %2 kopiert werden</translation>
     </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished">Dateimanager
+Copyright 2002-2003 von
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+unter der GPL</translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Ausgabe in Datei speichern (nur Name)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Ausgabe</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Berechtigungen setzen</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Berechtigungen setzen für:</translation>
     </message>
     <message>
         <source>owner</source>
diff --git a/i18n/de/appearance.ts b/i18n/de/appearance.ts
index 416e4a4..aee41dd 100644
--- a/i18n/de/appearance.ts
+++ b/i18n/de/appearance.ts
@@ -201,48 +201,52 @@ Dieser Bereich erlaubt anwendungsspezifische Eigenschaften auszuschalten.</trans
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Klicken sie Hier, um de gewünschten Stil für reiterbasierte Dialoge (wie diese Anwendung) auszuwählen. Die verfügbaren Stile sind
 1. Reiter- normale Reiter mit Texttiteln
 2. Reiter m. Symb. - Reiter mit Symbolen, bei denen der Text nur im ausgewählten Reiter erscheint
 3. Aufklappliste - Eine vertkale Auswahlliste zum Aufklappen mit Text
 4. Aufklappliste m. Symbolen - Eine vertikale Auswahlliste zum Aufklappen mit Symbolen
 </translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Klicken Sie hier, um alle Reiter im oberen Teil zu positionieren.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Klicken Sie hier, um alle Reiter im unteren Teil zu positionieren.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Dies ist das Vorschaufenster. Hier können Sie sehen, wie das neue Erscheinungsbild durch Ihre Änderungen beeinflusst wird.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Erscheinungsbild-Einstellungen</translation>
     </message>
+    <message>
+        <source>Rotation direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Schema editieren</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Klicken Sie hier zum Aussuchen einer Farbe für:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Beispiel</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Normales Element</translation>
     </message>
     <message>
         <source>Disabled Item</source>
diff --git a/i18n/de/aqpkg.ts b/i18n/de/aqpkg.ts
index dfa3577..2504c1d 100644
--- a/i18n/de/aqpkg.ts
+++ b/i18n/de/aqpkg.ts
@@ -1,125 +1,174 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
-        <translation>Kategorienfilter</translation>
+        <translation type="unfinished">Kategorienfilter</translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Abbrechen</translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
-        <translation>Gruppen zur Anzeige auswählen</translation>
+        <source>Select one or more groups</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Lese Konfiguration ...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancel</translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
-        <translation>Installieren</translation>
+        <source>Close</source>
+        <translation>Schliessen</translation>
     </message>
     <message>
-        <source>Start</source>
-        <translation>Starten</translation>
+        <source>Remove
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation>Einst.</translation>
+        <source>Install
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
-        <translation>Ausgabe</translation>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation>Ziel</translation>
+        <translation type="unfinished">Ziel</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation>Verf. Speicher</translation>
+        <translation type="unfinished">Verf. Speicher</translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
-        <translation>Schliessen</translation>
+        <source>Output</source>
+        <translation type="unfinished">Ausgabe</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">Starten</translation>
+    </message>
+    <message>
+        <source>Options</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>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
-        <translation>Optionen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation>--force.depends</translation>
+        <translation type="unfinished">--force.depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation>--force-reinstall</translation>
+        <translation type="unfinished">--force-reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation>--force-removal</translation>
+        <translation type="unfinished">--force-removal</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation>--force-overwrite</translation>
+        <translation type="unfinished">--force-overwrite</translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
-        <translation>--verbose-wget</translation>
+        <source>Information Level</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
-        <translation>OK</translation>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg- der Paketmanager</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Tippen Sie den Suchtext hier ein.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klicken Sie hier um die alphabetische Schnellleiste auszublenden.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Listen aktualisieren</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Klicken Sie hier für eine aktualisierte Fassung der Serverliste.</translation>
     </message>
@@ -207,101 +256,77 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klicken Sie hier um das nächste Paket mit Ihrem Suchtext zu finden.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Alphabetische Schnellleiste</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Klicken Sie hier um die alphabetische Schnellliste ein- und auszublenden.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Anzg.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfiguration</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klicken Sie hier um die Anwendung zu konfigurieren.</translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation>Hilfe</translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation>Klicken Sie hier für Hilfe</translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation>Über</translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation>Klicken Sie hier um Softwareversionsinformationen zu erhalten.</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation>Optionen</translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Klicken Sie hier um die Finden-Leiste auszublenden.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Server: </translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klicken Sie hier, um einen Feedserver auszuwählen.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakete</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Dies ist eine Liste aller Pakete des oben gewählten Feed-Servers.
 Eine blaue Kugel neben dem Paketnamen zeigt an dass das Paket zur Zeit installiert ist.
 Ein blauer Punkt mit einem gelben Stern zeit dass eine neuere Version des Pakets auf dem Server verfügbar ist.
 Um ein Paket auszuwählen klicken Sie in das Rechtecke auf der linken Seite.</translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation>Über AQPkg</translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Klicken Sie hier um asgewählte Pakete zu entfernen</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Serverlistenerstellung: 
 <byte value="x9"/>%1
 </translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Paketlistenerstellung für:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation>Installiert auf - %1</translation>
     </message>
@@ -412,109 +437,109 @@ löschen oder neu installieren ?</translation>
         <translation>Löschen oder Neuinstallation</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Neuinstallation</translation>
     </message>
     <message>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Möchten Sie %1
 löschen oder aktualisieren ?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Löschen oder Aktualisieren</translation>
     </message>
     <message>
         <source>U</source>
         <translation>U</translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
-        <translation>Konfiguration</translation>
+        <translation type="unfinished">Konfiguration</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation>Server</translation>
-    </message>
-    <message>
-        <source>Active Server</source>
-        <translation>Aktive Server</translation>
+        <translation type="unfinished">Server</translation>
     </message>
     <message>
-        <source>Name:</source>
-        <translation>Name: </translation>
+        <source>Destinations</source>
+        <translation type="unfinished">Ziele</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL: </translation>
+        <source>Proxies</source>
+        <translation type="unfinished">Proxys</translation>
     </message>
     <message>
-        <source>Change</source>
-        <translation>Ändern</translation>
+        <source>New</source>
+        <translation type="unfinished">Neu</translation>
     </message>
     <message>
-        <source>Remove</source>
-        <translation>Löschen</translation>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation>Neu</translation>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Destinations</source>
-        <translation>Ziele</translation>
+        <source>Name:</source>
+        <translation type="unfinished">Name: </translation>
     </message>
     <message>
-        <source>Link To Root</source>
-        <translation>Verknüpfung zum Root-Verz.</translation>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
-        <translation>Proxys</translation>
+        <source>Active Server</source>
+        <translation type="unfinished">Aktive Server</translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
-        <translation>HTTP Proxy</translation>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Passwort</translation>
+        <source>Destination</source>
+        <translation type="unfinished">Ziel</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Aktiviert</translation>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
-        <translation>FTP Proxy</translation>
+        <source>Link to root</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Nutzername</translation>
+        <source>HTTP Proxy</source>
+        <translation type="unfinished">HTTP Proxy</translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
-        <translation>&amp;Anwenden</translation>
+        <source>Enabled</source>
+        <translation type="unfinished">Aktiviert</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Allgemeines</translation>
+        <source>FTP Proxy</source>
+        <translation type="unfinished">FTP Proxy</translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
-        <translation>(Wird erst nach Neustart aktiv)</translation>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
-        <translation>Alphabet. Sprungtabelle</translation>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/datebook.ts b/i18n/de/datebook.ts
index 7fbdd1a..404e390 100644
--- a/i18n/de/datebook.ts
+++ b/i18n/de/datebook.ts
@@ -22,56 +22,48 @@
         <source>Today</source>
         <translation>Heute</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>7 Tage</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation>Alarm- und Startzeit...</translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation>Voreinstellung</translation>
-    </message>
-    <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Der Termin dauert unter Umständen
 länger als die Wiederholungsinterval.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kann Daten zur Zeit nicht editieren, synchronisiere gerade</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Ereignis editieren</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>Minuten)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Kein Speicherplatz</translation>
@@ -87,48 +79,52 @@ Ihre Änderungen zu speichern.
 Bitte machen Sie etwas Speicherplatz
 frei.
 Trozdem beenden?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Unbekannt)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Fehler!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Beheben</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Weiter</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Termin duplizieren</translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>D</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
@@ -259,60 +255,107 @@ Trozdem beenden?</translation>
         <source> minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Unterschiedliches</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Spaltenstil:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medium</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groß</translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
-        <translation>Zur akt. Zeit springen (Tagesansicht)</translation>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished">Tag</translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished">Woche</translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished">Monat</translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Nie</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">Beginn</translation>
+    </message>
+    <message>
+        <source>Start-End</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Dieser Termin ist ganztägig.</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished">Woche</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation>J:</translation>
     </message>
     <message>
         <source>W: </source>
         <translation>M:</translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00.Jan-00.Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation>W: %1</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/de/drawpad.ts b/i18n/de/drawpad.ts
index cba299c..b91def3 100644
--- a/i18n/de/drawpad.ts
+++ b/i18n/de/drawpad.ts
@@ -85,56 +85,48 @@
         <source>Draw Filled Ellipse</source>
         <translation>gefüllte Ellipse zeichen</translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation>Bereich füllen</translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation>Punkt löschen</translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation>Stiftbreite</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Stiftfarbe</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Füllfarbe</translation>
     </message>
     <message>
-        <source>DrawPad</source>
-        <translation>Zeichenbrett</translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation>Seite</translation>
-    </message>
-    <message>
         <source>Insert Text</source>
         <translation>Text einfügen</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Vorschau</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation>Vorschau...</translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation>Seiteninformationen</translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation>Seiteninformationen...</translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation>Wollen Sie die Seite
 wirklich löschen?</translation>
@@ -142,48 +134,124 @@ wirklich löschen?</translation>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation>Wollen Sie die Seite
 wirklich löschen?</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation>Wollen Sie alle Seiten
 wirklich löschen?</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation>Kantenglättung</translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to undo the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to re-perform the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the first page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the previous page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the next page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the last page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw lines.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw rectangles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw ellipses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the text drawing tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the fill tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the eraser tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the width of the drawing pen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when drawing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when filling in areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DrawPad - Page %1/%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation>Seitenauswahl</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>Aktuelle</translation>
     </message>
     <message>
         <source>Range</source>
         <translation>Bereich</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>Bis:</translation>
     </message>
     <message>
@@ -274,79 +342,99 @@ wirklich löschen?</translation>
     <message>
         <source>Title:</source>
         <translation>Titel:</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Weite:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Höhe:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Title:</source>
-        <translation>Title:</translation>
+        <source>Title: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
-        <translation>Dimension:</translation>
+        <source>Dimension: %1x%2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
-        <translation>Datum:</translation>
+        <source>Date: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation>Text eingeben</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation>Schmierzettel - Vorschau</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Seite säubern</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation>Wollen Sie die Seite
 wirklich säubern?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Seite löschen</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation>Wollen Sie die Seite
 wirklich löschen?</translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet up one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet down one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/libbatteryapplet.ts b/i18n/de/libbatteryapplet.ts
index 05173b6..a347e60 100644
--- a/i18n/de/libbatteryapplet.ts
+++ b/i18n/de/libbatteryapplet.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery status for Ipaq</source>
-        <translation>Batteriestatus für den iPAQ</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>konnte Datei nicht öffnen</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Beide Akkus werden geladen</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Lade...</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation>Verbleibende Energie in Prozent: </translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Batteriestatus: </translation>
     </message>
     <message>
@@ -61,26 +57,30 @@
     <message>
         <source>External power disconnected</source>
         <translation>Vom Netz getrennt</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation>Verbleibende Batteriezeit</translation>
     </message>
     <message>
         <source>Percentage battery remaining: </source>
         <translation>Verbleibende Energie in Prozent:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
         <translation>Verbleibende Batteriezeit:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Keine Zusatzbatterie angeschlossen</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
+    <message>
+        <source>Battery status</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/libqpe.ts b/i18n/de/libqpe.ts
index 69f7835..64ae242 100644
--- a/i18n/de/libqpe.ts
+++ b/i18n/de/libqpe.ts
@@ -329,52 +329,48 @@ die Kategorien.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Dokument kopieren</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Dokument auf ein anderes Gerät beamen.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Anwendungsspezifische Rotation</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Benutzerinformationen</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation>Formular1</translation>
-    </message>
-    <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
diff --git a/i18n/en/addressbook.ts b/i18n/en/addressbook.ts
index e83c08d..0f0628f 100644
--- a/i18n/en/addressbook.ts
+++ b/i18n/en/addressbook.ts
@@ -143,48 +143,60 @@ Quit anyway?</source>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to select a contact !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -293,48 +305,68 @@ is provided free !</source>
     <message>
         <source>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tool-/Menubar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <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>
diff --git a/i18n/en/advancedfm.ts b/i18n/en/advancedfm.ts
index 0b1212e..ee084a6 100644
--- a/i18n/en/advancedfm.ts
+++ b/i18n/en/advancedfm.ts
@@ -25,52 +25,48 @@
         <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>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -152,111 +148,125 @@
     <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>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</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>%1 exists. Ok to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</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>
     <message>
         <source>Output</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>
diff --git a/i18n/en/appearance.ts b/i18n/en/appearance.ts
index 0a0cc3c..d03a089 100644
--- a/i18n/en/appearance.ts
+++ b/i18n/en/appearance.ts
@@ -191,48 +191,52 @@ This area allows you to select an application and which settings you wish to dis
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotation direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled Item</source>
diff --git a/i18n/en/aqpkg.ts b/i18n/en/aqpkg.ts
index 9614487..cd7b997 100644
--- a/i18n/en/aqpkg.ts
+++ b/i18n/en/aqpkg.ts
@@ -1,124 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
+        <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start</source>
+        <source>Remove
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Install
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
+        <source>Output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</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>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
@@ -207,98 +256,74 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description - %1</source>
         <translation type="unfinished"></translation>
@@ -398,109 +423,109 @@ Are you sure?
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URL:</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link To Root</source>
+        <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
+        <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
+        <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/datebook.ts b/i18n/en/datebook.ts
index d54bec0..2fc3843 100644
--- a/i18n/en/datebook.ts
+++ b/i18n/en/datebook.ts
@@ -21,56 +21,48 @@
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -81,48 +73,52 @@ Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -253,60 +249,107 @@ Quit anyway?</source>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/en/drawpad.ts b/i18n/en/drawpad.ts
index d8b80c5..0e3ea96 100644
--- a/i18n/en/drawpad.ts
+++ b/i18n/en/drawpad.ts
@@ -85,102 +85,170 @@
         <source>Draw Filled Ellipse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DrawPad</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</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>Do you want to delete
 the current page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to undo the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to re-perform the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the first page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the previous page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the next page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the last page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw lines.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw rectangles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw ellipses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the text drawing tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the fill tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the eraser tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the width of the drawing pen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when drawing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when filling in areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DrawPad - Page %1/%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -271,77 +339,97 @@ all the pages?</source>
     <message>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Title:</source>
+        <source>Title: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
+        <source>Dimension: %1x%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
+        <source>Date: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</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 Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet up one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet down one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/libbatteryapplet.ts b/i18n/en/libbatteryapplet.ts
index 0f0c5ce..8ca62b8 100644
--- a/i18n/en/libbatteryapplet.ts
+++ b/i18n/en/libbatteryapplet.ts
@@ -1,32 +1,28 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -36,26 +32,54 @@
     <message>
         <source>Critical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Battery status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>could not open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charging both devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Percentage battery remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery time remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No jacket with battery inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/libqpe.ts b/i18n/en/libqpe.ts
index d2d61a4..0a73dd7 100644
--- a/i18n/en/libqpe.ts
+++ b/i18n/en/libqpe.ts
@@ -327,52 +327,48 @@ editing categories.</source>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/es/addressbook.ts b/i18n/es/addressbook.ts
index 714329b..7e2167d 100644
--- a/i18n/es/addressbook.ts
+++ b/i18n/es/addressbook.ts
@@ -151,48 +151,60 @@ inténtelo de nuevo.
 con ese patrón de búsqueda!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>El fichero seleccionado
 no termina en &quot;.vcf&quot;.
 ¿Seguro que quiere abrirlo?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>¿Añadir contacto?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>¿Seguro que quiere añadir el contacto para 
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>Sí a &amp;todo</translation>
     </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to select a contact !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Estilo consulta</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Usar expresiones regulares</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Usar comodines (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Distinguir may/min</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correo</translation>
     </message>
     <message>
@@ -304,48 +316,68 @@ suministra gratis!</translation>
     <message>
         <source>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tool-/Menubar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>1º apellido</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>2º apellido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Archivar como</translation>
     </message>
     <message>
diff --git a/i18n/es/advancedfm.ts b/i18n/es/advancedfm.ts
index d4959e1..973897f 100644
--- a/i18n/es/advancedfm.ts
+++ b/i18n/es/advancedfm.ts
@@ -25,52 +25,48 @@
         <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>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
@@ -155,120 +151,134 @@
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copiar misma carpeta</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>No pude copiar
 </translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>a
 </translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>No puede mover
 </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>Advanced FileManager
-is copyright 2002 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL
-</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>Añadir a Documentos</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Acciones</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Seleccionar todo</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>¿Confirma el borrado
 de los ficheros %1?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>¿Borrar directorio?</translation>
     </message>
     <message>
         <source>Really delete
 </source>
         <translation>Confirme borrado
 </translation>
     </message>
     <message>
-        <source>Delete Directory</source>
-        <translation>Borrar directorio</translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation>¿Confirma la copia
 de los ficheros %1?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>¡El fichero existe!</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>
 existe. ¿Lo sobrescribo?</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>%1 exists. Ok to overwrite?</source>
         <translation>%1 existe. ¿Lo sobreescribo?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation>No pude copiar %1 a %2</translation>
     </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished">Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL
+</translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</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>
     <message>
         <source>Output</source>
         <translation>Salida</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>
diff --git a/i18n/es/appearance.ts b/i18n/es/appearance.ts
index 9852cea..c1b590e 100644
--- a/i18n/es/appearance.ts
+++ b/i18n/es/appearance.ts
@@ -206,48 +206,52 @@ Esta área le permite seleccionar un aplicación y qué funciones desea deshabil
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Pulse aquí para seleccionar un estilo para los diálogos con etiquetas (como esta). Los estilos disponibles son:
 
 1. Etiquetas - etiquetas normales con sólo texto
 2. Etiquetas con iconos - etiquetas con iconos, el texto aparece solo en la actual
 3. Lista desplegable - una lista vertical de etiquetas
 4. Lista desplegable con iconos - una lista vertical de etiquetas con iconos</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Pulse aquí para que las etiquetas aparezcan en la parte superior de la ventana.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Pulse aquí para que las etiquetas aparezcan en la parte inferior de la ventana.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Esta en una ventana de previsualización. Vea la nueva apariencia mientras cambia las opciones.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Configuración de Apariencia</translation>
     </message>
+    <message>
+        <source>Rotation direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editar esquema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Seleccione aquí un color para: </translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Muestra</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Elemento normal</translation>
     </message>
     <message>
         <source>Disabled Item</source>
diff --git a/i18n/es/aqpkg.ts b/i18n/es/aqpkg.ts
index f66b971..fcf49bc 100644
--- a/i18n/es/aqpkg.ts
+++ b/i18n/es/aqpkg.ts
@@ -1,125 +1,174 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
-        <translation>Filtro de Categorías</translation>
+        <translation type="unfinished">Filtro de Categorías</translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Cancelar</translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
-        <translation>Seleccione grupos a mostrar</translation>
+        <source>Select one or more groups</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Leyendo configuración...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
-        <translation>Instalar</translation>
+        <source>Close</source>
+        <translation>Cerrar</translation>
     </message>
     <message>
-        <source>Start</source>
-        <translation>Empezar</translation>
+        <source>Remove
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation>Opciones</translation>
+        <source>Install
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
-        <translation>Salida</translation>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation>Destino</translation>
+        <translation type="unfinished">Destino</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation>Espacio disponible</translation>
+        <translation type="unfinished">Espacio disponible</translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
-        <translation>Cerrar</translation>
+        <source>Output</source>
+        <translation type="unfinished">Salida</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">Empezar</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished">Opciones</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
-        <translation>Opciones</translation>
+        <translation type="unfinished">Opciones</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation>Forzar dependencias</translation>
+        <translation type="unfinished">Forzar dependencias</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation>Forzar reinstalar</translation>
+        <translation type="unfinished">Forzar reinstalar</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation>Forzar borrar</translation>
+        <translation type="unfinished">Forzar borrar</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation>Forzar sobreescribir</translation>
+        <translation type="unfinished">Forzar sobreescribir</translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
-        <translation>WGet detallado</translation>
+        <source>Information Level</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
-        <translation>Ok</translation>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestor de Paquetes</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Escriba aquí el texto a buscar.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Pulse aquí para esconder la barra Salto Rápido.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Actualizar listas</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Pulse aquí para actualizar las lista de paquetes de los servidores.</translation>
     </message>
@@ -207,104 +256,80 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Pulse aquí para buscar el siguiente nombre de paquete que contenga el texto que está buscando.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Teclas de Salto Rápido</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Pulse aquí para mostrar/esconder el teclado que permite moverse rápidamente a través de la lista de paquetes.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Pulse aquí para configurar esta aplicación.</translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation>Ayuda</translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation>Pulse aquí si busca ayuda.</translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation>Sobre</translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation>Pulse aquí para la información de versión del software.</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation>Opciones</translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Pulse aquí para esconder la barra de búsqueda.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servidores:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Pulse aquí para seleccionar una fuente de paquetes.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Paquetes</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Ésta es una lista de todos los paquetes del servidor selecionado arriba.
 
 Un punto azul junto al nombre del paquete indica que está instalado actualmente.
 
 Un punto azul con una estrella indica que hay una versión más moderna disponible.
 
 Pulse en el recuadro de la izquierda para seleccionar un paquete.</translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation>Sobre AQPkg</translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Pulse aquí para desinstalar los paquetes seleccionados.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Construyendo lista del servidor:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Construyendo lista de paquetes para:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation>Instalado en - %1</translation>
     </message>
     <message>
@@ -413,109 +438,109 @@ Opie/Qtopia está corriendo!
         <translation>Borrar o reinstalar</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Reinstalar</translation>
     </message>
     <message>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>¿Desea borrar o actualizar
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Borrar o actualizar</translation>
     </message>
     <message>
         <source>U</source>
         <translation>U</translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
-        <translation>Configuración</translation>
+        <translation type="unfinished">Configuración</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation>Servidores</translation>
-    </message>
-    <message>
-        <source>Active Server</source>
-        <translation>Servidor activo</translation>
+        <translation type="unfinished">Servidores</translation>
     </message>
     <message>
-        <source>Name:</source>
-        <translation>Nombre:</translation>
+        <source>Destinations</source>
+        <translation type="unfinished">Destinos</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Proxies</source>
+        <translation type="unfinished">Proxies</translation>
     </message>
     <message>
-        <source>Change</source>
-        <translation>Cambiar</translation>
+        <source>New</source>
+        <translation type="unfinished">Nuevo</translation>
     </message>
     <message>
-        <source>Remove</source>
-        <translation>Borrar</translation>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation>Nuevo</translation>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Destinations</source>
-        <translation>Destinos</translation>
+        <source>Name:</source>
+        <translation type="unfinished">Nombre:</translation>
     </message>
     <message>
-        <source>Link To Root</source>
-        <translation>Enlazar a raíz</translation>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
-        <translation>Proxies</translation>
+        <source>Active Server</source>
+        <translation type="unfinished">Servidor activo</translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
-        <translation>Proxy HTTP</translation>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Clave</translation>
+        <source>Destination</source>
+        <translation type="unfinished">Destino</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Habilitada</translation>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
-        <translation>Proxy FTP</translation>
+        <source>Link to root</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Nombre usuario</translation>
+        <source>HTTP Proxy</source>
+        <translation type="unfinished">Proxy HTTP</translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
-        <translation>&amp;Aplicar</translation>
+        <source>Enabled</source>
+        <translation type="unfinished">Habilitada</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>FTP Proxy</source>
+        <translation type="unfinished">Proxy FTP</translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
-        <translation>(tendrá efecto al reiniciar)</translation>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
-        <translation>Mostrar salto a letras</translation>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/datebook.ts b/i18n/es/datebook.ts
index 0451ed3..9cf0610 100644
--- a/i18n/es/datebook.ts
+++ b/i18n/es/datebook.ts
@@ -21,56 +21,48 @@
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Lista semanal</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mes</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation>Alarma y hora comienzo...</translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation>Vista por omisión</translation>
-    </message>
-    <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Duración de la cita más larga
 que el intervalo de repetición.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Editar cita</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minutos)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
@@ -85,48 +77,52 @@ Quit anyway?</source>
 salvar tus cambios.
 Libere espacio y vuelva a intentarlo.
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Desconocido)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>¡Error!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Arréglalo</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuar</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <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>
@@ -257,60 +253,107 @@ Libere espacio y vuelva a intentarlo.
         <source> minutes</source>
         <translation> minutos</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Miscelánea</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Estilo filas:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Por omisión</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medianas</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grandes</translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
-        <translation>Saltar a la hora actual (vista día)</translation>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished">Día</translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished">Semana</translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished">Mes</translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Nada</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">Inicio</translation>
+    </message>
+    <message>
+        <source>Start-End</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Esta cita dura todo el día.</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished">semana</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation>A: </translation>
     </message>
     <message>
         <source>W: </source>
         <translation>S: </translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Ene-00. Ene</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation>S: %1</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/es/drawpad.ts b/i18n/es/drawpad.ts
index c36b0a7..ac34248 100644
--- a/i18n/es/drawpad.ts
+++ b/i18n/es/drawpad.ts
@@ -85,56 +85,48 @@
         <source>Draw Filled Ellipse</source>
         <translation>Pintar elipse relleno</translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation>Rellenar región</translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation>Borrar punto</translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation>Ancho lápiz</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Color lápiz</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Color relleno</translation>
     </message>
     <message>
-        <source>DrawPad</source>
-        <translation>Pizarra</translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation>Página</translation>
-    </message>
-    <message>
         <source>Insert Text</source>
         <translation>Insertar texto</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Ver miniaturas</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation>Ver miniaturas...</translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation>Info página</translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation>Info página...</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation>Suavizar bordes</translation>
     </message>
     <message>
@@ -142,48 +134,124 @@
 the current page?</source>
         <translation>¿Quiere limpiar la
 página actual?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation>¿Quiere borrar la
 página actual?</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation>¿Quiere borrar todas
 las páginas?</translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to undo the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to re-perform the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the first page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the previous page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the next page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the last page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw lines.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw rectangles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw ellipses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the text drawing tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the fill tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the eraser tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the width of the drawing pen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when drawing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when filling in areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DrawPad - Page %1/%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation>Selección de páginas</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>Actual</translation>
     </message>
     <message>
         <source>Range</source>
         <translation>Rango</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>A:</translation>
     </message>
     <message>
@@ -274,79 +342,99 @@ las páginas?</translation>
     <message>
         <source>Title:</source>
         <translation>Título:</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Fecha:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Ancho:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Alto:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Title:</source>
-        <translation>Título:</translation>
+        <source>Title: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
-        <translation>Dimensión:</translation>
+        <source>Dimension: %1x%2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
-        <translation>Fecha:</translation>
+        <source>Date: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation>Insertar texto</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation>Pizarra - Ver miniaturas</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Limpiar página</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation>¿Quiere limpiar la
 página seleccionada?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Borrar página</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation>¿Quiere borrar la
 página seleccionada?</translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet up one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet down one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libbatteryapplet.ts b/i18n/es/libbatteryapplet.ts
index dd9ca8d..f7bcc7e 100644
--- a/i18n/es/libbatteryapplet.ts
+++ b/i18n/es/libbatteryapplet.ts
@@ -1,32 +1,28 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery Status</source>
-        <translation>Estado Batería</translation>
-    </message>
-    <message>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Cargando</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation>Porcentaje batería restante</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Estado batería:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Bueno</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Bajo</translation>
     </message>
     <message>
@@ -36,26 +32,54 @@
     <message>
         <source>Critical</source>
         <translation>Crítico</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Alimentación emergencia</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Alimentación conectada</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Alimentación externa desconectada</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation>Duración batería restante</translation>
     </message>
+    <message>
+        <source>Battery status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>could not open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charging both devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Percentage battery remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery time remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No jacket with battery inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libqpe.ts b/i18n/es/libqpe.ts
index f20c0f9..38b016f 100644
--- a/i18n/es/libqpe.ts
+++ b/i18n/es/libqpe.ts
@@ -328,52 +328,48 @@ editando las categorías.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Hacer una copia de este documento.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Emitir este documento a otro dispositivo.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Usar rotación personalizada</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Información del propietario</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation>Impreso1</translation>
-    </message>
-    <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
diff --git a/i18n/fr/addressbook.ts b/i18n/fr/addressbook.ts
index 44596bf..7e9970b 100644
--- a/i18n/fr/addressbook.ts
+++ b/i18n/fr/addressbook.ts
@@ -152,48 +152,60 @@ Quitter ?</translation>
 pour cette expression!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Le fichier selectionné
 ne se termine pas par &quot;.vcf&quot;.
 Voulez-vous vraimment l&apos;ouvrir?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Ajouter un Contact ?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Voulez-vous vraimment ajouter une contact pour
 %1 ?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>Oui à &amp;Tous</translation>
     </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to select a contact !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Style de Requête</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Utiliser des Expressions Régulières</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Utiliser des Jokers (*, ?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Sensible à la casse</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Courrier</translation>
     </message>
     <message>
@@ -305,48 +317,68 @@ gratuitement!</translation>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Déplacer le champ sélectionné d&apos;une ligne vers le haut</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Déplacer le champ sélectionné d&apos;une ligne vers le bas</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Liste des champs disponibles</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Ajoute le champ sélectionné dans la liste juste au-dessus</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Supprime le champ sélectionné dans la liste juste au-dessus</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>L&apos;ordre définit le premier contact affiché dans la deuxième colonne en mode liste</translation>
     </message>
+    <message>
+        <source>Tool-/Menubar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <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>
diff --git a/i18n/fr/advancedfm.ts b/i18n/fr/advancedfm.ts
index b7d3f91..89bbbd6 100644
--- a/i18n/fr/advancedfm.ts
+++ b/i18n/fr/advancedfm.ts
@@ -26,52 +26,48 @@
         <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>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
@@ -154,119 +150,133 @@
         <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>Impossible de copier
 </translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>Vers</translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>Impossible de déplacer</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>Advanced FileManager(new line)
-is copyright 2002 by(new line)
-L.J.Potter&lt;llornkcor@handhelds.org&gt;(new line)
-and is licensed by the GPL</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>Ajouter aux Documents</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Actions</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Tout sélectioner</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>Réellement effacer
 le fichier %1?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Effacer le répertoire?</translation>
     </message>
     <message>
         <source>Really delete
 </source>
         <translation>Vraiment effacer
 </translation>
     </message>
     <message>
-        <source>Delete Directory</source>
-        <translation>Effacer le répertoire</translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation>Vraiment copier
 %1 files?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>Le fichier exite!</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>
 exite déjà. D&apos;accord pour écraser?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation>Existe déjà.
 Voulez-vous vraiment l&apos;effacer?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation>%1 existe déjà. D&apos;accord pour écraser?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation>Impossible de copier %1 vers %2</translation>
     </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished">Advanced FileManager(new line)
+is copyright 2002-2003 by(new line)
+L.J.Potter&lt;llornkcor@handhelds.org&gt;(new line)
+and is licensed by the GPL</translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</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>
     <message>
         <source>Output</source>
         <translation>Sortie</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>
diff --git a/i18n/fr/appearance.ts b/i18n/fr/appearance.ts
index 0a5b0f4..9a0701f 100644
--- a/i18n/fr/appearance.ts
+++ b/i18n/fr/appearance.ts
@@ -207,48 +207,52 @@ Cette partie vous permet de selectionner une application et quelle préférence
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Cliquez ici pour sélectionner le style des fenêtres avec onglet (comme cette application). Les styles disponibles sont:
 
 1. Onglet - Onglets normaux avec des titres texte seulement
 2. Onglet avec icone - Onglets avec icone pour chaque onglet, les titres textes apparaissent seulement sur l&apos;onglet courant
 3. Liste déroulante - Une liste verticale des onglets
 4. Liste déroulante avec icone - Une liste verticale des onglets avec des icones</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Cliquez ici pour que les onglets apparaissent en haut de la fenêtre.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Cliquez ici pour les onglets apparaissent en bas de la fenêtre.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>ceci est un aperçu de la fenêtre. Regarder ici pour voir les changement apporté.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Préference d&apos;Apparence</translation>
     </message>
+    <message>
+        <source>Rotation direction:</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>Click here to select a color for: </source>
         <translation>Cliquer ici pour sélectionner un couleur pour:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Exemple</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>control normal</translation>
     </message>
     <message>
         <source>Disabled Item</source>
diff --git a/i18n/fr/aqpkg.ts b/i18n/fr/aqpkg.ts
index 4884ac9..afea5f4 100644
--- a/i18n/fr/aqpkg.ts
+++ b/i18n/fr/aqpkg.ts
@@ -1,125 +1,174 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
-        <translation>Filtre par catégorie</translation>
+        <translation type="unfinished">Filtre par catégorie</translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Annuler</translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
-        <translation>Sélectionner les groupes à afficher</translation>
+        <source>Select one or more groups</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Lecture de la configuration...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
-        <translation>Installer</translation>
+        <source>Close</source>
+        <translation>Fermer</translation>
     </message>
     <message>
-        <source>Start</source>
-        <translation>Démarrer</translation>
+        <source>Remove
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation>Options</translation>
+        <source>Install
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
-        <translation>Sortie</translation>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation>Destination</translation>
+        <translation type="unfinished">Destination</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation>Espace dispo</translation>
+        <translation type="unfinished">Espace dispo</translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
-        <translation>Fermer</translation>
+        <source>Output</source>
+        <translation type="unfinished">Sortie</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">Démarrer</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished">Options</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
-        <translation>Options</translation>
+        <translation type="unfinished">Options</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation>Forcer les dépendances</translation>
+        <translation type="unfinished">Forcer les dépendances</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation>Forcer la réinstallation</translation>
+        <translation type="unfinished">Forcer la réinstallation</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation>Forcer l&apos;effacement</translation>
+        <translation type="unfinished">Forcer l&apos;effacement</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation>Forcer la ré-écriture</translation>
+        <translation type="unfinished">Forcer la ré-écriture</translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
-        <translation>WGet info</translation>
+        <source>Information Level</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
-        <translation>Ok</translation>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestionnaire de Package</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Taper le texte à rechercher ici.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Cliquer ici pour cacher le clavier.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Mettre à jour les listes</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Cliquer ici pour mettre les listes de packages à jour depuis les serveurs.</translation>
     </message>
@@ -207,104 +256,80 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Cliquer ici pour trouver le package suivant contenant le texte recherché.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Recheche par lettre</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Cliquer ici pour afficher/caher le clavier permettant le déplacement rapide dans la liste des packages</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Affichage</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurer</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Cliquer ici pour configurer l&apos;application.</translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation>Aide</translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation>Cliquer ici pour afficher l&apos;aide.</translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation>A Propos</translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation>Cliquer ici pour les informations sur la version du logiciel.</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation>Options</translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Cliquer ici pour fermer la barre de recherche.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Serveur :</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Cliquer ici pour sélectionner un serveur de packages.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Packages</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Voici la liste de tous les packages disponibles sur le serveur sélectionné.
 
 Un point bleu signifie que le package est déjà installé sur cet appareil.
 
 Un point bleu avec une étoile signifie que le package est déjà installé, mais que la version du serveur est plus récente.
 
 Cochez la case en début de ligne pour sélectionner un package.</translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation>A propos de AQPkg</translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation>Enlever</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Cliquer ici pour désinstaller le(s) package(s) sélectionné(s).</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Construit la liste du serveur :
 %1
 </translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Construit la liste des packages pour :
 %1</translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation>Installé en - %1</translation>
     </message>
@@ -414,109 +439,109 @@ Etes-vous sûr ?</translation>
         <translation>Enlever ou Réinstaller</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Réinstaller</translation>
     </message>
     <message>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Voulez-vous enlever ou mettre à jour
 %1 ?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Enlever ou Mettre à jour</translation>
     </message>
     <message>
         <source>U</source>
         <translation>M</translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
-        <translation>Configuration</translation>
+        <translation type="unfinished">Configuration</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation>Serveurs</translation>
-    </message>
-    <message>
-        <source>Active Server</source>
-        <translation>Serveur actif</translation>
+        <translation type="unfinished">Serveurs</translation>
     </message>
     <message>
-        <source>Name:</source>
-        <translation>Nom :</translation>
+        <source>Destinations</source>
+        <translation type="unfinished">Destinations</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL :</translation>
+        <source>Proxies</source>
+        <translation type="unfinished">Proxies</translation>
     </message>
     <message>
-        <source>Change</source>
-        <translation>Changer</translation>
+        <source>New</source>
+        <translation type="unfinished">Nouveau</translation>
     </message>
     <message>
-        <source>Remove</source>
-        <translation>Supprimer</translation>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation>Nouveau</translation>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Destinations</source>
-        <translation>Destinations</translation>
+        <source>Name:</source>
+        <translation type="unfinished">Nom :</translation>
     </message>
     <message>
-        <source>Link To Root</source>
-        <translation>Créer un lien vers root</translation>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
-        <translation>Proxies</translation>
+        <source>Active Server</source>
+        <translation type="unfinished">Serveur actif</translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
-        <translation>Proxy HTTP</translation>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Passe :</translation>
+        <source>Destination</source>
+        <translation type="unfinished">Destination</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Activé</translation>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
-        <translation>Proxy FTP</translation>
+        <source>Link to root</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Utilisateur</translation>
+        <source>HTTP Proxy</source>
+        <translation type="unfinished">Proxy HTTP</translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
-        <translation>&amp;Appliquer</translation>
+        <source>Enabled</source>
+        <translation type="unfinished">Activé</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Général</translation>
+        <source>FTP Proxy</source>
+        <translation type="unfinished">Proxy FTP</translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
-        <translation>(Prendra effet après redémarrage)</translation>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
-        <translation>Afficher la navigation par lettres</translation>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/datebook.ts b/i18n/fr/datebook.ts
index 6f03b3d..f36189a 100644
--- a/i18n/fr/datebook.ts
+++ b/i18n/fr/datebook.ts
@@ -22,56 +22,48 @@
         <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>Préférences...</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>
@@ -87,48 +79,52 @@ 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>
     <message>
         <source>Duplicate Event</source>
         <translation>Dupliquer évènement</translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <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>
@@ -259,60 +255,107 @@ Quitter ?</translation>
         <source> minutes</source>
         <translation>minutes</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Autre</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Style de lignes :</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>Afficher aujourd&apos;hui (vue du jour)</translation>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished">Jour</translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished">Semaine</translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished">Mois</translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Aucun</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">Début</translation>
+    </message>
+    <message>
+        <source>Start-End</source>
+        <translation type="unfinished"></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>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished">semaine</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation>An :</translation>
     </message>
     <message>
         <source>W: </source>
         <translation>Sem :</translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation>Sem:%1</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/fr/drawpad.ts b/i18n/fr/drawpad.ts
index 7736006..571910c 100644
--- a/i18n/fr/drawpad.ts
+++ b/i18n/fr/drawpad.ts
@@ -85,56 +85,48 @@
         <source>Draw Filled Ellipse</source>
         <translation>Desinner une ellipse pleine</translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation>Remplir une région</translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation>Effacer un point</translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation>Largeur du pinceau</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Couleur du pinceau</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Couleur de remplissage</translation>
     </message>
     <message>
-        <source>DrawPad</source>
-        <translation>DrawPad</translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation>Page</translation>
-    </message>
-    <message>
         <source>Insert Text</source>
         <translation>Insérer un texte</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Vue miniature</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation>Vue miniature...</translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation>Informations sur la page</translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation>Informations sur la page...</translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation>Voulez-vous effacer
 la page actuelle ?</translation>
@@ -142,48 +134,124 @@ la page actuelle ?</translation>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation>Voulez-vous supprimer
 la page actuelle ?</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation>Voulez-vous supprimer
 toutes les pages ?</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation>Anti-crénelage</translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to undo the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to re-perform the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the first page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the previous page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the next page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the last page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw lines.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw rectangles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw ellipses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the text drawing tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the fill tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the eraser tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the width of the drawing pen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when drawing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when filling in areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DrawPad - Page %1/%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation>Sélection des pages</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Toutes</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>En cours</translation>
     </message>
     <message>
         <source>Range</source>
         <translation>Plage</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>A :</translation>
     </message>
     <message>
@@ -274,79 +342,99 @@ toutes les pages ?</translation>
     <message>
         <source>Title:</source>
         <translation>Titre :</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Date :</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Largeur :</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Hauteur :</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Title:</source>
-        <translation>Titre :</translation>
+        <source>Title: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
-        <translation>Dimensions :</translation>
+        <source>Dimension: %1x%2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
-        <translation>Date :</translation>
+        <source>Date: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation>Insérer un texte</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation>DrawPad - Vue miniature</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Effacer la page</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation>Voulez-vous effacer
 la page sélectionnée ?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Supprimer la page</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation>Voulez-vous supprimer
 la page sélectionnée ?</translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet up one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet down one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/libbatteryapplet.ts b/i18n/fr/libbatteryapplet.ts
index 7056547..61b5abc 100644
--- a/i18n/fr/libbatteryapplet.ts
+++ b/i18n/fr/libbatteryapplet.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery Status</source>
-        <translation>Niveau de la batterie</translation>
-    </message>
-    <message>
         <source>Charging</source>
         <translation>En charge</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation>Pourcentage de batterie restant</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Niveau de la batterie :</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Bon</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Faible</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Très faible</translation>
     </message>
     <message>
@@ -37,26 +33,54 @@
     <message>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Sur batterie</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Adaptateur secteur</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Adaptateur secteur déconnecté</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation>Durée de batterie restante</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
+    <message>
+        <source>Battery status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>could not open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charging both devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Percentage battery remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery time remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No jacket with battery inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/libqpe.ts b/i18n/fr/libqpe.ts
index c849464..f877887 100644
--- a/i18n/fr/libqpe.ts
+++ b/i18n/fr/libqpe.ts
@@ -329,52 +329,48 @@ est en train d&apos;éditer les catégories.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Faire une copie de ce document.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Transmettre ce document à un autre périphérique.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Utiliser une rotation personnalisée</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Information sur le propriétaire</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation>Form1</translation>
-    </message>
-    <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
diff --git a/i18n/hu/addressbook.ts b/i18n/hu/addressbook.ts
index aac282d..e6e1f94 100644
--- a/i18n/hu/addressbook.ts
+++ b/i18n/hu/addressbook.ts
@@ -151,48 +151,60 @@ Mégis kilép?</translation>
 nem találok kapcsolatot!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>A kiválasztott fájl
 nem &quot;.vcf&quot;-re végződik.
 Tényleg meg akarja nyitni?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Kapcsolat hozzáadása?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Tényleg hozzá akarja adni
 %1-t a kapcsolatokhoz?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Mind igen</translation>
     </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to select a contact !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Keresési mód</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Szabályos kifejezés használata</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Helyettesítők (*,?) használata</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Kis- és nagybetű érzékeny</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Levél</translation>
     </message>
     <message>
@@ -304,48 +316,68 @@ ingyenesen elérhető !</translation>
     <message>
         <source>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tool-/Menubar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Keresztnév</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Középső név</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Vezetéknév</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Kiterjesztés</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Rögzít mint</translation>
     </message>
     <message>
diff --git a/i18n/hu/advancedfm.ts b/i18n/hu/advancedfm.ts
index 0b1212e..ee084a6 100644
--- a/i18n/hu/advancedfm.ts
+++ b/i18n/hu/advancedfm.ts
@@ -25,52 +25,48 @@
         <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>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -152,111 +148,125 @@
     <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>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</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>%1 exists. Ok to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</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>
     <message>
         <source>Output</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>
diff --git a/i18n/hu/appearance.ts b/i18n/hu/appearance.ts
index b49e846..91976d2 100644
--- a/i18n/hu/appearance.ts
+++ b/i18n/hu/appearance.ts
@@ -1,143 +1,270 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
-        <translation>Megjelenés</translation>
+        <source>Styles control the way items such as buttons and scroll bars appear in all applications.
+
+Click here to select an available style.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
-        <translation>Beállítások...</translation>
+        <translation type="unfinished">Beállítások...</translation>
     </message>
     <message>
-        <source>Tab style:</source>
-        <translation>Fül stílus:</translation>
+        <source>Click here to configure the currently selected style.
+
+Note:  This option is not available for all styles.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
-        <translation>Fülek</translation>
+        <source>Window decorations control the way the application title bar and its buttons appear.
+
+Click here to select an available decoration.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
-        <translation>Fülek ikonokkal</translation>
+        <source>Select the desired name, style and size of the default font applications will use.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
-        <translation>Legördülő listák</translation>
+        <source>Color schemes are a collection of colors which are used for various parts of the display.
+
+Click here to select an available scheme.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
-        <translation>Legörd��lő listák ikonokkal</translation>
+        <source>Current scheme</source>
+        <translation type="unfinished">Jelenlegi össze��llítás</translation>
     </message>
     <message>
-        <source>Top</source>
-        <translation>Fent</translation>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
-        <translation>Lent</translation>
+        <source>Click here to change the colors in the current color scheme.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
-        <translation>Stílus</translation>
+        <source>Delete</source>
+        <translation type="unfinished">Töröl</translation>
     </message>
     <message>
-        <source>Font</source>
-        <translation>Betű</translation>
+        <source>Click here to delete the color scheme selected in the list to the left.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
-        <translation>Méret</translation>
+        <source>Save</source>
+        <translation type="unfinished">Ment</translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>árvíztűrő tükörfúrógép
-ÁRVÍZTŰRŐ TÜKÖRFÚRÓGÉP</translation>
+        <source>Click here to name and save the current color scheme.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
-        <translation>Jelenlegi összeállítás szerkesztése...</translation>
+        <source>Force styling for all applications.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
-        <translation>Kiválaszt</translation>
+        <source>Click here to allow all applications to use global appearance settings.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation>Töröl</translation>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
-        <translation>Ment</translation>
+        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
+
+This area allows you to select an application and which settings you wish to disable.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colors</source>
-        <translation>Színek</translation>
+        <source>Binary file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to add an application to the list above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to delete the currently selected application.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the currently selected application up in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the currently selected application down in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished">Fül stílus:</translation>
+    </message>
+    <message>
+        <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
+
+1. Tabs - normal tabs with text labels only
+2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
+3. Drop down list - a vertical listing of tabs
+4. Drop down list w/icons - a vertical listing of tabs with icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished">Fülek</translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished">Fülek ikonokkal</translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished">Legördülő listák</translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished">Legördülő listák ikonokkal</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished">Fent</translation>
     </message>
     <message>
-        <source>Enable background image</source>
-        <translation>Háttérkép bekapcsolása</translation>
+        <source>Click here so that tabs appear at the top of the window.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
-        <translation>Alapértelmezett</translation>
+        <source>Bottom</source>
+        <translation type="unfinished">Lent</translation>
+    </message>
+    <message>
+        <source>Click here so that tabs appear at the bottom of the window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotation direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Appearance Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished">Stílus</translation>
     </message>
     <message>
-        <source>Browse...</source>
-        <translation>Tallóz...</translation>
+        <source>Font</source>
+        <translation type="unfinished">Betű</translation>
     </message>
     <message>
-        <source>Background</source>
-        <translation>Hátt��r</translation>
+        <source>Colors</source>
+        <translation type="unfinished">Sz��nek</translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
-        <translation>Haladó beállítások bekapcsolása az Opie alkalmazásokban</translation>
+        <source>Windows</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation>Haladó</translation>
+        <translation type="unfinished">Haladó</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Újraindít</translation>
+        <translation type="unfinished">Újraindít</translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
-        <translation>Újraindítja az Opie-t most?</translation>
+        <source>Do you want to restart %1 now?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Igen</translation>
+        <translation type="unfinished">Igen</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Nem</translation>
+        <translation type="unfinished">Nem</translation>
     </message>
     <message>
-        <source>Delete scheme</source>
-        <translation>Összeállítás törtlése</translation>
+        <source>Save Scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save scheme</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
-        <translation>Tényleg törölni akarja
-</translation>
+        <source>Scheme does already exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete scheme</source>
+        <translation type="unfinished">Összeállítás törtlése</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
-        <translation>Nem tudom a jelenlegi összeállítást törölni.</translation>
+        <translation type="unfinished">Nem tudom a jelenlegi összeállítást törölni.</translation>
     </message>
     <message>
-        <source>Current scheme</source>
-        <translation>Jelenlegi összeállítás</translation>
+        <source>&lt;new&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Összeállítás szerkesztése</translation>
     </message>
+    <message>
+        <source>Click here to select a color for: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/aqpkg.ts b/i18n/hu/aqpkg.ts
index 9614487..cd7b997 100644
--- a/i18n/hu/aqpkg.ts
+++ b/i18n/hu/aqpkg.ts
@@ -1,124 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
+        <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start</source>
+        <source>Remove
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Install
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
+        <source>Output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</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>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
@@ -207,98 +256,74 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description - %1</source>
         <translation type="unfinished"></translation>
@@ -398,109 +423,109 @@ Are you sure?
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URL:</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link To Root</source>
+        <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
+        <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
+        <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/datebook.ts b/i18n/hu/datebook.ts
index ce27b33..153c22f 100644
--- a/i18n/hu/datebook.ts
+++ b/i18n/hu/datebook.ts
@@ -21,56 +21,48 @@
         <source>Today</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Nap</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Hét</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>HétLista</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Hónap</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Keresés</translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation>Ébresztő és kezdő idő...</translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation>Alapértelmezett nézet</translation>
-    </message>
-    <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Az esemény hossza potenciálisan hosszabb
 mint az ismétlődések közötti idő.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Az adat nem szerkeszthető, szinkronizáció folyik</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Esemény szerkesztése</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>perc)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Rendben</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Nincs hely</translation>
@@ -86,48 +78,52 @@ a változtatásokat.
 Szabadítson fel némi helyet és próbálja újra.
 
 Mégis kilép?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Ismeretlen)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Hiba!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Javítsd ki</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Folytat</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>H</translation>
     </message>
     <message>
         <source>T</source>
         <translation>K / Cs</translation>
     </message>
     <message>
         <source>W</source>
         <translation>Sz</translation>
     </message>
     <message>
         <source>F</source>
         <translation>P</translation>
     </message>
     <message>
         <source>S</source>
         <translation>Sz / V</translation>
     </message>
     <message>
@@ -258,60 +254,107 @@ Mégis kilép?</translation>
         <source> minutes</source>
         <translation>perc</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vegyes</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Sor stílus:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Alapértelmezett</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Közepes</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Nagy</translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
-        <translation>Jelenlegi időre ugrás (napinézet)</translation>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished">Nap</translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished">Hét</translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished">Hónap</translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Nem</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">Kezdet</translation>
+    </message>
+    <message>
+        <source>Start-End</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Ez egy egész napos esemény.</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished">hét</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation>É:</translation>
     </message>
     <message>
         <source>W: </source>
         <translation>H:</translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>Jan 00.-Jan 00.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation>H: %1</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/hu/kbill.ts b/i18n/hu/kbill.ts
index ef22e7d..f4d45dd 100644
--- a/i18n/hu/kbill.ts
+++ b/i18n/hu/kbill.ts
@@ -1,29 +1,26 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>HelpDialog</name>
-</context>
-<context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/hu/libqpe.ts b/i18n/hu/libqpe.ts
index 60f4e78..aa8a341 100644
--- a/i18n/hu/libqpe.ts
+++ b/i18n/hu/libqpe.ts
@@ -328,52 +328,48 @@ már szerkeszti a kategóriákat.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Jelen dokumentum másolása.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Jelen dokumentum átsugárzása másik eszközre.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Egyedi forgatás használata</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Tulajdonos adatai</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation>Form1</translation>
-    </message>
-    <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
diff --git a/i18n/it/addressbook.ts b/i18n/it/addressbook.ts
index d571d6e..f358cf9 100644
--- a/i18n/it/addressbook.ts
+++ b/i18n/it/addressbook.ts
@@ -152,48 +152,60 @@ Uscire comunque?</translation>
  criterio di ricerca!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Il nome del file selezionato 
  non termina con &quot;.vcf&quot;.
  Vuoi veramente aprirlo?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Aggiungi Contatto?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Vuoi veramente aggiungere un contatto per 
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Tutti Sì</translation>
     </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to select a contact !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Stile Ricerca</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Usa Espressioni Regolari</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Usa Wildcards (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Maiuscole/minuscole</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Email</translation>
     </message>
     <message>
@@ -305,48 +317,68 @@ rilasciato gratuitamente!</translation>
     <message>
         <source>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tool-/Menubar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <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>
diff --git a/i18n/it/aqpkg.ts b/i18n/it/aqpkg.ts
index bd36fbd..c8c2ef4 100644
--- a/i18n/it/aqpkg.ts
+++ b/i18n/it/aqpkg.ts
@@ -1,126 +1,175 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
-        <translation>Filtro Categoria</translation>
+        <translation type="unfinished">Filtro Categoria</translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Cancella</translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
-        <translation>Seleziona gruppi da visualizzare</translation>
+        <source>Select one or more groups</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Lettura configurazione...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancella</translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
-        <translation>Installa</translation>
+        <source>Close</source>
+        <translation>Chiudi</translation>
     </message>
     <message>
-        <source>Start</source>
-        <translation>Inizia</translation>
+        <source>Remove
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation>Opzioni</translation>
+        <source>Install
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
-        <translation>Output</translation>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation>Destinazione</translation>
+        <translation type="unfinished">Destinazione</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation>Spazio Disp.</translation>
+        <translation type="unfinished">Spazio Disp.</translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
-        <translation>Chiudi</translation>
+        <source>Output</source>
+        <translation type="unfinished">Output</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">Inizia</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished">Opzioni</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
-        <translation>Opzioni</translation>
+        <translation type="unfinished">Opzioni</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation>Forza Dipendenze</translation>
+        <translation type="unfinished">Forza Dipendenze</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation>Forza Rinstallazione</translation>
+        <translation type="unfinished">Forza Rinstallazione</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation>Forza Eliminazione</translation>
+        <translation type="unfinished">Forza Eliminazione</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation>Forza Sovrascrittura</translation>
+        <translation type="unfinished">Forza Sovrascrittura</translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
-        <translation>WGet Dettagliato</translation>
+        <source>Information Level</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
-        <translation>OK</translation>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestore Pacchetti</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Inserisci qui il testo da cercare.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Clicca qui per nascondere la toolbar &quot;Quick Jump&quot;.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Aggiorna liste</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Clicca qui per aggiornare le liste dei pacchetti dai server.</translation>
     </message>
@@ -208,104 +257,80 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Clicca qui per trovare il successivo nome del pacchetto che contiene il testo che stai cercando.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Tastiera &quot;Quick Jump&quot;</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Clicca qui per mostrare/nascondere la tastiera per muoversi velocemente nella lista dei pacchetti.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vista</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configura</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Clicca qui per configurare questa applicazione.</translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation>Aiuto</translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation>Clicca qui per l&apos;aiuto.</translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation>Informazioni</translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation>Clicca qui per le informazioni sulla versione del software.</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation>Opzioni</translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Clicca qui per nascondere la toolbar di ricerca.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Server:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Clicca qui per selezionare un server per i pacchetti.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pacchetti</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Questa è la lista di tutti i pacchetti del server selezionato sopra.
 
 Un punto blu dopo il nome del pacchetto indica che il pacchetto è installato.
 
 Un punto blu con una stella indica che è disponibile sul server una nuova versione del pacchetto .
 
 Clicca dentro il box sulla sinistra per selezionare un pacchetto.</translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation>Informazioni su AQPkg</translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Clicca qui per disinstallare i pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Creazione lista server:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Creazione lista pacchetti per:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation>Installato Su - %1</translation>
     </message>
     <message>
@@ -415,109 +440,109 @@ Sei sicuro?
         <translation>Elimina o Rinstalla</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Rinstalla</translation>
     </message>
     <message>
         <source>R</source>
         <translation>R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Vuoi eliminare o fare l&apos;upgrade di
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Elimina o Upgrade</translation>
     </message>
     <message>
         <source>U</source>
         <translation>U</translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
-        <translation>Configurazione</translation>
+        <translation type="unfinished">Configurazione</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation>Server</translation>
-    </message>
-    <message>
-        <source>Active Server</source>
-        <translation>Server Attivo</translation>
+        <translation type="unfinished">Server</translation>
     </message>
     <message>
-        <source>Name:</source>
-        <translation>Nome:</translation>
+        <source>Destinations</source>
+        <translation type="unfinished">Destinazioni</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Proxies</source>
+        <translation type="unfinished">Proxy</translation>
     </message>
     <message>
-        <source>Change</source>
-        <translation>Cambia</translation>
+        <source>New</source>
+        <translation type="unfinished">Nuovo</translation>
     </message>
     <message>
-        <source>Remove</source>
-        <translation>Elimina</translation>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation>Nuovo</translation>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Destinations</source>
-        <translation>Destinazioni</translation>
+        <source>Name:</source>
+        <translation type="unfinished">Nome:</translation>
     </message>
     <message>
-        <source>Link To Root</source>
-        <translation>Link a Root</translation>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
-        <translation>Proxy</translation>
+        <source>Active Server</source>
+        <translation type="unfinished">Server Attivo</translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
-        <translation>Proxy HTTP</translation>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Password</translation>
+        <source>Destination</source>
+        <translation type="unfinished">Destinazione</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Abilitato</translation>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
-        <translation>Proxy FTP</translation>
+        <source>Link to root</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Username</translation>
+        <source>HTTP Proxy</source>
+        <translation type="unfinished">Proxy HTTP</translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
-        <translation>&amp;Applica</translation>
+        <source>Enabled</source>
+        <translation type="unfinished">Abilitato</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Generale</translation>
+        <source>FTP Proxy</source>
+        <translation type="unfinished">Proxy FTP</translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
-        <translation>(Avrà effetto al riavvio)</translation>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
-        <translation>Mostra Jump su Lettere</translation>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/datebook.ts b/i18n/it/datebook.ts
index ca1032d..b121546 100644
--- a/i18n/it/datebook.ts
+++ b/i18n/it/datebook.ts
@@ -21,56 +21,48 @@
         <source>Today</source>
         <translation>Oggi</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Giorno</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Settimana</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Lista Settimana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mese</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation>Allarme e Ora D&apos;inizio...</translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation>Vista Predefinita</translation>
-    </message>
-    <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>La durata dell&apos;evento è probabilmente più
 lunga dell&apos;intervallo tra le ripetizioni.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossibile modificare i dati, sincronizzazione in corso</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Modifica Evento</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minuti)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Spazio esaurito</translation>
@@ -86,48 +78,52 @@ modifiche.
 Liberare dello spazio e riprovare.
 
 Uscire comunque?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Sconosciuto)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Errore!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Ripara</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continua</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <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>
@@ -258,60 +254,107 @@ Uscire comunque?</translation>
         <source> minutes</source>
         <translation> minuti</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varie</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Stile riga:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Predefinito</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medio</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
-        <translation>Passa alla visualizzazione giornaliera</translation>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished">Giorno</translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished">Settimana</translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished">Mese</translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Nessuno</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">Inizio</translation>
+    </message>
+    <message>
+        <source>Start-End</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Questo è un evento per tutto il giorno.</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished">settimana</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation>A: </translation>
     </message>
     <message>
         <source>W: </source>
         <translation>S: </translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Gen-00. Gen</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation>W: %1</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/it/libqpe.ts b/i18n/it/libqpe.ts
index 038d0da..59969a2 100644
--- a/i18n/it/libqpe.ts
+++ b/i18n/it/libqpe.ts
@@ -329,52 +329,48 @@ modificando le categorie.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Crea una copia di questo documento.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Trasmetti via IrDA questo documento.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Utilizza rotazione personalizzata</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informazioni Proprietario</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation>Form1</translation>
-    </message>
-    <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
diff --git a/i18n/ja/aqpkg.ts b/i18n/ja/aqpkg.ts
index 9614487..cd7b997 100644
--- a/i18n/ja/aqpkg.ts
+++ b/i18n/ja/aqpkg.ts
@@ -1,124 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
+        <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start</source>
+        <source>Remove
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Install
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
+        <source>Output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</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>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
@@ -207,98 +256,74 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description - %1</source>
         <translation type="unfinished"></translation>
@@ -398,109 +423,109 @@ Are you sure?
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URL:</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link To Root</source>
+        <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
+        <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
+        <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/datebook.ts b/i18n/ja/datebook.ts
index 25ece9d..5600405 100644
--- a/i18n/ja/datebook.ts
+++ b/i18n/ja/datebook.ts
@@ -21,56 +21,48 @@
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -81,48 +73,52 @@ Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -253,60 +249,107 @@ Quit anyway?</source>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/ja/libqpe.ts b/i18n/ja/libqpe.ts
index 202f527..b75236e 100644
--- a/i18n/ja/libqpe.ts
+++ b/i18n/ja/libqpe.ts
@@ -327,52 +327,48 @@ editing categories.</source>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ko/aqpkg.ts b/i18n/ko/aqpkg.ts
index 9614487..cd7b997 100644
--- a/i18n/ko/aqpkg.ts
+++ b/i18n/ko/aqpkg.ts
@@ -1,124 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
+        <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start</source>
+        <source>Remove
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Install
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
+        <source>Output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</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>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
@@ -207,98 +256,74 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description - %1</source>
         <translation type="unfinished"></translation>
@@ -398,109 +423,109 @@ Are you sure?
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URL:</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link To Root</source>
+        <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
+        <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
+        <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/datebook.ts b/i18n/ko/datebook.ts
index 25ece9d..5600405 100644
--- a/i18n/ko/datebook.ts
+++ b/i18n/ko/datebook.ts
@@ -21,56 +21,48 @@
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -81,48 +73,52 @@ Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -253,60 +249,107 @@ Quit anyway?</source>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/ko/libqpe.ts b/i18n/ko/libqpe.ts
index 202f527..b75236e 100644
--- a/i18n/ko/libqpe.ts
+++ b/i18n/ko/libqpe.ts
@@ -327,52 +327,48 @@ editing categories.</source>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/nl/addressbook.ts b/i18n/nl/addressbook.ts
index fb89d05..187fdc0 100644
--- a/i18n/nl/addressbook.ts
+++ b/i18n/nl/addressbook.ts
@@ -150,48 +150,60 @@ Toch stoppen?</translation>
  aan de zoekterm!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Het geselecteerde bestand 
  eindigt niet op &quot;.vcf&quot;.
  Wilt u het alsnog openen?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Contact toevoegen?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Wilt U inderdaad een contact
 toevoegen voor %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp; Ja op alles</translation>
     </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to select a contact !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Verzoekstijl</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Gebruik reguliere expressies</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Gebruik jokertekens (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Hoofdlettergevoelig</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
@@ -300,48 +312,68 @@ is provided free !</source>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Verplaats geselecteerd kenmerk een plaats omhoog</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Verplaats geselecteerd kenmerk een plaats omlaag</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Lijst van alle mogelijke kenmerken</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Voeg geselecteerd kenmerk toe van onderstaande lijst aan de bovenste lijst </translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Verwijder geselecteerd kenmerk uit de bovenste lijst</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tool-/Menubar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Voornaam</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Tussenvoegsel</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Achternaam</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Toevoeging</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Sla op als</translation>
     </message>
     <message>
diff --git a/i18n/no/aqpkg.ts b/i18n/no/aqpkg.ts
index 9614487..cd7b997 100644
--- a/i18n/no/aqpkg.ts
+++ b/i18n/no/aqpkg.ts
@@ -1,124 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
+        <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start</source>
+        <source>Remove
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Install
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
+        <source>Output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</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>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
@@ -207,98 +256,74 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description - %1</source>
         <translation type="unfinished"></translation>
@@ -398,109 +423,109 @@ Are you sure?
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URL:</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link To Root</source>
+        <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
+        <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
+        <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/datebook.ts b/i18n/no/datebook.ts
index 25ece9d..5600405 100644
--- a/i18n/no/datebook.ts
+++ b/i18n/no/datebook.ts
@@ -21,56 +21,48 @@
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -81,48 +73,52 @@ Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -253,60 +249,107 @@ Quit anyway?</source>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/no/libqpe.ts b/i18n/no/libqpe.ts
index 202f527..b75236e 100644
--- a/i18n/no/libqpe.ts
+++ b/i18n/no/libqpe.ts
@@ -327,52 +327,48 @@ editing categories.</source>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pl/addressbook.ts b/i18n/pl/addressbook.ts
index 04a7219..9cc8805 100644
--- a/i18n/pl/addressbook.ts
+++ b/i18n/pl/addressbook.ts
@@ -147,48 +147,60 @@ Zakonczyc?</translation>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to select a contact !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -297,48 +309,68 @@ is provided free !</source>
     <message>
         <source>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tool-/Menubar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <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>Jako</translation>
     </message>
     <message>
diff --git a/i18n/pl/advancedfm.ts b/i18n/pl/advancedfm.ts
index 0b1212e..ee084a6 100644
--- a/i18n/pl/advancedfm.ts
+++ b/i18n/pl/advancedfm.ts
@@ -25,52 +25,48 @@
         <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>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -152,111 +148,125 @@
     <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>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</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>%1 exists. Ok to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</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>
     <message>
         <source>Output</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>
diff --git a/i18n/pl/appearance.ts b/i18n/pl/appearance.ts
index 00d6cc9..1aa9690 100644
--- a/i18n/pl/appearance.ts
+++ b/i18n/pl/appearance.ts
@@ -191,48 +191,52 @@ This area allows you to select an application and which settings you wish to dis
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotation direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Edytuj schemat</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled Item</source>
diff --git a/i18n/pl/aqpkg.ts b/i18n/pl/aqpkg.ts
index 9614487..cd7b997 100644
--- a/i18n/pl/aqpkg.ts
+++ b/i18n/pl/aqpkg.ts
@@ -1,124 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
+        <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start</source>
+        <source>Remove
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Install
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
+        <source>Output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</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>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
@@ -207,98 +256,74 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description - %1</source>
         <translation type="unfinished"></translation>
@@ -398,109 +423,109 @@ Are you sure?
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URL:</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link To Root</source>
+        <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
+        <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
+        <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/datebook.ts b/i18n/pl/datebook.ts
index 533ecbb..3f34bc2 100644
--- a/i18n/pl/datebook.ts
+++ b/i18n/pl/datebook.ts
@@ -21,56 +21,48 @@
         <source>Today</source>
         <translation>Dzis</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dzien</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Tydzien</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Tydzien</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Miesiac</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Szukaj</translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation>Alarm i Uruchomienie...</translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation>Domyslny widok</translation>
-    </message>
-    <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Czas zdarzenia jest dluzszy
 niz czestotliwosc powtarzania.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Nie mozna zmieniac danych podczas synchronizacji</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Edytuj zdarzenie</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minut)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Brak miejsca w pamieci</translation>
@@ -86,48 +78,52 @@ zapisac zmien.
 Zrob wiecej miejsca w pamieci i sprobuj ponownie.
 
 Wyjsc ?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(nieznany)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Blad!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Popraw to</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Kontynuowac</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished">P</translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished">W</translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished">P</translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -258,60 +254,107 @@ Wyjsc ?</translation>
         <source> minutes</source>
         <translation> minut</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished">Dzien</translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished">Tydzien</translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished">Miesiac</translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Brak</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">Poczatek</translation>
+    </message>
+    <message>
+        <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished">tydzien</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/pl/drawpad.ts b/i18n/pl/drawpad.ts
index f2a58cb..0087591 100644
--- a/i18n/pl/drawpad.ts
+++ b/i18n/pl/drawpad.ts
@@ -85,56 +85,48 @@
         <source>Draw Filled Ellipse</source>
         <translation>Wypelnione elipsy</translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation>Wypelnij obszar</translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation>Usun punkt</translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation>Grubosc rysika</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Kolor rysika</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Kolor wypelnienia</translation>
     </message>
     <message>
-        <source>DrawPad</source>
-        <translation>Szkicownik</translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation>Strona</translation>
-    </message>
-    <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation type="unfinished">Chcesz wyczyscic
 aktualna strone?</translation>
@@ -142,48 +134,124 @@ aktualna strone?</translation>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation type="unfinished">Chcesz usunac
 aktualna strone?</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation type="unfinished">Chcesz usunac
 wszystkie strony?</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to undo the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to re-perform the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the first page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the previous page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the next page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the last page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw lines.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw rectangles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw ellipses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the text drawing tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the fill tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the eraser tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the width of the drawing pen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when drawing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when filling in areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DrawPad - Page %1/%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation>Wybor strony</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>Aktualna</translation>
     </message>
     <message>
         <source>Range</source>
         <translation>Zakres</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>Do:</translation>
     </message>
     <message>
@@ -274,77 +342,97 @@ wszystkie strony?</translation>
     <message>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Title:</source>
+        <source>Title: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
+        <source>Dimension: %1x%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
+        <source>Date: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation type="unfinished">Wyczysc strone</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</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 Page</source>
         <translation type="unfinished">Usun strone</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet up one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet down one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/libbatteryapplet.ts b/i18n/pl/libbatteryapplet.ts
index 20b8cb0..a5408cf 100644
--- a/i18n/pl/libbatteryapplet.ts
+++ b/i18n/pl/libbatteryapplet.ts
@@ -1,32 +1,28 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Charging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -36,26 +32,54 @@
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Battery status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>could not open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charging both devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Percentage battery remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery time remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No jacket with battery inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/libqpe.ts b/i18n/pl/libqpe.ts
index 998aafe..97b29f2 100644
--- a/i18n/pl/libqpe.ts
+++ b/i18n/pl/libqpe.ts
@@ -328,52 +328,48 @@ edytuje kategorie.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>informacje wlasciciela</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt/addressbook.ts b/i18n/pt/addressbook.ts
index d6adcf7..719261e 100644
--- a/i18n/pt/addressbook.ts
+++ b/i18n/pt/addressbook.ts
@@ -147,48 +147,60 @@ Sair na mesma?</translation>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to select a contact !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -297,48 +309,68 @@ is provided free !</source>
     <message>
         <source>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tool-/Menubar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <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>Apelido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Ficheiro Como</translation>
     </message>
     <message>
diff --git a/i18n/pt/advancedfm.ts b/i18n/pt/advancedfm.ts
index 95a1394..9e3af51 100644
--- a/i18n/pt/advancedfm.ts
+++ b/i18n/pt/advancedfm.ts
@@ -25,52 +25,48 @@
         <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>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
@@ -152,111 +148,125 @@
     <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>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</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>%1 exists. Ok to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</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>
     <message>
         <source>Output</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>
diff --git a/i18n/pt/appearance.ts b/i18n/pt/appearance.ts
index 309e018..a216438 100644
--- a/i18n/pt/appearance.ts
+++ b/i18n/pt/appearance.ts
@@ -191,48 +191,52 @@ This area allows you to select an application and which settings you wish to dis
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotation direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editar esquema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled Item</source>
diff --git a/i18n/pt/aqpkg.ts b/i18n/pt/aqpkg.ts
index 9614487..cd7b997 100644
--- a/i18n/pt/aqpkg.ts
+++ b/i18n/pt/aqpkg.ts
@@ -1,124 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
+        <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start</source>
+        <source>Remove
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Install
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
+        <source>Output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</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>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
@@ -207,98 +256,74 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description - %1</source>
         <translation type="unfinished"></translation>
@@ -398,109 +423,109 @@ Are you sure?
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URL:</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link To Root</source>
+        <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
+        <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
+        <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/datebook.ts b/i18n/pt/datebook.ts
index d884d1e..1e3e275 100644
--- a/i18n/pt/datebook.ts
+++ b/i18n/pt/datebook.ts
@@ -21,56 +21,48 @@
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -81,48 +73,52 @@ Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -253,60 +249,107 @@ Quit anyway?</source>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/pt/drawpad.ts b/i18n/pt/drawpad.ts
index 14198c8..5082675 100644
--- a/i18n/pt/drawpad.ts
+++ b/i18n/pt/drawpad.ts
@@ -123,64 +123,132 @@
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Cor Preenchimento</translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</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>Do you want to delete
 the current page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DrawPad</source>
-        <translation>Rabiscos</translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation>Página</translation>
-    </message>
-    <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation type="unfinished">l</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to undo the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to re-perform the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the first page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the previous page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the next page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the last page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw lines.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw rectangles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw ellipses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the text drawing tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the fill tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the eraser tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the width of the drawing pen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when drawing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when filling in areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DrawPad - Page %1/%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>DrawPad - Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>Actual</translation>
     </message>
     <message>
         <source>Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -271,77 +339,97 @@ all the pages?</source>
     <message>
         <source>Title:</source>
         <translation>Título:</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Largura:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Altura:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Title:</source>
-        <translation>Título:</translation>
+        <source>Title: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
-        <translation>Dimensões:</translation>
+        <source>Dimension: %1x%2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
-        <translation>Data:</translation>
+        <source>Date: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation type="unfinished">Inserir Texto</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Limpar Página</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</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>Delete Page</source>
         <translation>Apagar Página</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet up one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet down one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/libbatteryapplet.ts b/i18n/pt/libbatteryapplet.ts
index 9f44b12..24b5055 100644
--- a/i18n/pt/libbatteryapplet.ts
+++ b/i18n/pt/libbatteryapplet.ts
@@ -1,32 +1,28 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery Status</source>
-        <translation>Estado da Bateria</translation>
-    </message>
-    <message>
         <source>Close</source>
         <translation type="unfinished">Fechar</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>A carregar</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation>Percentagem de bateria restante</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Estado da bateria:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Bom</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baixo</translation>
     </message>
     <message>
@@ -36,26 +32,54 @@
     <message>
         <source>Critical</source>
         <translation>Crítico</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Em energia de reserva</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Energia externa</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Energia externa desligada</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation>Tempo de bateria restante</translation>
     </message>
+    <message>
+        <source>Battery status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>could not open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charging both devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Percentage battery remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery time remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No jacket with battery inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/libqpe.ts b/i18n/pt/libqpe.ts
index e3ae1bc..31e1f1f 100644
--- a/i18n/pt/libqpe.ts
+++ b/i18n/pt/libqpe.ts
@@ -328,52 +328,48 @@ as categorias.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation>Form1</translation>
-    </message>
-    <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/addressbook.ts b/i18n/pt_BR/addressbook.ts
index 0c6ebea..0e6ff03 100644
--- a/i18n/pt_BR/addressbook.ts
+++ b/i18n/pt_BR/addressbook.ts
@@ -148,48 +148,60 @@ Sair assim mesmo?</translation>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to select a contact !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -298,48 +310,68 @@ is provided free !</source>
     <message>
         <source>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tool-/Menubar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished">Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished">Sobrenome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished">Arquivar Como</translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/advancedfm.ts b/i18n/pt_BR/advancedfm.ts
index 0b1212e..ee084a6 100644
--- a/i18n/pt_BR/advancedfm.ts
+++ b/i18n/pt_BR/advancedfm.ts
@@ -25,52 +25,48 @@
         <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>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -152,111 +148,125 @@
     <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>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</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>%1 exists. Ok to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</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>
     <message>
         <source>Output</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>
diff --git a/i18n/pt_BR/appearance.ts b/i18n/pt_BR/appearance.ts
index 31d7702..8ac51dc 100644
--- a/i18n/pt_BR/appearance.ts
+++ b/i18n/pt_BR/appearance.ts
@@ -192,48 +192,52 @@ This area allows you to select an application and which settings you wish to dis
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotation direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled Item</source>
diff --git a/i18n/pt_BR/aqpkg.ts b/i18n/pt_BR/aqpkg.ts
index 9614487..cd7b997 100644
--- a/i18n/pt_BR/aqpkg.ts
+++ b/i18n/pt_BR/aqpkg.ts
@@ -1,124 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
+        <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start</source>
+        <source>Remove
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Install
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
+        <source>Output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</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>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
@@ -207,98 +256,74 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description - %1</source>
         <translation type="unfinished"></translation>
@@ -398,109 +423,109 @@ Are you sure?
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URL:</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link To Root</source>
+        <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
+        <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
+        <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/datebook.ts b/i18n/pt_BR/datebook.ts
index 616c02d..cf777b4 100644
--- a/i18n/pt_BR/datebook.ts
+++ b/i18n/pt_BR/datebook.ts
@@ -72,61 +72,57 @@ longa que o intervalo entre repetições.</translation>
         <source>Edit Event</source>
         <translation>Edit Event</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuar</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossível editar dados durante sincronização</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation>Alarme e Horário de Inicio...</translation>
-    </message>
-    <message>
         <source>WeekLst</source>
         <translation>ListaSem</translation>
     </message>
     <message>
-        <source>Default View</source>
-        <translation>Visualiz. Padrão</translation>
+        <source>Duplicate Event</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate Event</source>
+        <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>F</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished">Q</translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished">Q</translation>
@@ -259,60 +255,107 @@ longa que o intervalo entre repetições.</translation>
         <source>:00</source>
         <translation type="unfinished">:00</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished">Dia</translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished">Semana</translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished">Mês</translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">Início</translation>
+    </message>
+    <message>
+        <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished">semana</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>W: </source>
         <translation type="unfinished">S: </translation>
     </message>
     <message>
         <source>Y: </source>
         <translation type="unfinished">A: </translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/pt_BR/drawpad.ts b/i18n/pt_BR/drawpad.ts
index d8b80c5..0e3ea96 100644
--- a/i18n/pt_BR/drawpad.ts
+++ b/i18n/pt_BR/drawpad.ts
@@ -85,102 +85,170 @@
         <source>Draw Filled Ellipse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DrawPad</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</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>Do you want to delete
 the current page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to undo the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to re-perform the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the first page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the previous page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the next page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the last page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw lines.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw rectangles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw ellipses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the text drawing tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the fill tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the eraser tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the width of the drawing pen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when drawing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when filling in areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DrawPad - Page %1/%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -271,77 +339,97 @@ all the pages?</source>
     <message>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Title:</source>
+        <source>Title: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
+        <source>Dimension: %1x%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
+        <source>Date: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</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 Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet up one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet down one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libbatteryapplet.ts b/i18n/pt_BR/libbatteryapplet.ts
index 245ed74..3b20405 100644
--- a/i18n/pt_BR/libbatteryapplet.ts
+++ b/i18n/pt_BR/libbatteryapplet.ts
@@ -30,33 +30,57 @@
         <source>Power on-line</source>
         <translation>Energia ligada</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Usando energia de reserva</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation>Tempo restante de bateria</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Crítico</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Muito Baixo</translation>
     </message>
     <message>
-        <source>Battery Status</source>
-        <translation>Estado da Bateria</translation>
-    </message>
-    <message>
         <source>Charging</source>
         <translation>Carregando</translation>
     </message>
+    <message>
+        <source>Battery status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>could not open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charging both devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Percentage battery remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery time remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No jacket with battery inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libqpe.ts b/i18n/pt_BR/libqpe.ts
index 3afad2b..097a332 100644
--- a/i18n/pt_BR/libqpe.ts
+++ b/i18n/pt_BR/libqpe.ts
@@ -337,52 +337,48 @@ editando as categorias.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informações sobre o Proprietário</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished">Entre a senha</translation>
     </message>
     <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/sl/addressbook.ts b/i18n/sl/addressbook.ts
index dee3475..9ea4fbb 100644
--- a/i18n/sl/addressbook.ts
+++ b/i18n/sl/addressbook.ts
@@ -151,48 +151,60 @@ Izhod?</translation>
 iskani vzorec!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Izbrana datoteka
 nima končnice &quot;.vcf&quot;.
 Ali jo res želite odpreti?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Dodam stik?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Ali res želite dodati stik za 
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Vse da</translation>
     </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to select a contact !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Stil poizvedbe</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Uporabi regularne izraze</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Uporabi (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Loči male in velike črke</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Pošta</translation>
     </message>
     <message>
@@ -304,48 +316,68 @@ je zastonj!</translation>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Premakni izbrani parameter eno vrstico gor</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Premakni izbrani parameter eno vrstico dol</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Seznam vseh dostopnih parametrov</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Dodaj izbrani parameter iz seznama spodaj v gornji seznam</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Odstrani izbrani parameter iz gornjega seznama</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Red (gor -&gt; dol) definira prvi stik prikazan v naslednjem stolpcu seznama</translation>
     </message>
+    <message>
+        <source>Tool-/Menubar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <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>
diff --git a/i18n/sl/advancedfm.ts b/i18n/sl/advancedfm.ts
index 4024bda..e77a426 100644
--- a/i18n/sl/advancedfm.ts
+++ b/i18n/sl/advancedfm.ts
@@ -25,52 +25,48 @@
         <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>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
@@ -154,118 +150,132 @@
         <translation>Kot</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Kopiraj isti imenik</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>Ne morem kopirati</translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>v
 </translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>Ne morem prenesti
 </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>Advanced FileManager
-pravice pridržane 2002
-LJ.Potter&lt;llornkcor@handhelds.org&gt;
-in je licencirano pod GPL</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>Dodaj med dokumente</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation></translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Izberi vse</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>Ali zares izbrišem
 %1 datotek?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Izbrišem imenik?</translation>
     </message>
     <message>
         <source>Really delete
 </source>
         <translation></translation>
     </message>
     <message>
-        <source>Delete Directory</source>
-        <translation>Izbriši imenik</translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation>Res skopiram
 %1 datotek?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>Datoteka obstaja!</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>
 obstaja. Ali prepišem?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation>že obstaja.
 Ali jo res želite izbrisati?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation>%1 obstaja. Ali prepišem?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation>Ne morem skopirati %1 v %2</translation>
     </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished">Advanced FileManager
+pravice pridržane 2002-2003
+LJ.Potter&lt;llornkcor@handhelds.org&gt;
+in je licencirano pod GPL</translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</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>
     <message>
         <source>Output</source>
         <translation>Izhod</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>
diff --git a/i18n/sl/appearance.ts b/i18n/sl/appearance.ts
index c5c3008..898aca3 100644
--- a/i18n/sl/appearance.ts
+++ b/i18n/sl/appearance.ts
@@ -206,48 +206,52 @@ Ta prostor vam omogoča, da izberete program in katere nastavitve želite onemog
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Kliknite tu, da izberete željeni stil za zavihke (kot je ta program). Stili, ki so na voljo so:
 
 1. Zavihki - normalni zavihki samo z besedilom
 2. Zavihki ikone - zavihki z ikonami za vsak zavihek, besedilo se prikaže samo na trenutnem zavihku
 3. Roletni seznam - pokončen seznam zavihkov
 4. Roletni seznam ikone - pokončen seznam zavihkov z ikonami</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Kliknite tu, da se zavihki prikažejo na vrhu okna.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Kliknite tu, da se zavihki prikažejo na dnu okna.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>To je predogled. Tu vidite svoj novi izgled med tem, ko spreminjate opcije.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Nastavitve izgleda</translation>
     </message>
+    <message>
+        <source>Rotation direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Uredi shemo</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Kliknite tu, da izberete barvo za:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Primer</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Normalna reč</translation>
     </message>
     <message>
         <source>Disabled Item</source>
diff --git a/i18n/sl/aqpkg.ts b/i18n/sl/aqpkg.ts
index 9614487..cd7b997 100644
--- a/i18n/sl/aqpkg.ts
+++ b/i18n/sl/aqpkg.ts
@@ -1,124 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
+        <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start</source>
+        <source>Remove
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Install
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
+        <source>Output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</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>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
@@ -207,98 +256,74 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description - %1</source>
         <translation type="unfinished"></translation>
@@ -398,109 +423,109 @@ Are you sure?
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URL:</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link To Root</source>
+        <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
+        <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
+        <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/datebook.ts b/i18n/sl/datebook.ts
index 3b5d1c1..51fb5e0 100644
--- a/i18n/sl/datebook.ts
+++ b/i18n/sl/datebook.ts
@@ -21,56 +21,48 @@
         <source>Today</source>
         <translation>Danes</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dan</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Teden</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Teden. seznam</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mesec</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation>Alarm in začetni čas...</translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation>Privzet pogled</translation>
-    </message>
-    <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Dogodek je potencialno daljsi,
 kot interval med ponovitvijo.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Ne morem urediti podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Uredi dogodke</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>minut)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Zmanjkalo je prostora</translation>
@@ -87,48 +79,52 @@ Sprostite nekaj prostora in
 poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Neznano)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Napaka!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Popravi</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Nadaljuj</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>P</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>S</translation>
     </message>
     <message>
         <source>F</source>
         <translation>P</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
@@ -259,60 +255,107 @@ Izhod?</translation>
         <source> minutes</source>
         <translation>minut</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Različno</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Stil vrstice:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Privzet</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Srednji</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Velik</translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
-        <translation>Skoči na trenuten čas</translation>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished">Dan</translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished">Teden</translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished">Mesec</translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Brez</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">Začetek</translation>
+    </message>
+    <message>
+        <source>Start-End</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>To je celodnevni dogodek.</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished">teden</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation>L: </translation>
     </message>
     <message>
         <source>W: </source>
         <translation>T: </translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/sl/drawpad.ts b/i18n/sl/drawpad.ts
index 955ba5b..83b84db 100644
--- a/i18n/sl/drawpad.ts
+++ b/i18n/sl/drawpad.ts
@@ -85,56 +85,48 @@
         <source>Draw Filled Ellipse</source>
         <translation>Riši zapolnjeno elipso</translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation>Zapolni območje</translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation>Zbriši točko</translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation>Debelina svinčnika</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Barva svinčnika</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Barva polnila</translation>
     </message>
     <message>
-        <source>DrawPad</source>
-        <translation>Risalna plošča</translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation>Stran</translation>
-    </message>
-    <message>
         <source>Insert Text</source>
         <translation>Vstavi besedilo</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Ikoniziran pogled</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation>Ikoniziran pogled...</translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation>Informacije o strani</translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation>Informacije o strani...</translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation>Ali želite pobrisati
 trenutno stran?</translation>
@@ -142,48 +134,124 @@ trenutno stran?</translation>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation>Ali želite izbrisati
 trenutno stran?</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation>Ali želite izbrisati
 vse strani?</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation>Mehčanje robov</translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to undo the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to re-perform the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the first page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the previous page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the next page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the last page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw lines.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw rectangles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw ellipses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the text drawing tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the fill tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the eraser tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the width of the drawing pen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when drawing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when filling in areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DrawPad - Page %1/%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation>Izbira strani</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>Trenutna</translation>
     </message>
     <message>
         <source>Range</source>
         <translation>Obseg</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>Do:</translation>
     </message>
     <message>
@@ -274,79 +342,99 @@ vse strani?</translation>
     <message>
         <source>Title:</source>
         <translation>Naslov:</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Širina:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Višina:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Title:</source>
-        <translation>Naslov:</translation>
+        <source>Title: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
-        <translation>Dimenzija:</translation>
+        <source>Dimension: %1x%2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
-        <translation>Datum:</translation>
+        <source>Date: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation>Vstavi besedilo</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation>Risalna plošča - Ikoniziran pogled</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Pobriši stran</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation>Ali želite pobrisati
 izbrano stran?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Izbriši stran</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation>Ali želite izbrisati
 izbrano stran?</translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet up one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet down one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/libbatteryapplet.ts b/i18n/sl/libbatteryapplet.ts
index 2eb100c..82e5902 100644
--- a/i18n/sl/libbatteryapplet.ts
+++ b/i18n/sl/libbatteryapplet.ts
@@ -1,32 +1,28 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery Status</source>
-        <translation>Status baterije</translation>
-    </message>
-    <message>
         <source>Charging</source>
         <translation>Polnim</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation></translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Status baterije:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Dober</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Nizek</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Zelo nizek</translation>
     </message>
     <message>
@@ -36,26 +32,54 @@
     <message>
         <source>Unknown</source>
         <translation>Neznan</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Na pomožnem napajanju</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Napajanje priklopljeno</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Zunanje napajanje odklopljeno</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation>Čas baterije do konca</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Zapri</translation>
     </message>
+    <message>
+        <source>Battery status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>could not open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charging both devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Percentage battery remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery time remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No jacket with battery inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/libqpe.ts b/i18n/sl/libqpe.ts
index c3bf8d4..d34bc15 100644
--- a/i18n/sl/libqpe.ts
+++ b/i18n/sl/libqpe.ts
@@ -328,52 +328,48 @@ ureja kategorije.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informacije o lastniku</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation>Obrazec1</translation>
-    </message>
-    <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
diff --git a/i18n/xx/addressbook.ts b/i18n/xx/addressbook.ts
index 026ef9f..690ed03 100644
--- a/i18n/xx/addressbook.ts
+++ b/i18n/xx/addressbook.ts
@@ -143,48 +143,60 @@ and try again.
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to select a contact !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -293,48 +305,68 @@ is provided free !</source>
     <message>
         <source>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tool-/Menubar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/xx/advancedfm.ts b/i18n/xx/advancedfm.ts
index df42a9e..026ad6d 100644
--- a/i18n/xx/advancedfm.ts
+++ b/i18n/xx/advancedfm.ts
@@ -1,43 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</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>Show Hidden Files</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>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -100,94 +93,86 @@ and is licensed by the GPL</source>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select All</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>Really delete
 %1 files?</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 Directory?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
@@ -215,48 +200,73 @@ exists. Ok to overwrite?</source>
         <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> already exists.
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
diff --git a/i18n/xx/appearance.ts b/i18n/xx/appearance.ts
index 0a0cc3c..d03a089 100644
--- a/i18n/xx/appearance.ts
+++ b/i18n/xx/appearance.ts
@@ -191,48 +191,52 @@ This area allows you to select an application and which settings you wish to dis
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotation direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled Item</source>
diff --git a/i18n/xx/aqpkg.ts b/i18n/xx/aqpkg.ts
index 9614487..cd7b997 100644
--- a/i18n/xx/aqpkg.ts
+++ b/i18n/xx/aqpkg.ts
@@ -1,124 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
+        <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start</source>
+        <source>Remove
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Install
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
+        <source>Output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</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>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
@@ -207,98 +256,74 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description - %1</source>
         <translation type="unfinished"></translation>
@@ -398,109 +423,109 @@ Are you sure?
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URL:</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link To Root</source>
+        <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
+        <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
+        <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/datebook.ts b/i18n/xx/datebook.ts
index 25ece9d..5600405 100644
--- a/i18n/xx/datebook.ts
+++ b/i18n/xx/datebook.ts
@@ -21,56 +21,48 @@
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -81,48 +73,52 @@ Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -253,60 +249,107 @@ Quit anyway?</source>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/xx/drawpad.ts b/i18n/xx/drawpad.ts
index 3955fc5..ab1ca77 100644
--- a/i18n/xx/drawpad.ts
+++ b/i18n/xx/drawpad.ts
@@ -127,58 +127,126 @@
     </message>
     <message>
         <source>Fill Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</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>Do you want to delete
 the current page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DrawPad</source>
+        <source>Do you want to delete
+all the pages?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Page</source>
+        <source>Click here to add a new sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to delete
-all the pages?</source>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to undo the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to re-perform the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the first page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the previous page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the next page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the last page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw lines.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw rectangles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw ellipses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the text drawing tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the fill tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the eraser tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the width of the drawing pen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when drawing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when filling in areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DrawPad - Page %1/%2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>DrawPad - Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Range</source>
         <translation type="unfinished"></translation>
@@ -271,77 +339,97 @@ all the pages?</source>
     <message>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Title:</source>
+        <source>Title: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
+        <source>Dimension: %1x%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
+        <source>Date: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</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 Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet up one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet down one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/libbatteryapplet.ts b/i18n/xx/libbatteryapplet.ts
index 0f0c5ce..8ca62b8 100644
--- a/i18n/xx/libbatteryapplet.ts
+++ b/i18n/xx/libbatteryapplet.ts
@@ -1,32 +1,28 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -36,26 +32,54 @@
     <message>
         <source>Critical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Battery status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>could not open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charging both devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Percentage battery remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery time remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No jacket with battery inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/libqpe.ts b/i18n/xx/libqpe.ts
index 202f527..b75236e 100644
--- a/i18n/xx/libqpe.ts
+++ b/i18n/xx/libqpe.ts
@@ -327,52 +327,48 @@ editing categories.</source>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_CN/aqpkg.ts b/i18n/zh_CN/aqpkg.ts
index 9614487..cd7b997 100644
--- a/i18n/zh_CN/aqpkg.ts
+++ b/i18n/zh_CN/aqpkg.ts
@@ -1,124 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
+        <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start</source>
+        <source>Remove
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Install
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
+        <source>Output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</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>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
@@ -207,98 +256,74 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description - %1</source>
         <translation type="unfinished"></translation>
@@ -398,109 +423,109 @@ Are you sure?
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URL:</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link To Root</source>
+        <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
+        <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
+        <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/datebook.ts b/i18n/zh_CN/datebook.ts
index 25ece9d..5600405 100644
--- a/i18n/zh_CN/datebook.ts
+++ b/i18n/zh_CN/datebook.ts
@@ -21,56 +21,48 @@
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -81,48 +73,52 @@ Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -253,60 +249,107 @@ Quit anyway?</source>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/zh_CN/libqpe.ts b/i18n/zh_CN/libqpe.ts
index 202f527..b75236e 100644
--- a/i18n/zh_CN/libqpe.ts
+++ b/i18n/zh_CN/libqpe.ts
@@ -327,52 +327,48 @@ editing categories.</source>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/addressbook.ts b/i18n/zh_TW/addressbook.ts
index a158180..72504bf 100644
--- a/i18n/zh_TW/addressbook.ts
+++ b/i18n/zh_TW/addressbook.ts
@@ -1,1395 +1,1504 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
-        <translation >全名</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
-        <translation >聯絡人</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick</source>
-        <translation>選取</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
-        <translation>聯絡人</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
-        <translation>聯絡人</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Card</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
-        <translation>新增</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>編輯</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation >刪除</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
-        <translation >搜尋</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
-        <translation>寫電郵給</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
-        <translation >傳送項目</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
-        <translation >個人資料</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation  >檢視></translation>
+        <source>Save all Data</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation  >同步中, 無法編輯資料>/translation>
+        <source>Config</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit My Personal Details</source>
-        <translation  >編輯個人資料</translation>
+        <source>You have to select a contact !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right file type ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The selected file 
+ does not end with &quot;.vcf&quot;.
+ Do you really want to open it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Contact?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
-        <translation  >編輯地址</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit My Personal Details</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
-        <translation  >聯絡人 - 個人資料"</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation  >儲存空間不足</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
-        <translation  >無法儲存資料
-請先釋放些儲存空間後再試一次
-退出?
-</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to find a contact for this 
+ search pattern!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cards</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
-        <translation  >全部</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation  >未歸檔</translation>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ConfigDlg_Base</name>
     <message>
-        <source>Import vCard</source>
-        <translation  >輸入 cVard</translation>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close Find</source>
-        <translation  >關閉搜尋</translation>
+        <source>Click on tab to select one</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save all Data</source>
-        <translation  >儲存所有資料</translation>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config</source>
-        <translation  >設定</translation>
+        <source>Search Settings</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OContacts</source>
-        <translation  >聯絡人</translation>
+        <source>Query Style</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not Found</source>
-        <translation  >未找到</translation>
+        <source>Settings for the search query style</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>List</source>
-        <translation  >列出</translation>
+        <source>Use Regular Expressions</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cards</source>
-        <translation  >名片</translation>
+        <source>Search widget expects regular expressions if selected</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Card</source>
-        <translation  >名片</translation>
+        <source>Use Wildcards (*,?)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start Search</source>
-        <translation  >開始搜尋</translation>
+        <source>Search widget just expects simple wildcards</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Right file type ?</source>
-        <translation  >是正確檔案類型嘛?</translation>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Yes</source>
-        <translation  >&amp;是</translation>
+        <source>If selected, search differs between upper and lower chars</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;No</source>
-        <translation  >&amp;否</translation>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
-        <translation  >無法找到此型態的聯絡人</translation>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The selected file 
- does not end with &quot;.vcf&quot;.
- Do you really want to open it?</source>
-        <translation  >選擇的檔案不是以&quot;.vcf&quot;結束.確定要開啟?</translation>
+        <source>Font size for list- and card view</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Contact?</source>
-        <translation  >新增聯絡人?</translation>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want add contact for 
-%1?</source>
-        <translation  >確定要在%1加入聯絡人?</translation>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;All Yes</source>
-        <translation  >&amp;全部都是</translation>
+        <source>Tool-/Menubar</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ConfigDlg_Base</name>
     <message>
-        <source>Query Style</source>
-        <translation  >查詢樣式</translation>
+        <source>Fixed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Regular Expressions</source>
-        <translation  >使用一般的表達方式</translation>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Wildcards (*,?)</source>
-        <translation  >使用萬用字元(*,?)</translation>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Case Sensitive</source>
-        <translation  >大小寫不同</translation>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
-        <translation  >郵件</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fontsettings for list and card view</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
-        <translation  >採用QT-Mail</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Sharp&apos;s mail application if available</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
-        <translation  >採用Opie-Mail</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use OPIE mail if installed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
-        <translation  >注意: QT-Maily僅在Sharp的預設ROM中提供.Opie-Mail可免費安裝 </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
-        <translation  >其他</translation>
-    </message>
-    <message>
-        <source>Search Settings</source>
-        <translation  >搜尋之設定</translation>
+        <source>Order</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font</source>
-        <translation  >字型</translation>
+        <source>Select Contact Order:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small</source>
-        <translation  >小</translation>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal</source>
-        <translation  >一般</translation>
+        <source>Move selected attribute one line up</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Large</source>
-        <translation  >大</translation>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Order</source>
-        <translation  >順序</translation>
+        <source>Move selected attribute one line down</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select Contact Order:</source>
-        <translation  >選擇聯絡人順序</translation>
+        <source>List of all available attributes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Up</source>
-        <translation  >上移</translation>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Down</source>
-        <translation  >下移</translation>
+        <source>Add selected attribute from list below to the upper list</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add</source>
-        <translation  >增加</translation>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
-        <translation  >移除</translation>
+        <source>Remove the selected attribute from the upper list</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configuration</source>
-        <translation  >設定</translation>
+        <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
-        <source>First Name</source>
-        <translation  >名</translation>
+        <source>Full Name...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Middle Name</source>
-        <translation  >中名</translation>
+        <source>Press to enter last- middle and firstname</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Name</source>
-        <translation  >姓</translation>
+        <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suffix</source>
-        <translation  >Suffix</translation>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File As</source>
-        <translation  >歸檔為</translation>
+        <source>The jobtitle..</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gender</source>
-        <translation  >性別</translation>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Job Title</source>
-        <translation  >職稱</translation>
+        <source>Something like &quot;jr.&quot;..</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>City</source>
-        <translation  >城市</translation>
+        <source>Organization</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
-        <translation  >州</translation>
+        <source>The working place of the contact</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Country</source>
-        <translation  >國家</translation>
+        <source>Press to select attribute to change</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Full Name...</source>
-        <translation  >全名...</translation>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Organization</source>
-        <translation  >組織</translation>
+        <source>Press to select how to store the name (and howto show it in the listview)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
-        <translation  >類別</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
-        <translation  >註解...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
-        <translation  >一般</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
-        <translation  >商務</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
-        <translation  >住家</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
-        <translation  >住址</translation>
-    </message>
-    <message>
-        <source>Zip Code</source>
-        <translation  >郵遞區號</translation>
-    </message>
-    <message>
-        <source>United States</source>
-        <translation  >美國</translation>
-    </message>
-    <message>
-        <source>United Kingdom</source>
-        <translation  >英國</translation>
-    </message>
-    <message>
-        <source>Japan</source>
-        <translation  >日本</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>France</source>
-        <translation  >法國</translation>
-    </message>
-    <message>
-        <source>Germany</source>
-        <translation  >德國</translation>
-    </message>
-    <message>
-        <source>Norway</source>
-        <translation  >挪威</translation>
-    </message>
-    <message>
-        <source>Canada</source>
-        <translation  >加拿大</translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation  >男性</translation>
+        <source>City</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Female</source>
-        <translation  >女性</translation>
+        <source>State</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Details</source>
-        <translation  >細項</translation>
+        <source>Zip Code</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter Note</source>
-        <translation  >輸入註解</translation>
+        <source>Country</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Name</source>
-        <translation  >編輯姓名</translation>
+        <source>United States</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Contacts</source>
-        <translation  >聯絡人</translation>
+        <source>United Kingdom</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Afganistan</source>
-        <translation  >阿富汗</translation>
+        <source>Afghanistan</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
-        <translation  >阿爾巴尼亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
-        <translation  >阿爾及利亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
-        <translation  >美屬薩摩亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
-        <translation  >安道爾共和國</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
-        <translation  >安哥拉</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
-        <translation  >安圭拉島</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Antartica</source>
-        <translation  >南極圈</translation>
+        <source>Antarctica</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
-        <translation  >阿根廷</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Armania</source>
-        <translation  >Armania</translation>
+        <source>Armenia</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
-        <translation  >Aruba</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
-        <translation  >澳洲</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
-        <translation  >奧地利</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
-        <translation  >亞塞拜然</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
-        <translation  >巴哈馬</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
-        <translation  >巴林</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
-        <translation  >孟加拉共和國</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
-        <translation  >巴貝多</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
-        <translation  >比利時人</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
-        <translation  >比利時</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
-        <translation  >貝里斯</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
-        <translation  >貝南</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
-        <translation  >百慕達(群島)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
-        <translation  >不丹</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Boliva</source>
-        <translation  >委內瑞拉銀幣</translation>
+        <source>Bolivia</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Botswana</source>
-        <translation  >波紮那</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
-        <translation  >Bouvet Island</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
-        <translation  >巴西</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
-        <translation  >文萊></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bulgaria</source>
-        <translation  >保加利亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burkina Faso</source>
-        <translation  >布基那法索國</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burundi</source>
-        <translation  >蒲隆地</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
-        <translation  >柬埔寨</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Camaroon</source>
-        <translation  >喀麥隆</translation>
+        <source>Cameroon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Canada</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
-        <translation  >開普</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
-        <translation  >卡宴</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chad</source>
-        <translation  >查德</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chile</source>
-        <translation  >智利</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>China</source>
-        <translation  >中國大陸</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Christmas Island</source>
-        <translation  >Chrismas Island</transltion>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
-        <translation  >歌倫比亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comoros</source>
-        <translation  >科摩洛</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
-        <translation  >剛果</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cook Island</source>
-        <translation  >Cook Island</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
-        <translation  >哥斯大黎加</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
-        <translation  >科都努</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Croatia</source>
-        <translation  >克羅埃西亞共和國</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cuba</source>
-        <translation  >古巴</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyprus</source>
-        <translation  >塞普勒斯</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Czech Republic</source>
-        <translation  >捷克</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Denmark</source>
-        <translation  >丹麥</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Djibouti</source>
-        <translation  >吉布地</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
-        <translation  >多米尼克</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
-        <translation  >多明尼加共和國</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
-        <translation  >East Timor</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
-        <translation  >厄瓜多爾</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
-        <translation  >埃及</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
-        <translation  >薩爾瓦多</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
-        <translation  >赤道幾內亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
-        <translation  >厄立特里亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
-        <translation  >愛沙尼亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
-        <translation  >衣索比亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
-        <translation  >(英屬)福克蘭群島</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
-        <translation  >法羅群島</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
-        <translation  >斐濟</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
-        <translation  >芬蘭</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>France</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
-        <translation  >法屬圭亞那</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
-        <translation  >玻里尼西亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
-        <translation  >加彭</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
-        <translation  >甘比亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
-        <translation  >喬治亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gahna</source>
-        <translation  >甘那</translation>
+        <source>Germany</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ghana</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
-        <translation  >直布羅陀</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
-        <translation  >希臘</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
-        <translation  >格林蘭島</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
-        <translation  >格瑞納達</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Guadelupe</source>
-        <translation  >哥德洛普島</translation>
+        <source>Guadeloupe</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
-        <translation  >關島</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
-        <translation  >瓜地馬拉</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
-        <translation  >幾內亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Guinea-bissau</source>
-        <translation  >幾內亞比紹</translation>
+        <source>Guinea-Bissau</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
-        <translation  >蓋亞那</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
-        <translation  >海地</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
-        <translation  >羅馬教廷</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
-        <translation  >宏都拉斯</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
-        <translation  >香港</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
-        <translation  >匈牙利</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
-        <translation  >冰島</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
-        <translation  >印度</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
-        <translation  >印尼</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
-        <translation  >愛爾蘭</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
-        <translation  >以色列</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
-        <translation  >義大利</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jamaica</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jamacia</source>
-        <translation  >牙買加</translation>
+        <source>Japan</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
-        <translation  >約旦</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
-        <translation  >哈薩克</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
-        <translation  >肯亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kribati</source>
-        <translation  >魁巴地</translation>
+        <source>Kiribati</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
-        <translation  >韓國</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kuwait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kyrgyzstan</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
-        <translation  >寮國</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
-        <translation  >拉脫維亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
-        <translation  >黎巴嫩</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
-        <translation  >賴索托</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
-        <translation  > 賴比瑞亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
-        <translation  >列支敦斯登</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
-        <translation  >立陶宛</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
-        <translation  >盧森堡</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
-        <translation  >澳門</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
-        <translation  >馬其頓</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
-        <translation  >馬達加斯加</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
-        <translation  >馬拉威</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
-        <translation  >馬來西亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
-        <translation  >馬爾地夫</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
-        <translation  >馬利</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
-        <translation  >馬爾他</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
-        <translation  >馬丁尼克</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
-        <translation  >茅利塔尼亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
-        <translation  >模里西斯</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
-        <translation  >馬優特</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
-        <translation  >墨西哥</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
-        <translation  >密克羅西尼亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
-        <translation  >摩爾達維亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
-        <translation  >摩納哥</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
-        <translation  >蒙古</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
-        <translation  >蒙特色拉特</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
-        <translation  >摩洛哥</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
-        <translation  >莫三比克</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
-        <translation  >緬甸</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
-        <translation  >那米比亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
-        <translation  >諾魯</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
-        <translation  >尼泊爾</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
-        <translation  >荷蘭</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
-        <translation  >新加勒多尼亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
-        <translation  >紐西蘭</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
-        <translation  >尼加拉瓜</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
-        <translation  >尼日</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
-        <translation  >奈及利亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
-        <translation  >Niue</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Norway</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
-        <translation  >阿曼</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
-        <translation  >巴基斯坦</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
-        <translation  >Palau</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Palestinian Territory</source>
-        <translation  >巴勒斯坦地區</translation>
+        <source>Palestinian Sovereign Areas</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
-        <translation  >巴拿馬</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
-        <translation  >巴布亞島新幾內亞島</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
-        <translation  >巴拉圭</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
-        <translation  >祕魯</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
-        <translation  >菲律賓</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pitcairn</source>
-        <translation  >Pitcairn</translation>
+        <source>Pitcairn Islands</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Poland</source>
-        <translation  >波蘭</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
-        <translation  >葡萄牙</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Puerto Rico</source>
-        <translation  >波多黎各</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qatar</source>
-        <translation  >卡達</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reunion</source>
-        <translation  >留尼旺島</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Romania</source>
-        <translation  >羅馬尼亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Russia</source>
-        <translation  >俄羅斯</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rwanda</source>
-        <translation  >盧安達</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saint Lucia</source>
-        <translation  >聖路西亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samoa</source>
-        <translation  >薩摩亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>San Marino</source>
-        <translation  >聖馬利諾</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
-        <translation  >沙烏地阿拉伯</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Senegal</source>
-        <translation  >塞內加爾</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seychelles</source>
-        <translation  >塞席爾群島</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sierra Leone</source>
-        <translation  >獅子山</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Singapore</source>
-        <translation  >新加坡</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovakia</source>
-        <translation  >斯洛伐克</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovenia</source>
-        <translation  >斯洛維尼亞共和國</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solomon Islands</source>
-        <translation  >所羅門群島</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Somalia</source>
-        <translation  >索馬利亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>South Africa</source>
-        <translation  >南非</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spain</source>
-        <translation  >西班牙</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sri Lanka</source>
-        <translation  >斯里蘭卡</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St. Helena</source>
-        <translation  >聖海倫娜</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sudan</source>
-        <translation  >蘇丹</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suriname</source>
-        <translation  >蘇利南莫河</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swaziland</source>
-        <translation  >史瓦濟蘭</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sweden</source>
-        <translation  >瑞典</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switzerland</source>
-        <translation  >瑞士</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taiwan</source>
-        <translation  >臺灣</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tajikistan</source>
-        <translation  >塔吉克</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tanzania</source>
-        <translation  >坦尚尼亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thailand</source>
-        <translation  >泰國</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Togo</source>
-        <translation  >多哥</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tokelau</source>
-        <translation  >Tokelau</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tonga</source>
-        <translation  >東加</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tunisia</source>
-        <translation  >突尼西亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkey</source>
-        <translation  >土耳其</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkmenistan</source>
-        <translation  >土庫曼</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
-        <translation  >吐瓦魯</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
-        <translation  >烏干達</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
-        <translation  >烏克蘭</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
-        <translation  >烏拉圭</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
-        <translation  >烏茲別克斯坦</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
-        <translation  >萬那杜</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
-        <translation  >委內瑞拉</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Viet Nam</source>
-        <translation  >越南</translation>
+        <source>Vietnam</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
-        <translation  >維京群島</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
-        <translation  >西撒阿拉</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
-        <translation  >葉門</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
-        <translation  >南斯拉夫</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
-        <translation  >尚比亞</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
-        <translation  >辛巴威</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation  >生日</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Anniversary</source>
-        <translation  >週年紀念日</translation>
-    </message>
-    <message>
-        <source>Kuwait</source>
-        <translation  >科威特</translation>
-    </message>
-    <message>
-        <source>Kyrgystan</source>
-        <translation  >Kyrgystan</translation>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown</source>
-        <translation  >未知</translation>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation  >刪除</translation>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Business Phone</source>
-        <translation  >公司電話號碼</translation>
+        <source>Male</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Fax</source>
-        <translation  >公司傳真號碼</translation>
+        <source>Female</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Mobile</source>
-        <translation  >公司手機號碼</translation>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default Email</source>
-        <translation  >預設電郵地址</translation>
+        <source>Enter Note</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Emails</source>
-        <translation  >電子郵件</translation>
+        <source>Edit Name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home Phone</source>
-        <translation  >住家電話號碼</translation>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home Fax</source>
-        <translation  >住家傳真號碼</translation>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Home Mobile</source>
-        <translation  >私人手機號碼</translation>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Office</source>
-        <translation  >公司</translation>
+        <source>Contacts</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Profession</source>
-        <translation  >職業</translation>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Assistant</source>
-        <translation  >助理</translation>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manager</source>
-        <translation  >經理</translation>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Spouse</source>
-        <translation  >配偶</translation>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gender</source>
-        <translation  >性別</translation>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Birthday</source>
-        <translation  >生日</translation>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Anniversary</source>
-        <translation  >週年紀念日</translation>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nickname</source>
-        <translation  >綽號</translation>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Children</source>
-        <translation  >子女</translation>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name Title</source>
-        <translation  >名稱</translation>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>First Name</source>
-        <translation  >名</translation>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Middle Name</source>
-        <translation  >中名</translation>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Name</source>
-        <translation  >姓</translation>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suffix</source>
-        <translation  >Suffix</translation>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File As</source>
-        <translation  >歸檔為</translation>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Job Title</source>
-        <translation  >職稱</translation>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Department</source>
-        <translation  >部門</translation>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Company</source>
-        <translation  >公司</translation>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation  >公司所在街道名稱</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation  >公司所在城市名稱</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation  >公司所在州名</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation  >公司郵遞區號</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation  >公司所在國家名稱</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation  >公司呼叫器號碼</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation  >公司網頁</translation>
+        <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  >住家所在街道名稱</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation  >住家所在城市名稱</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation  >住家所在州名</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation  >住家郵遞區號</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation  >住家所在國家名稱</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation  >個人網頁</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation  >備註</translation>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Groups</source>
-        <translation  >群組</translation>
+        <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>
 </context>
 </TS>
diff --git a/i18n/zh_TW/advancedfm.ts b/i18n/zh_TW/advancedfm.ts
index 63f6d5d..eeb902e 100644
--- a/i18n/zh_TW/advancedfm.ts
+++ b/i18n/zh_TW/advancedfm.ts
@@ -25,52 +25,48 @@
         <source>Rename</source>
         <translation>重新命名</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>執行指令</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>執行指令並輸出</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>切換至本地端</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>切換至遠端</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation>關於</translation>
-    </message>
-    <message>
         <source>Size</source>
         <translation>大小</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
@@ -152,109 +148,131 @@
     <message>
         <source> As</source>
         <translation> 為</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>複製相同的目錄</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>無法複製</translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>至</translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>無法移動</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>進階型檔案管理程式
- 版權 2002 
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-,授權為 GPL</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>新增至文件</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>動作</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>選擇全部</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>確定要刪除
 %1 個檔案?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>刪除目錄?</translation>
     </message>
     <message>
         <source>Really delete
 </source>
         <translation>確定刪除</translation>
     </message>
     <message>
-        <source>Delete Directory</source>
-        <translation>刪除目錄</translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation>確定要複製
 %1 個檔案?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>檔案已存在!</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation> 已存在. 要覆蓋嗎?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation> 已經存在.
 您確定要刪除它?</translation>
     </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished">進階型檔案管理程式
+ 版權 2002-2003 
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+,授權為 GPL</translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 exists. Ok to overwrite?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not copy %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>將輸出存為檔案(只有名稱)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>輸出</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>
diff --git a/i18n/zh_TW/appearance.ts b/i18n/zh_TW/appearance.ts
index c9a7e3c..74770fa 100644
--- a/i18n/zh_TW/appearance.ts
+++ b/i18n/zh_TW/appearance.ts
@@ -41,52 +41,48 @@
         <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>Appearance</source>
-        <translation>外觀</translation>
-    </message>
-    <message>
         <source>Style</source>
         <translation>樣式</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>字型</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>顏色</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>視窗</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>進階</translation>
     </message>
     <message>
         <source>Restart</source>
         <translation>重新啟動</translation>
     </message>
     <message>
@@ -206,48 +202,56 @@ This area allows you to select an application and which settings you wish to dis
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>按這裡以選擇想要的索引標籤對話盒(本應用程式屬之)樣式. 可用的樣式有:
 
 1. 索引標籤 - 普通, 只有文字標籤的索引標籤
 2. 有圖示的索引標籤 - 每個索引標籤都有圖示, 文字標籤只出現在目前的索引標籤
 3. 直式索引標籤 - 垂直排列的索引標籤
 4. 有圖示的直式索引標籤 - 垂直排列且有圖示的索引標籤</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>按這裡讓索引標籤出現在視窗的頂端.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>按這裡讓索引標籤出現在視窗的底部.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>這是一個預覽視窗. 在這裡可以看到在改變選項之後的新外觀.</translation>
     </message>
+    <message>
+        <source>Rotation direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Appearance Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>編輯主題</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>按這裡來選擇顏色: </translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>範例</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>一般項目</translation>
     </message>
     <message>
         <source>Disabled Item</source>
diff --git a/i18n/zh_TW/aqpkg.ts b/i18n/zh_TW/aqpkg.ts
index 9614487..cd7b997 100644
--- a/i18n/zh_TW/aqpkg.ts
+++ b/i18n/zh_TW/aqpkg.ts
@@ -1,124 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
+        <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start</source>
+        <source>Remove
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Install
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
+        <source>Output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</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>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
+        <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
@@ -207,98 +256,74 @@
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed To - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description - %1</source>
         <translation type="unfinished"></translation>
@@ -398,109 +423,109 @@ Are you sure?
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>U</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URL:</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link To Root</source>
+        <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
+        <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
+        <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
+        <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/backup.ts b/i18n/zh_TW/backup.ts
index 5c899ac..fb0d45a 100644
--- a/i18n/zh_TW/backup.ts
+++ b/i18n/zh_TW/backup.ts
@@ -1,52 +1,52 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation >備份與還原...執行中...</translation>
+        <translation>備份與還原...執行中...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
-        <translation >備份與還原</translation>
+        <translation>備份與還原</translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
-        <translation >備份與還原</translation>
+        <translation>備份與還原</translation>
     </message>
     <message>
         <source>Backup</source>
-        <translation >備份</translation>
+        <translation>備份</translation>
     </message>
     <message>
         <source>Applications</source>
-        <translation >應用程式</translation>
+        <translation>應用程式</translation>
     </message>
     <message>
         <source>Save To</source>
-        <translation >儲存至</translation>
+        <translation>儲存至</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
-        <translation >&amp; 備份</translation>
+        <translation>&amp; 備份</translation>
     </message>
     <message>
         <source>Restore</source>
-        <translation >還原</translation>
+        <translation>還原</translation>
     </message>
     <message>
         <source>Select Source</source>
-        <translation >選擇來源</translation>
+        <translation>選擇來源</translation>
     </message>
     <message>
         <source>Column 1</source>
-        <translation >第一行</translation>
+        <translation>第一行</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
-        <translation >&amp;還原</translation>
+        <translation>&amp;還原</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/buzzword.ts b/i18n/zh_TW/buzzword.ts
index 4d1bc18..a71309b 100644
--- a/i18n/zh_TW/buzzword.ts
+++ b/i18n/zh_TW/buzzword.ts
@@ -1,21 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
-        <translation >buZzword</translation>
+        <translation>buZzword</translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation>&amp;新遊戲</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>遊戲</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>
+        <translation>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/citytime.ts b/i18n/zh_TW/citytime.ts
index a15a229..cbf5722 100644
--- a/i18n/zh_TW/citytime.ts
+++ b/i18n/zh_TW/citytime.ts
@@ -1,67 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
-        <translation >改變時間中</translation>
+        <translation>改變時間中</translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
-        <translation >無法設定時區</translation>
+        <translation>無法設定時區</translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
-        <translation >還原時區</translation>
+        <translation>還原時區</translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
-        <translation >無法設定時區. 您的時間可能有誤.</translation>
+        <translation>無法設定時區. 您的時間可能有誤.</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
-        <translation >城市之時間</translation>
+        <translation>城市之時間</translation>
     </message>
     <message>
         <source>Click on one of the set cities to replace it</source>
-        <translation >點選已設定的城市來取代</translation>
+        <translation>點選已設定的城市來取代</translation>
     </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
-        <translation >城市</translation>
+        <translation>城市</translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
-        <translation >無法找到時區的資訊</translation>
+        <translation>無法找到時區的資訊</translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
-        <translation >&lt;p&gt; 在%1中無法找到時區的資訊</translation>
+        <translation>&lt;p&gt; 在%1中無法找到時區的資訊</translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
-        <translation >無法找到地圖</translation>
+        <translation>無法找到地圖</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
-        <translation >無法讀取地圖,退出中</translation>
+        <translation>無法讀取地圖,退出中</translation>
     </message>
     <message>
         <source>Continent</source>
-        <translation >洲</translation>
+        <translation>洲</translation>
     </message>
     <message>
         <source>Select a continent/country here, then select a city</source>
-        <translation >在此選取洲/國家,然後選取城市</translation>
+        <translation>在此選取洲/國家,然後選取城市</translation>
     </message>
     <message>
         <source>City</source>
-        <translation >城市</translation>
+        <translation>城市</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/datebook.ts b/i18n/zh_TW/datebook.ts
index d54bec0..2fc3843 100644
--- a/i18n/zh_TW/datebook.ts
+++ b/i18n/zh_TW/datebook.ts
@@ -21,56 +21,48 @@
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
@@ -81,48 +73,52 @@ Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -253,60 +249,107 @@ Quit anyway?</source>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>week</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>W: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
diff --git a/i18n/zh_TW/drawpad.ts b/i18n/zh_TW/drawpad.ts
index d8b80c5..0e3ea96 100644
--- a/i18n/zh_TW/drawpad.ts
+++ b/i18n/zh_TW/drawpad.ts
@@ -85,102 +85,170 @@
         <source>Draw Filled Ellipse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DrawPad</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</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>Do you want to delete
 the current page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to undo the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to re-perform the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the first page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the previous page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the next page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the last page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw lines.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw rectangles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw ellipses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the text drawing tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the fill tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the eraser tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the width of the drawing pen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when drawing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when filling in areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DrawPad - Page %1/%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -271,77 +339,97 @@ all the pages?</source>
     <message>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Title:</source>
+        <source>Title: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
+        <source>Dimension: %1x%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
+        <source>Date: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</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 Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet up one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet down one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/helpbrowser.ts b/i18n/zh_TW/helpbrowser.ts
index d3f398f..1ccb583 100644
--- a/i18n/zh_TW/helpbrowser.ts
+++ b/i18n/zh_TW/helpbrowser.ts
@@ -1,37 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
-        <translation >往回</translation>
+        <translation>往回</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation >往前</translation>
+        <translation>往前</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation >家目錄</translation>
+        <translation>家目錄</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
-        <translation >新增書簽</translation>
+        <translation>新增書簽</translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
-        <translation >從書簽中移除</translation>
+        <translation>從書簽中移除</translation>
     </message>
     <message>
         <source>Bookmarks</source>
-        <translation >書簽</translation>
+        <translation>書簽</translation>
     </message>
     <message>
         <source>Help Browser</source>
-        <translation >幫助瀏覽器</translation>
+        <translation>幫助瀏覽器</translation>
     </message>
     <message>
         <source>HelpBrowser</source>
-        <translation >幫助瀏覽器</translation>
+        <translation>幫助瀏覽器</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/kbill.ts b/i18n/zh_TW/kbill.ts
index f52df73..f06547d 100644
--- a/i18n/zh_TW/kbill.ts
+++ b/i18n/zh_TW/kbill.ts
@@ -1,71 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>HelpDialog</name>
-    <message>
-        <source>Form1</source>
-        <translation>表單1</translation>
-    </message>
-</context>
-<context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation>K比爾</translation>
     </message>
     <message>
         <source>New game</source>
         <translation>新遊戲</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>暫停遊戲</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>K比爾的故事</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>規則</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>檔案(&amp;F)</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>說明(&amp;H)</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>暫停遊戲</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
         <translation>&lt;b&gt;故事&lt;/b&gt;這個世界的命運又再度掌握在你的手裡! 有一個邪惡的電腦駭客, 只知道他的代號是 &apos;Bill&apos;, 已經製造了一種終極的電腦病毒. 這個病毒的威力十分強大, 甚至可以把一般的電腦變成一臺烤麵包機. (噢!) &apos;Bill&apos; 已經把自己複製成多得數不清的微型比爾. 他們唯一的目的就是要散佈這個凶惡的病毒, 而它已經被巧妙地偽裝成一個非常熱門的作業系統. 身為系統管理者與病毒剋星, 你的工作是阻止比爾完成他的野心.</translation>
     </message>
     <message>
         <source>The story of KBill</source>
         <translation>K比爾的故事</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>K比爾的規則</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
-        <translation>&lt;b&gt;規則&lt;/b&lgt;K比爾經過辛勤的設計與研究使它變得很容易而適合全家人, 正如適合小 Sally 一樣. 日復一日的 beta 測試加上向廉價人工智慧設計師諮詢終於產生容易使用的遊戲, 不過一點也不像麥金塔.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;敲打比爾(點一下)&lt;/LI&gt;&lt;LI&gt;重新啟動電腦(點一下)&lt;/LI&gt;&lt;LI&gt;撿起被偷的作業系統 &amp; 把它們交還(拖放)給各自的電腦&lt;/LI&gt;&lt;LI&gt;拖拉水桶去澆熄火花&lt;/LI&gt;&lt;LI&gt;分數是以花費的時間計算, 殺掉比爾還有紅利.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;至於剩下的部份, 您應該可以靠自己解決. 我們做到了, 所以它應該不會太難.</translation>
+        <translation>&lt;b&gt;規則&lt;/bK比爾經過辛勤的設計與研究使它變得很容易而適合全家人, 正如適合小 Sally 一樣. 日復一日的 beta 測試加上向廉價人工智慧設計師諮詢終於產生容易使用的遊戲, 不過一點也不像麥金塔.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;敲打比爾(點一下)&lt;/LI&gt;&lt;LI&gt;重新啟動電腦(點一下)&lt;/LI&gt;&lt;LI&gt;撿起被偷的作業系統 &amp; 把它們交還(拖放)給各自的電腦&lt;/LI&gt;&lt;LI&gt;拖拉水桶去澆熄火花&lt;/LI&gt;&lt;LI&gt;分數是以花費的時間計算, 殺掉比爾還有紅利.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;至於剩下的部份, 您應該可以靠自己解決. 我們做到了, 所以它應該不會太難.</translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>經過關卡</translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>您的分數</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libbatteryapplet.ts b/i18n/zh_TW/libbatteryapplet.ts
index b13a11a..cbc1577 100644
--- a/i18n/zh_TW/libbatteryapplet.ts
+++ b/i18n/zh_TW/libbatteryapplet.ts
@@ -1,32 +1,28 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery Status</source>
-        <translation>電池狀態</translation>
-    </message>
-    <message>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>充電中</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation>Percentage battery remaining</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>電池狀態:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>良好</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
@@ -36,26 +32,54 @@
     <message>
         <source>Critical</source>
         <translation>臨界的</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>使用備份電源</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>使用電源線</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>外部電源切斷</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation>Battery time remaining</translation>
     </message>
+    <message>
+        <source>Battery status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>could not open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charging both devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Percentage battery remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery time remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No jacket with battery inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libcardmonapplet.ts b/i18n/zh_TW/libcardmonapplet.ts
index 0b5ef8d..28c4368 100644
--- a/i18n/zh_TW/libcardmonapplet.ts
+++ b/i18n/zh_TW/libcardmonapplet.ts
@@ -1,33 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation>CF/PCMCIA 移除失敗!</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>SD/MMC 移除失敗!</translation>
     </message>
     <message>
         <source>New card: </source>
-        <translation >新卡片:</translation>
+        <translation>新卡片:</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>移除:</translation>
     </message>
     <message>
         <source>Eject SD/MMC card</source>
         <translation>移除 SD/MMC card</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>移除 card 0: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>移除 card 1: %1</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libhomeapplet.ts b/i18n/zh_TW/libhomeapplet.ts
index 1242dba..42a0349 100644
--- a/i18n/zh_TW/libhomeapplet.ts
+++ b/i18n/zh_TW/libhomeapplet.ts
@@ -1,13 +1,13 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
-        <translation >快速進入家目錄</translation>
+        <translation>快速進入家目錄</translation>
     </message>
     <message>
-        <source>Home</source>
-        <translation>進入家目錄</translation>
+        <source>Desktop</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libirdaapplet.ts b/i18n/zh_TW/libirdaapplet.ts
index 410b079..89101a7 100644
--- a/i18n/zh_TW/libirdaapplet.ts
+++ b/i18n/zh_TW/libirdaapplet.ts
@@ -1,41 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IrdaApplet</name>
     <message>
         <source>Discovered Device:</source>
-        <translation >找到的設備</translation>
+        <translation>找到的設備</translation>
     </message>
     <message>
         <source>Disable IrDA</source>
-        <translation >關閉紅外線</translation>
+        <translation>關閉紅外線</translation>
     </message>
     <message>
         <source>Enable IrDA</source>
-        <translation >啟動紅外線</translation>
+        <translation>啟動紅外線</translation>
     </message>
     <message>
         <source>Disable Discovery</source>
-        <translation >關閉搜尋功能</translation>
+        <translation>關閉搜尋功能</translation>
     </message>
     <message>
         <source>Enable Discovery</source>
-        <translation >啟動搜尋功能</translation>
+        <translation>啟動搜尋功能</translation>
     </message>
     <message>
         <source>Disable Receive</source>
-        <translation >關閉接收功能</translation>
+        <translation>關閉接收功能</translation>
     </message>
     <message>
         <source>Enable Receive</source>
-        <translation >啟動接收功能</translation>
+        <translation>啟動接收功能</translation>
     </message>
     <message>
         <source>Found:</source>
-        <translation >找到:</translation>
+        <translation>找到:</translation>
     </message>
     <message>
         <source>Lost:</source>
-        <translation >斷線:</translation>
+        <translation>斷線:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libopie.ts b/i18n/zh_TW/libopie.ts
index 7cf93a1..5651af8 100644
--- a/i18n/zh_TW/libopie.ts
+++ b/i18n/zh_TW/libopie.ts
@@ -72,41 +72,37 @@
     <message>
         <source>Sun</source>
         <translation>星期日</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>每</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
-        <source>TimePicker</source>
-        <translation>TimePicker</translation>
-    </message>
-    <message>
         <source>Time:</source>
         <translation>Time:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Pick Time:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqdvorak.ts b/i18n/zh_TW/libqdvorak.ts
index 421dd31..83ab234 100644
--- a/i18n/zh_TW/libqdvorak.ts
+++ b/i18n/zh_TW/libqdvorak.ts
@@ -1,9 +1,9 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Dvorak</source>
-        <translation >Dvorak</translation>
+        <translation>Dvorak</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqhandwriting.ts b/i18n/zh_TW/libqhandwriting.ts
index 7fc15da..f5c5664 100644
--- a/i18n/zh_TW/libqhandwriting.ts
+++ b/i18n/zh_TW/libqhandwriting.ts
@@ -79,52 +79,48 @@
         <translation>取消</translation>
     </message>
 </context>
 <context>
     <name>QIMPenInput</name>
     <message>
         <source>Shortcut</source>
         <translation>簡寫</translation>
     </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation>輸入新字元</translation>
     </message>
     <message>
         <source>Character:</source>
         <translation>字元:</translation>
     </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
-        <source>Form1</source>
-        <translation>表單1</translation>
-    </message>
-    <message>
         <source>Multi-stroke character timeout:</source>
         <translation>多筆劃字元逾時時間:</translation>
     </message>
     <message>
         <source>ms</source>
         <translation>毫秒</translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation>已顯示輸入區</translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation>大小寫區</translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation>小寫(切換則為大寫)</translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
diff --git a/i18n/zh_TW/libqpe.ts b/i18n/zh_TW/libqpe.ts
index eb657d8..a1cc69d 100644
--- a/i18n/zh_TW/libqpe.ts
+++ b/i18n/zh_TW/libqpe.ts
@@ -328,52 +328,48 @@ editing categories.</source>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>製作這個文件的副本.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>將這個文件傳輸到另一個裝置.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>使用自訂旋轉</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>擁有者資訊</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation>表單1</translation>
-    </message>
-    <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/libqpickboard.ts b/i18n/zh_TW/libqpickboard.ts
index 468515a..7eef6c6 100644
--- a/i18n/zh_TW/libqpickboard.ts
+++ b/i18n/zh_TW/libqpickboard.ts
@@ -1,9 +1,9 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
-        <translation >Pickboard</translation>
+        <translation>Pickboard</translation>
     </message>
 </context>
 </TS>