hope this works this time

198 files changed, 3108 insertions, 170 deletions

diff --git a/i18n/en/advancedfm.ts b/i18n/en/advancedfm.ts
index 5f33236..ce9fab3 100644
--- a/i18n/en/advancedfm.ts
+++ b/i18n/en/advancedfm.ts
@@ -158,48 +158,70 @@
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
diff --git a/i18n/en/appearance.ts b/i18n/en/appearance.ts
index ba6187f..7c20f02 100644
--- a/i18n/en/appearance.ts
+++ b/i18n/en/appearance.ts
@@ -63,47 +63,83 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable advanced options in Opie apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/embeddedkonsole.ts b/i18n/en/embeddedkonsole.ts
index 2814537..5251b68 100644
--- a/i18n/en/embeddedkonsole.ts
+++ b/i18n/en/embeddedkonsole.ts
@@ -165,44 +165,48 @@
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Command List</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libdialup.ts b/i18n/en/libdialup.ts
index ef40095..dbb9bc9 100644
--- a/i18n/en/libdialup.ts
+++ b/i18n/en/libdialup.ts
@@ -120,48 +120,64 @@
     <message>
         <source>Auto-detect name servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-detect routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PCMCIA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PppMon</name>
     <message>
         <source>Waiting for activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authenticating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/en/libopie.ts b/i18n/en/libopie.ts
index 1c090f0..6736fd3 100644
--- a/i18n/en/libopie.ts
+++ b/i18n/en/libopie.ts
@@ -123,48 +123,67 @@
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>OTimePickerDialogBase</name>
+    <message>
+        <source>TimePicker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pick Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/en/libvmemoapplet.ts b/i18n/en/libvmemoapplet.ts
index 4eb9e18..8371675 100644
--- a/i18n/en/libvmemoapplet.ts
+++ b/i18n/en/libvmemoapplet.ts
@@ -1,2 +1,13 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>VMemo</name>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/light-and-power.ts b/i18n/en/light-and-power.ts
index 28e50a1..5a89b8d 100644
--- a/i18n/en/light-and-power.ts
+++ b/i18n/en/light-and-power.ts
@@ -1,53 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Light and Power Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/mail.ts b/i18n/en/mail.ts
index 0ecaf66..8fdd872 100644
--- a/i18n/en/mail.ts
+++ b/i18n/en/mail.ts
@@ -213,49 +213,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/en/oipkg.ts b/i18n/en/oipkg.ts
index af93ff8..08b3415 100644
--- a/i18n/en/oipkg.ts
+++ b/i18n/en/oipkg.ts
@@ -8,48 +8,52 @@
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>feeds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/en/opieftp.ts b/i18n/en/opieftp.ts
index fc8e689..4d84121 100644
--- a/i18n/en/opieftp.ts
+++ b/i18n/en/opieftp.ts
@@ -206,26 +206,34 @@ It must be empty</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry name already taken</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/remote.ts b/i18n/en/remote.ts
index a950e82..0314a85 100644
--- a/i18n/en/remote.ts
+++ b/i18n/en/remote.ts
@@ -1,17 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainView</name>
     <message>
         <source>Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Learn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/security.ts b/i18n/en/security.ts
index 9d17e6f..b9ec769 100644
--- a/i18n/en/security.ts
+++ b/i18n/en/security.ts
@@ -9,48 +9,56 @@
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/en/showimg.ts b/i18n/en/showimg.ts
index 1065cd8..17b9a4c 100644
--- a/i18n/en/showimg.ts
+++ b/i18n/en/showimg.ts
@@ -1,77 +1,155 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ControlsDialog</name>
+    <message>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageFileSelector</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading image...</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Could not load image</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image Info ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate 270</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Brightness ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Black And White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale to Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 alpha levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8-bit alpha channel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/textedit.ts b/i18n/en/textedit.ts
index 22dfefb..f835083 100644
--- a/i18n/en/textedit.ts
+++ b/i18n/en/textedit.ts
@@ -148,48 +148,56 @@ This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected
  you selected a .desktop file.
 Open .desktop file or linked file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Insert Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/en/today.ts b/i18n/en/today.ts
index 1f54aff..748913e 100644
--- a/i18n/en/today.ts
+++ b/i18n/en/today.ts
@@ -14,48 +14,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
diff --git a/i18n/es/advancedfm.ts b/i18n/es/advancedfm.ts
index 2c7156e..23042dd 100644
--- a/i18n/es/advancedfm.ts
+++ b/i18n/es/advancedfm.ts
@@ -160,48 +160,70 @@
         <translation>Propiedades</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Emitir fichero</translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation>ya existe
 ¿seguro que quiere borrarlo?</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Como</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copiar misma carpeta</translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Salvar salida en fichero(sólo nombre)</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fijar Permisos Fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos para el fichero:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propietario</translation>
     </message>
     <message>
         <source>group</source>
diff --git a/i18n/es/appearance.ts b/i18n/es/appearance.ts
index 6f2cb6a..6635246 100644
--- a/i18n/es/appearance.ts
+++ b/i18n/es/appearance.ts
@@ -64,47 +64,83 @@
         <translation>Seleccionar</translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation>Habilitar imagen de fondo</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Por omisión</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>El Rápido Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation>Aplicar</translation>
+        <translation type="obsolete">Aplicar</translation>
     </message>
     <message>
         <source>Restart</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation>¿Quiere reiniciar Opie ahora?</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>Configurar...</translation>
     </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable advanced options in Opie apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editar esquema</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/embeddedkonsole.ts b/i18n/es/embeddedkonsole.ts
index e848945..1b64060 100644
--- a/i18n/es/embeddedkonsole.ts
+++ b/i18n/es/embeddedkonsole.ts
@@ -165,44 +165,48 @@
     <message>
         <source>Left</source>
         <translation>Izquierda</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Derecha</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barra desp</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Mostar lista comandos</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Ocultar lista comandos</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
+    <message>
+        <source>Command List</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selección de comandos</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Añadir comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Comando a añadir:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libdialup.ts b/i18n/es/libdialup.ts
index 1353ea3..421574d 100644
--- a/i18n/es/libdialup.ts
+++ b/i18n/es/libdialup.ts
@@ -120,48 +120,64 @@
     <message>
         <source>Auto-detect name servers</source>
         <translation>Autodetectar nombre servidores</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Pasarela</translation>
     </message>
     <message>
         <source>Auto-detect routing</source>
         <translation>Autodetectar encaminamineto</translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation>Primer DNS</translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation>Segundo DNS</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Proxies</translation>
     </message>
+    <message>
+        <source>Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PCMCIA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PppMon</name>
     <message>
         <source>Waiting for activity</source>
         <translation>Esperando actividad</translation>
     </message>
     <message>
         <source>Initializing modem</source>
         <translation>Inicializando módem</translation>
     </message>
     <message>
         <source>Connecting</source>
         <translation>Conectando</translation>
     </message>
     <message>
         <source>Authenticating</source>
         <translation>Autentificando</translation>
     </message>
     <message>
         <source>No dialtone</source>
         <translation>Sin tono marcado</translation>
     </message>
     <message>
diff --git a/i18n/es/libopie.ts b/i18n/es/libopie.ts
index 0cb463e..e9df759 100644
--- a/i18n/es/libopie.ts
+++ b/i18n/es/libopie.ts
@@ -124,48 +124,67 @@
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Mediano</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeño</translation>
     </message>
 </context>
 <context>
+    <name>OTimePickerDialogBase</name>
+    <message>
+        <source>TimePicker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pick Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
         <translation>Sumario:</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descripción:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridad:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progreso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Fecha tope:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
diff --git a/i18n/es/libvmemoapplet.ts b/i18n/es/libvmemoapplet.ts
index 4eb9e18..8371675 100644
--- a/i18n/es/libvmemoapplet.ts
+++ b/i18n/es/libvmemoapplet.ts
@@ -1,2 +1,13 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>VMemo</name>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/light-and-power.ts b/i18n/es/light-and-power.ts
index 4bb6754..616cc4c 100644
--- a/i18n/es/light-and-power.ts
+++ b/i18n/es/light-and-power.ts
@@ -1,53 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light Settings</source>
-        <translation>Configurar Iluminación</translation>
+        <translation type="obsolete">Configurar Iluminación</translation>
     </message>
     <message>
         <source>Adjust to environment</source>
         <translation>Ajustar a entorno</translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>Un sensor de luz ambiental ajusta automáticamente la iluminación de la pantalla. La configuración del brillo aún afecta el brillo medio.</translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation>Ahorro de energía</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation> segundos</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Bajar luz tras</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Suspender tras</translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation>Sólo desactivar la pantalla al suspender</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Sin luz tras</translation>
     </message>
     <message>
         <source>Bright</source>
         <translation>Brillante</translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation>&lt;blockquote&gt;Cuanto mas brillante es la luz de la pantalla, más batería se consume.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Apagada</translation>
     </message>
+    <message>
+        <source>Light and Power Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/mail.ts b/i18n/es/mail.ts
index 01e96e3..d1c5a34 100644
--- a/i18n/es/mail.ts
+++ b/i18n/es/mail.ts
@@ -213,49 +213,49 @@
         <translation>Componer mensaje</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation>Enviar correo</translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation>Correo en cola</translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation>Adjuntar un fichero</translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation>Libreta direcciones</translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation>Cancelar envío</translation>
+        <translation type="obsolete">Cancelar envío</translation>
     </message>
     <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Responder</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Para</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation>Asto.</translation>
diff --git a/i18n/es/oipkg.ts b/i18n/es/oipkg.ts
index 556472b..033fde8 100644
--- a/i18n/es/oipkg.ts
+++ b/i18n/es/oipkg.ts
@@ -8,48 +8,52 @@
     <message>
         <source>Ipkg options</source>
         <translation>Opciones ipkg</translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation>-force-depends</translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation>-force-reinstall</translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation>-force-removal-of-essential-packages</translation>
     </message>
     <message>
         <source>To remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>To install</source>
         <translation>Instalar</translation>
     </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Package Manager</source>
         <translation>Gestor de Paquetes</translation>
     </message>
     <message>
         <source>feeds</source>
         <translation>fuentes</translation>
     </message>
     <message>
         <source>Package</source>
         <translation>Paquetes</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurar</translation>
     </message>
     <message>
diff --git a/i18n/es/opieftp.ts b/i18n/es/opieftp.ts
index 8d18718..3074c00 100644
--- a/i18n/es/opieftp.ts
+++ b/i18n/es/opieftp.ts
@@ -218,26 +218,34 @@ Debaría estar vacío</translation>
 </source>
         <translation>Incapaz de borrar dir
 </translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>Incapaz de borrar fichero
 </translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>Incapaz de renombrar fichero
 </translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>No puedo renombrar</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ese directorio no existe</translation>
     </message>
+    <message>
+        <source>New Server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry name already taken</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/remote.ts b/i18n/es/remote.ts
index 8e4f9e6..d3de93d 100644
--- a/i18n/es/remote.ts
+++ b/i18n/es/remote.ts
@@ -1,17 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainView</name>
     <message>
         <source>Remote</source>
         <translation>Remoto</translation>
     </message>
     <message>
         <source>Learn</source>
         <translation>Aprender</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configurar</translation>
     </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/security.ts b/i18n/es/security.ts
index 9a896c1..f53ee47 100644
--- a/i18n/es/security.ts
+++ b/i18n/es/security.ts
@@ -10,48 +10,56 @@
         <translation>Cambiar código</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Introducir código</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Código Incorrecto</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>El código introducido es incorrecto.
 Acceso denegado</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Configuración de Seguridad</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambiar código</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Borrar código</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Solicitar código al encender</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sincronizar</translation>
     </message>
     <message>
diff --git a/i18n/es/showimg.ts b/i18n/es/showimg.ts
index 5a5b076..919509c 100644
--- a/i18n/es/showimg.ts
+++ b/i18n/es/showimg.ts
@@ -1,77 +1,155 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ControlsDialog</name>
+    <message>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageFileSelector</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Visor de Imágenes</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Espejo horizontal</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Espejo vertical</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Rotar 180º</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Rotar 90º</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation> - Visor de imágenes</translation>
     </message>
     <message>
         <source>Loading image...</source>
-        <translation>Cargando imangen...</translation>
+        <translation type="obsolete">Cargando imangen...</translation>
     </message>
     <message>
         <source>Could not load image</source>
-        <translation>No puedo cargar imangen</translation>
+        <translation type="obsolete">No puedo cargar imangen</translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
-        <translation>Sin imagen - selecione Abrir del menú Fichero.</translation>
+        <translation type="obsolete">Sin imagen - selecione Abrir del menú Fichero.</translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
-        <translation>, %1/%2 colores</translation>
+        <translation type="obsolete">, %1/%2 colores</translation>
     </message>
     <message>
         <source>, %1 colors</source>
-        <translation>, %1 colores</translation>
+        <translation type="obsolete">, %1 colores</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>Color verdadero</translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
-        <translation>, %1 niveles alpha</translation>
+        <translation type="obsolete">, %1 niveles alpha</translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
-        <translation>, canal alpha de 8-bit</translation>
+        <translation type="obsolete">, canal alpha de 8-bit</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Editar</translation>
+        <translation type="obsolete">Editar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image Info ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate 270</source>
+        <translation type="unfinished">Rotar 270º</translation>
+    </message>
+    <message>
+        <source>Brightness ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Black And White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale to Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 alpha levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8-bit alpha channel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/textedit.ts b/i18n/es/textedit.ts
index 14374f5..22da712 100644
--- a/i18n/es/textedit.ts
+++ b/i18n/es/textedit.ts
@@ -152,48 +152,56 @@ que ha seleccionado un .desktop
         <source>Do you really want
 to delete the current file
 from the disk?
 This is irreversable!!</source>
         <translation>¿Seguro que quiere borrar
 el fichero actual del disco?
 ¡Esto es irreversible!</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
+    <message>
+        <source>Insert Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>filePermissions</source>
         <translation>Permisos fichero</translation>
     </message>
     <message>
         <source>Set File Permissions</source>
         <translation>Fijar permisos fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos fichero para:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
diff --git a/i18n/es/today.ts b/i18n/es/today.ts
index 9298c9d..687c2e7 100644
--- a/i18n/es/today.ts
+++ b/i18n/es/today.ts
@@ -14,48 +14,52 @@
         <translation>Por favor, rellene su información personal</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>No hay citas para hoy</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; correos nuevos, &lt;b&gt;%2&lt;/b&gt; salientes</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Hay &lt;b&gt; 1&lt;/b&gt; tarea pendiente: &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Hay &lt;b&gt; %1 &lt;/b&gt; tareas pendientes: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>No hay tareas pendientes</translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Opiemail not installed</source>
         <translation>Opiemail no está instalado</translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation>Configuración de Hoy</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
diff --git a/i18n/fr/advancedfm.ts b/i18n/fr/advancedfm.ts
index 2a1ee6a..de5070b 100644
--- a/i18n/fr/advancedfm.ts
+++ b/i18n/fr/advancedfm.ts
@@ -160,48 +160,70 @@
         <translation>Propriétés</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>A traduire</translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation>existe déjà
 Souhaitez-vous vraiment l&apos;effacer ?</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Copier</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Sous</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copier le même répertoire</translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Sauvegarder la sortie dans un fichier</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Définir les droits</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Définir les droits pour :</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propriétaire</translation>
     </message>
     <message>
         <source>group</source>
diff --git a/i18n/fr/appearance.ts b/i18n/fr/appearance.ts
index 4c89218..2c337fa 100644
--- a/i18n/fr/appearance.ts
+++ b/i18n/fr/appearance.ts
@@ -89,62 +89,98 @@
         <translation>Sélectionner</translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation>Activer l&apos;image de fond</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Réglage par défaut</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Voix ambiguë d&apos;un coeur qui au zéphyr préfère les jattes de kiwis</translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation>Appliquer</translation>
+        <translation type="obsolete">Appliquer</translation>
     </message>
     <message>
         <source>Restart</source>
         <translation>Redémarer</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation>Souhaitez-vous redémarrer Opie maintenant ?</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>Préférences...</translation>
     </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable advanced options in Opie apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editer le thème</translation>
     </message>
     <message>
         <source>More</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete"></translation>
     </message>
 </context>
 <context>
     <name>QColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Sat:</source>
diff --git a/i18n/fr/datebook.ts b/i18n/fr/datebook.ts
index bbc96d3..fa9ee28 100644
--- a/i18n/fr/datebook.ts
+++ b/i18n/fr/datebook.ts
@@ -725,44 +725,44 @@ et</translation>
         <translation>Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Jeu</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sam</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dim</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>years</source>
         <translation>années</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/embeddedkonsole.ts b/i18n/fr/embeddedkonsole.ts
index 30e12d0..73c8ab8 100644
--- a/i18n/fr/embeddedkonsole.ts
+++ b/i18n/fr/embeddedkonsole.ts
@@ -166,44 +166,48 @@
     <message>
         <source>Left</source>
         <translation>Gauche</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Droite</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barre de défilement</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Afficher la liste des commandes</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Cacher la liste des commandes</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personaliser</translation>
     </message>
+    <message>
+        <source>Command List</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Sélection de la commande</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Ajouter une commande</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Entrer la commande à ajouter :</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libdialup.ts b/i18n/fr/libdialup.ts
index bdf6391..dc17c54 100644
--- a/i18n/fr/libdialup.ts
+++ b/i18n/fr/libdialup.ts
@@ -121,48 +121,64 @@
     <message>
         <source>Auto-detect name servers</source>
         <translation>Détection automatique des serveurs de nom</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Passerelle</translation>
     </message>
     <message>
         <source>Auto-detect routing</source>
         <translation>Détection automatique du routage</translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation>Premier DNS</translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation>Second DNS</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Serveurs relais (Proxies)</translation>
     </message>
+    <message>
+        <source>Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PCMCIA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PppMon</name>
     <message>
         <source>Waiting for activity</source>
         <translation>En attente de réponse</translation>
     </message>
     <message>
         <source>Initializing modem</source>
         <translation>Initialisation du modem</translation>
     </message>
     <message>
         <source>Connecting</source>
         <translation>Connection</translation>
     </message>
     <message>
         <source>Authenticating</source>
         <translation>Authentification</translation>
     </message>
     <message>
         <source>No dialtone</source>
         <translation>Pas de tonalité</translation>
     </message>
     <message>
diff --git a/i18n/fr/libopie.ts b/i18n/fr/libopie.ts
index e3637e8..bc1c68d 100644
--- a/i18n/fr/libopie.ts
+++ b/i18n/fr/libopie.ts
@@ -125,48 +125,67 @@
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Grand</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Moyen</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Petit</translation>
     </message>
 </context>
 <context>
+    <name>OTimePickerDialogBase</name>
+    <message>
+        <source>TimePicker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pick Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
         <translation>Résumé :</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Description :</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorité :</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progression :</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Date de fin :</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie :</translation>
diff --git a/i18n/fr/libqpe.ts b/i18n/fr/libqpe.ts
index f86cade..e741662 100644
--- a/i18n/fr/libqpe.ts
+++ b/i18n/fr/libqpe.ts
@@ -206,73 +206,73 @@ est en train d&apos;éditer les catégories.</translation>
         <source>Duplicate</source>
         <translation>Dupliquer</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Echec de la copie de fichier.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Echec du déplacement du fichier.</translation>
     </message>
     <message>
         <source>File does not exist.</source>
         <translation>Le fichier n&apos;existe pas.</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Détails</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Effacer</translation>
     </message>
     <message>
         <source>Del Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</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>
@@ -400,53 +400,53 @@ Free some memory and try again.</source>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tout</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vide</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
diff --git a/i18n/fr/libvmemoapplet.ts b/i18n/fr/libvmemoapplet.ts
index 4eb9e18..8371675 100644
--- a/i18n/fr/libvmemoapplet.ts
+++ b/i18n/fr/libvmemoapplet.ts
@@ -1,2 +1,13 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>VMemo</name>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/light-and-power.ts b/i18n/fr/light-and-power.ts
index 129be73..cc8fd56 100644
--- a/i18n/fr/light-and-power.ts
+++ b/i18n/fr/light-and-power.ts
@@ -1,53 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Light and Power Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/mail.ts b/i18n/fr/mail.ts
index 0ecaf66..8fdd872 100644
--- a/i18n/fr/mail.ts
+++ b/i18n/fr/mail.ts
@@ -213,49 +213,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/fr/oipkg.ts b/i18n/fr/oipkg.ts
index af93ff8..08b3415 100644
--- a/i18n/fr/oipkg.ts
+++ b/i18n/fr/oipkg.ts
@@ -8,48 +8,52 @@
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>feeds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/fr/opieftp.ts b/i18n/fr/opieftp.ts
index fc8e689..4d84121 100644
--- a/i18n/fr/opieftp.ts
+++ b/i18n/fr/opieftp.ts
@@ -206,26 +206,34 @@ It must be empty</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry name already taken</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/remote.ts b/i18n/fr/remote.ts
index a950e82..0314a85 100644
--- a/i18n/fr/remote.ts
+++ b/i18n/fr/remote.ts
@@ -1,17 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainView</name>
     <message>
         <source>Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Learn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/security.ts b/i18n/fr/security.ts
index 9d17e6f..b9ec769 100644
--- a/i18n/fr/security.ts
+++ b/i18n/fr/security.ts
@@ -9,48 +9,56 @@
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/fr/showimg.ts b/i18n/fr/showimg.ts
index 1065cd8..17b9a4c 100644
--- a/i18n/fr/showimg.ts
+++ b/i18n/fr/showimg.ts
@@ -1,77 +1,155 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ControlsDialog</name>
+    <message>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageFileSelector</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading image...</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Could not load image</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image Info ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate 270</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Brightness ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Black And White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale to Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 alpha levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8-bit alpha channel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/textedit.ts b/i18n/fr/textedit.ts
index 6c11582..ed8a4ff 100644
--- a/i18n/fr/textedit.ts
+++ b/i18n/fr/textedit.ts
@@ -148,48 +148,56 @@ This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected
  you selected a .desktop file.
 Open .desktop file or linked file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Insert Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished">propriétaire</translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished">groupe</translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/fr/today.ts b/i18n/fr/today.ts
index 1f54aff..748913e 100644
--- a/i18n/fr/today.ts
+++ b/i18n/fr/today.ts
@@ -14,48 +14,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
diff --git a/i18n/hu/advancedfm.ts b/i18n/hu/advancedfm.ts
index 5f33236..ce9fab3 100644
--- a/i18n/hu/advancedfm.ts
+++ b/i18n/hu/advancedfm.ts
@@ -158,48 +158,70 @@
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
diff --git a/i18n/hu/appearance.ts b/i18n/hu/appearance.ts
index ba6187f..7c20f02 100644
--- a/i18n/hu/appearance.ts
+++ b/i18n/hu/appearance.ts
@@ -63,47 +63,83 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable advanced options in Opie apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/embeddedkonsole.ts b/i18n/hu/embeddedkonsole.ts
index 2814537..5251b68 100644
--- a/i18n/hu/embeddedkonsole.ts
+++ b/i18n/hu/embeddedkonsole.ts
@@ -165,44 +165,48 @@
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Command List</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libdialup.ts b/i18n/hu/libdialup.ts
index ef40095..dbb9bc9 100644
--- a/i18n/hu/libdialup.ts
+++ b/i18n/hu/libdialup.ts
@@ -120,48 +120,64 @@
     <message>
         <source>Auto-detect name servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-detect routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PCMCIA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PppMon</name>
     <message>
         <source>Waiting for activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authenticating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/hu/libopie.ts b/i18n/hu/libopie.ts
index 1c090f0..6736fd3 100644
--- a/i18n/hu/libopie.ts
+++ b/i18n/hu/libopie.ts
@@ -123,48 +123,67 @@
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>OTimePickerDialogBase</name>
+    <message>
+        <source>TimePicker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pick Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/hu/libvmemoapplet.ts b/i18n/hu/libvmemoapplet.ts
index 4eb9e18..8371675 100644
--- a/i18n/hu/libvmemoapplet.ts
+++ b/i18n/hu/libvmemoapplet.ts
@@ -1,2 +1,13 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>VMemo</name>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/light-and-power.ts b/i18n/hu/light-and-power.ts
index 28e50a1..5a89b8d 100644
--- a/i18n/hu/light-and-power.ts
+++ b/i18n/hu/light-and-power.ts
@@ -1,53 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Light and Power Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/mail.ts b/i18n/hu/mail.ts
index 0ecaf66..8fdd872 100644
--- a/i18n/hu/mail.ts
+++ b/i18n/hu/mail.ts
@@ -213,49 +213,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/hu/oipkg.ts b/i18n/hu/oipkg.ts
index af93ff8..08b3415 100644
--- a/i18n/hu/oipkg.ts
+++ b/i18n/hu/oipkg.ts
@@ -8,48 +8,52 @@
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>feeds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/hu/opieftp.ts b/i18n/hu/opieftp.ts
index fc8e689..4d84121 100644
--- a/i18n/hu/opieftp.ts
+++ b/i18n/hu/opieftp.ts
@@ -206,26 +206,34 @@ It must be empty</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry name already taken</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/remote.ts b/i18n/hu/remote.ts
index a950e82..0314a85 100644
--- a/i18n/hu/remote.ts
+++ b/i18n/hu/remote.ts
@@ -1,17 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainView</name>
     <message>
         <source>Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Learn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/security.ts b/i18n/hu/security.ts
index 9d17e6f..b9ec769 100644
--- a/i18n/hu/security.ts
+++ b/i18n/hu/security.ts
@@ -9,48 +9,56 @@
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/hu/showimg.ts b/i18n/hu/showimg.ts
index 1065cd8..17b9a4c 100644
--- a/i18n/hu/showimg.ts
+++ b/i18n/hu/showimg.ts
@@ -1,77 +1,155 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ControlsDialog</name>
+    <message>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageFileSelector</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading image...</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Could not load image</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image Info ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate 270</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Brightness ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Black And White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale to Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 alpha levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8-bit alpha channel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/textedit.ts b/i18n/hu/textedit.ts
index 22dfefb..f835083 100644
--- a/i18n/hu/textedit.ts
+++ b/i18n/hu/textedit.ts
@@ -148,48 +148,56 @@ This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected
  you selected a .desktop file.
 Open .desktop file or linked file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Insert Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/hu/today.ts b/i18n/hu/today.ts
index 1f54aff..748913e 100644
--- a/i18n/hu/today.ts
+++ b/i18n/hu/today.ts
@@ -14,48 +14,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
diff --git a/i18n/ja/advancedfm.ts b/i18n/ja/advancedfm.ts
index 5f33236..ce9fab3 100644
--- a/i18n/ja/advancedfm.ts
+++ b/i18n/ja/advancedfm.ts
@@ -158,48 +158,70 @@
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
diff --git a/i18n/ja/appearance.ts b/i18n/ja/appearance.ts
index ba6187f..7c20f02 100644
--- a/i18n/ja/appearance.ts
+++ b/i18n/ja/appearance.ts
@@ -63,47 +63,83 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable advanced options in Opie apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/embeddedkonsole.ts b/i18n/ja/embeddedkonsole.ts
index 2814537..5251b68 100644
--- a/i18n/ja/embeddedkonsole.ts
+++ b/i18n/ja/embeddedkonsole.ts
@@ -165,44 +165,48 @@
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Command List</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libdialup.ts b/i18n/ja/libdialup.ts
index ef40095..dbb9bc9 100644
--- a/i18n/ja/libdialup.ts
+++ b/i18n/ja/libdialup.ts
@@ -120,48 +120,64 @@
     <message>
         <source>Auto-detect name servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-detect routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PCMCIA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PppMon</name>
     <message>
         <source>Waiting for activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authenticating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ja/libopie.ts b/i18n/ja/libopie.ts
index 1c090f0..6736fd3 100644
--- a/i18n/ja/libopie.ts
+++ b/i18n/ja/libopie.ts
@@ -123,48 +123,67 @@
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>OTimePickerDialogBase</name>
+    <message>
+        <source>TimePicker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pick Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/ja/libvmemoapplet.ts b/i18n/ja/libvmemoapplet.ts
index 4eb9e18..8371675 100644
--- a/i18n/ja/libvmemoapplet.ts
+++ b/i18n/ja/libvmemoapplet.ts
@@ -1,2 +1,13 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>VMemo</name>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/light-and-power.ts b/i18n/ja/light-and-power.ts
index 28e50a1..5a89b8d 100644
--- a/i18n/ja/light-and-power.ts
+++ b/i18n/ja/light-and-power.ts
@@ -1,53 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Light and Power Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/mail.ts b/i18n/ja/mail.ts
index 0ecaf66..8fdd872 100644
--- a/i18n/ja/mail.ts
+++ b/i18n/ja/mail.ts
@@ -213,49 +213,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/ja/oipkg.ts b/i18n/ja/oipkg.ts
index af93ff8..08b3415 100644
--- a/i18n/ja/oipkg.ts
+++ b/i18n/ja/oipkg.ts
@@ -8,48 +8,52 @@
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>feeds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ja/opieftp.ts b/i18n/ja/opieftp.ts
index fc8e689..4d84121 100644
--- a/i18n/ja/opieftp.ts
+++ b/i18n/ja/opieftp.ts
@@ -206,26 +206,34 @@ It must be empty</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry name already taken</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/remote.ts b/i18n/ja/remote.ts
index a950e82..0314a85 100644
--- a/i18n/ja/remote.ts
+++ b/i18n/ja/remote.ts
@@ -1,17 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainView</name>
     <message>
         <source>Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Learn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/security.ts b/i18n/ja/security.ts
index 9d17e6f..b9ec769 100644
--- a/i18n/ja/security.ts
+++ b/i18n/ja/security.ts
@@ -9,48 +9,56 @@
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ja/showimg.ts b/i18n/ja/showimg.ts
index 1065cd8..17b9a4c 100644
--- a/i18n/ja/showimg.ts
+++ b/i18n/ja/showimg.ts
@@ -1,77 +1,155 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ControlsDialog</name>
+    <message>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageFileSelector</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading image...</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Could not load image</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image Info ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate 270</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Brightness ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Black And White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale to Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 alpha levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8-bit alpha channel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/textedit.ts b/i18n/ja/textedit.ts
index 22dfefb..f835083 100644
--- a/i18n/ja/textedit.ts
+++ b/i18n/ja/textedit.ts
@@ -148,48 +148,56 @@ This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected
  you selected a .desktop file.
 Open .desktop file or linked file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Insert Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ja/today.ts b/i18n/ja/today.ts
index 1f54aff..748913e 100644
--- a/i18n/ja/today.ts
+++ b/i18n/ja/today.ts
@@ -14,48 +14,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
diff --git a/i18n/ko/advancedfm.ts b/i18n/ko/advancedfm.ts
index 5f33236..ce9fab3 100644
--- a/i18n/ko/advancedfm.ts
+++ b/i18n/ko/advancedfm.ts
@@ -158,48 +158,70 @@
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
diff --git a/i18n/ko/appearance.ts b/i18n/ko/appearance.ts
index ba6187f..7c20f02 100644
--- a/i18n/ko/appearance.ts
+++ b/i18n/ko/appearance.ts
@@ -63,47 +63,83 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable advanced options in Opie apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/embeddedkonsole.ts b/i18n/ko/embeddedkonsole.ts
index 2814537..5251b68 100644
--- a/i18n/ko/embeddedkonsole.ts
+++ b/i18n/ko/embeddedkonsole.ts
@@ -165,44 +165,48 @@
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Command List</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libdialup.ts b/i18n/ko/libdialup.ts
index ef40095..dbb9bc9 100644
--- a/i18n/ko/libdialup.ts
+++ b/i18n/ko/libdialup.ts
@@ -120,48 +120,64 @@
     <message>
         <source>Auto-detect name servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-detect routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PCMCIA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PppMon</name>
     <message>
         <source>Waiting for activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authenticating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ko/libopie.ts b/i18n/ko/libopie.ts
index 1c090f0..6736fd3 100644
--- a/i18n/ko/libopie.ts
+++ b/i18n/ko/libopie.ts
@@ -123,48 +123,67 @@
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>OTimePickerDialogBase</name>
+    <message>
+        <source>TimePicker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pick Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/ko/libvmemoapplet.ts b/i18n/ko/libvmemoapplet.ts
index 4eb9e18..8371675 100644
--- a/i18n/ko/libvmemoapplet.ts
+++ b/i18n/ko/libvmemoapplet.ts
@@ -1,2 +1,13 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>VMemo</name>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/light-and-power.ts b/i18n/ko/light-and-power.ts
index 28e50a1..5a89b8d 100644
--- a/i18n/ko/light-and-power.ts
+++ b/i18n/ko/light-and-power.ts
@@ -1,53 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Light and Power Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/mail.ts b/i18n/ko/mail.ts
index 0ecaf66..8fdd872 100644
--- a/i18n/ko/mail.ts
+++ b/i18n/ko/mail.ts
@@ -213,49 +213,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/ko/oipkg.ts b/i18n/ko/oipkg.ts
index af93ff8..08b3415 100644
--- a/i18n/ko/oipkg.ts
+++ b/i18n/ko/oipkg.ts
@@ -8,48 +8,52 @@
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>feeds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ko/opieftp.ts b/i18n/ko/opieftp.ts
index fc8e689..4d84121 100644
--- a/i18n/ko/opieftp.ts
+++ b/i18n/ko/opieftp.ts
@@ -206,26 +206,34 @@ It must be empty</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry name already taken</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/remote.ts b/i18n/ko/remote.ts
index a950e82..0314a85 100644
--- a/i18n/ko/remote.ts
+++ b/i18n/ko/remote.ts
@@ -1,17 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainView</name>
     <message>
         <source>Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Learn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/security.ts b/i18n/ko/security.ts
index 9d17e6f..b9ec769 100644
--- a/i18n/ko/security.ts
+++ b/i18n/ko/security.ts
@@ -9,48 +9,56 @@
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ko/showimg.ts b/i18n/ko/showimg.ts
index 1065cd8..17b9a4c 100644
--- a/i18n/ko/showimg.ts
+++ b/i18n/ko/showimg.ts
@@ -1,77 +1,155 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ControlsDialog</name>
+    <message>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageFileSelector</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading image...</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Could not load image</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image Info ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate 270</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Brightness ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Black And White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale to Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 alpha levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8-bit alpha channel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/textedit.ts b/i18n/ko/textedit.ts
index 22dfefb..f835083 100644
--- a/i18n/ko/textedit.ts
+++ b/i18n/ko/textedit.ts
@@ -148,48 +148,56 @@ This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected
  you selected a .desktop file.
 Open .desktop file or linked file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Insert Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ko/today.ts b/i18n/ko/today.ts
index 1f54aff..748913e 100644
--- a/i18n/ko/today.ts
+++ b/i18n/ko/today.ts
@@ -14,48 +14,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
diff --git a/i18n/ko/todolist.ts b/i18n/ko/todolist.ts
index 8658490..8d7d35b 100644
--- a/i18n/ko/todolist.ts
+++ b/i18n/ko/todolist.ts
@@ -1,110 +1,110 @@
 <!DOCTYPE TS><TS>
-<codec>iso8859-1</codec>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation>할일 목록</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished">새 할일</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Completed</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D&amp;ue</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary:</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0%</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20%</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40%</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60%</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80%</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100%</source>
-        <translation type='obsolete'></translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation>成</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation>우선순위</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>설명</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>정렬 안됨</translation>
     </message>
     <message>
         <source>All</source>
         <translation>모두</translation>
     </message>
diff --git a/i18n/no/advancedfm.ts b/i18n/no/advancedfm.ts
index 5f33236..ce9fab3 100644
--- a/i18n/no/advancedfm.ts
+++ b/i18n/no/advancedfm.ts
@@ -158,48 +158,70 @@
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
diff --git a/i18n/no/appearance.ts b/i18n/no/appearance.ts
index ba6187f..7c20f02 100644
--- a/i18n/no/appearance.ts
+++ b/i18n/no/appearance.ts
@@ -63,47 +63,83 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable advanced options in Opie apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/embeddedkonsole.ts b/i18n/no/embeddedkonsole.ts
index 2814537..5251b68 100644
--- a/i18n/no/embeddedkonsole.ts
+++ b/i18n/no/embeddedkonsole.ts
@@ -165,44 +165,48 @@
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Command List</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libdialup.ts b/i18n/no/libdialup.ts
index ef40095..dbb9bc9 100644
--- a/i18n/no/libdialup.ts
+++ b/i18n/no/libdialup.ts
@@ -120,48 +120,64 @@
     <message>
         <source>Auto-detect name servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-detect routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PCMCIA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PppMon</name>
     <message>
         <source>Waiting for activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authenticating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/no/libopie.ts b/i18n/no/libopie.ts
index 1c090f0..6736fd3 100644
--- a/i18n/no/libopie.ts
+++ b/i18n/no/libopie.ts
@@ -123,48 +123,67 @@
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>OTimePickerDialogBase</name>
+    <message>
+        <source>TimePicker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pick Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/no/libvmemoapplet.ts b/i18n/no/libvmemoapplet.ts
index 4eb9e18..8371675 100644
--- a/i18n/no/libvmemoapplet.ts
+++ b/i18n/no/libvmemoapplet.ts
@@ -1,2 +1,13 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>VMemo</name>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/light-and-power.ts b/i18n/no/light-and-power.ts
index 28e50a1..5a89b8d 100644
--- a/i18n/no/light-and-power.ts
+++ b/i18n/no/light-and-power.ts
@@ -1,53 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Light and Power Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/mail.ts b/i18n/no/mail.ts
index 0ecaf66..8fdd872 100644
--- a/i18n/no/mail.ts
+++ b/i18n/no/mail.ts
@@ -213,49 +213,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/no/oipkg.ts b/i18n/no/oipkg.ts
index af93ff8..08b3415 100644
--- a/i18n/no/oipkg.ts
+++ b/i18n/no/oipkg.ts
@@ -8,48 +8,52 @@
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>feeds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/no/opieftp.ts b/i18n/no/opieftp.ts
index fc8e689..4d84121 100644
--- a/i18n/no/opieftp.ts
+++ b/i18n/no/opieftp.ts
@@ -206,26 +206,34 @@ It must be empty</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry name already taken</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/remote.ts b/i18n/no/remote.ts
index a950e82..0314a85 100644
--- a/i18n/no/remote.ts
+++ b/i18n/no/remote.ts
@@ -1,17 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainView</name>
     <message>
         <source>Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Learn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/security.ts b/i18n/no/security.ts
index 9d17e6f..b9ec769 100644
--- a/i18n/no/security.ts
+++ b/i18n/no/security.ts
@@ -9,48 +9,56 @@
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/no/showimg.ts b/i18n/no/showimg.ts
index 1065cd8..17b9a4c 100644
--- a/i18n/no/showimg.ts
+++ b/i18n/no/showimg.ts
@@ -1,77 +1,155 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ControlsDialog</name>
+    <message>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageFileSelector</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading image...</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Could not load image</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image Info ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate 270</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Brightness ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Black And White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale to Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 alpha levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8-bit alpha channel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/textedit.ts b/i18n/no/textedit.ts
index 22dfefb..f835083 100644
--- a/i18n/no/textedit.ts
+++ b/i18n/no/textedit.ts
@@ -148,48 +148,56 @@ This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected
  you selected a .desktop file.
 Open .desktop file or linked file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Insert Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/no/today.ts b/i18n/no/today.ts
index 1f54aff..748913e 100644
--- a/i18n/no/today.ts
+++ b/i18n/no/today.ts
@@ -14,48 +14,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
diff --git a/i18n/pl/advancedfm.ts b/i18n/pl/advancedfm.ts
index 5f33236..ce9fab3 100644
--- a/i18n/pl/advancedfm.ts
+++ b/i18n/pl/advancedfm.ts
@@ -158,48 +158,70 @@
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
diff --git a/i18n/pl/appearance.ts b/i18n/pl/appearance.ts
index 769fdd0..8f87b84 100644
--- a/i18n/pl/appearance.ts
+++ b/i18n/pl/appearance.ts
@@ -64,47 +64,83 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Rozmiar</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable advanced options in Opie apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Edytuj schemat</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/embeddedkonsole.ts b/i18n/pl/embeddedkonsole.ts
index 0d084d0..50684c9 100644
--- a/i18n/pl/embeddedkonsole.ts
+++ b/i18n/pl/embeddedkonsole.ts
@@ -165,44 +165,48 @@
     <message>
         <source>Left</source>
         <translation>Lewo</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Prawo</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Przewijanie</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Wyswietl liste komend</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Ukryj liste komend</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Command List</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Wybor komendy</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Dodaj komende</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Wprowadz komende do dodania:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libdialup.ts b/i18n/pl/libdialup.ts
index a328fd1..139ade9 100644
--- a/i18n/pl/libdialup.ts
+++ b/i18n/pl/libdialup.ts
@@ -120,48 +120,64 @@
     <message>
         <source>Auto-detect name servers</source>
         <translation>Rozpoznaj serwery nazw</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Brama</translation>
     </message>
     <message>
         <source>Auto-detect routing</source>
         <translation>Rozpoznaj routing</translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation>Podstawowy DNS</translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation>Pomocniczy DNS</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Proxy</translation>
     </message>
+    <message>
+        <source>Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PCMCIA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PppMon</name>
     <message>
         <source>Waiting for activity</source>
         <translation>Oczekiwanie na aktywacje</translation>
     </message>
     <message>
         <source>Initializing modem</source>
         <translation>Inicjalizacja modemu</translation>
     </message>
     <message>
         <source>Connecting</source>
         <translation>Laczenie</translation>
     </message>
     <message>
         <source>Authenticating</source>
         <translation>Autoryzacja</translation>
     </message>
     <message>
         <source>No dialtone</source>
         <translation>Brak sygnalu wybierania</translation>
     </message>
     <message>
diff --git a/i18n/pl/libopie.ts b/i18n/pl/libopie.ts
index 1c090f0..6736fd3 100644
--- a/i18n/pl/libopie.ts
+++ b/i18n/pl/libopie.ts
@@ -123,48 +123,67 @@
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>OTimePickerDialogBase</name>
+    <message>
+        <source>TimePicker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pick Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/pl/libvmemoapplet.ts b/i18n/pl/libvmemoapplet.ts
index 4eb9e18..8371675 100644
--- a/i18n/pl/libvmemoapplet.ts
+++ b/i18n/pl/libvmemoapplet.ts
@@ -1,2 +1,13 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>VMemo</name>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/light-and-power.ts b/i18n/pl/light-and-power.ts
index a38c8a9..37c1d03 100644
--- a/i18n/pl/light-and-power.ts
+++ b/i18n/pl/light-and-power.ts
@@ -1,53 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light Settings</source>
-        <translation>Ustawienia podswietlania</translation>
+        <translation type="obsolete">Ustawienia podswietlania</translation>
     </message>
     <message>
         <source>Adjust to environment</source>
         <translation>Wyrownaj do srodowiska</translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>Sensor swiatla ustawi poziom podswietlenia automatycznie</translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation>Oszczednosc energii</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation> sekund</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Wylacz swiatlo po</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Przyciemnij swiatlo po</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Zasnij po</translation>
     </message>
     <message>
         <source>Bright</source>
         <translation>Jasnosc</translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation>&lt;blockquote&gt;Im jasniej tym wiecej potrzeba energii.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Wylacz</translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Light and Power Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/mail.ts b/i18n/pl/mail.ts
index 0ecaf66..8fdd872 100644
--- a/i18n/pl/mail.ts
+++ b/i18n/pl/mail.ts
@@ -213,49 +213,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/pl/oipkg.ts b/i18n/pl/oipkg.ts
index af93ff8..08b3415 100644
--- a/i18n/pl/oipkg.ts
+++ b/i18n/pl/oipkg.ts
@@ -8,48 +8,52 @@
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>feeds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pl/opieftp.ts b/i18n/pl/opieftp.ts
index fe91092..c6b5a09 100644
--- a/i18n/pl/opieftp.ts
+++ b/i18n/pl/opieftp.ts
@@ -220,26 +220,34 @@ To musi byc puste</translation>
 </translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>Nie moge zmienic nazwy
 </translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Nie moge zmienic nazwy</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ten katalog nie istnieje</translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry name already taken</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/remote.ts b/i18n/pl/remote.ts
index a950e82..0314a85 100644
--- a/i18n/pl/remote.ts
+++ b/i18n/pl/remote.ts
@@ -1,17 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainView</name>
     <message>
         <source>Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Learn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/security.ts b/i18n/pl/security.ts
index f2a07e9..3022fee 100644
--- a/i18n/pl/security.ts
+++ b/i18n/pl/security.ts
@@ -10,48 +10,56 @@
         <translation>Zmien haslo</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Podaj haslo</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Haslo bledne</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Haslo nieprawidlowe.
 Dostep zabroniony</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Kazdy</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Ustawienia bezpieczenstwa</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zmien haslo</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Wyczysc haslo</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Wymaj hasla po uruchomieniu</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pl/showimg.ts b/i18n/pl/showimg.ts
index 924cebc..68425cc 100644
--- a/i18n/pl/showimg.ts
+++ b/i18n/pl/showimg.ts
@@ -1,77 +1,155 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ControlsDialog</name>
+    <message>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageFileSelector</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Przegladarka obrazow</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Odbicie oiziome</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Odbicie pionowe</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Otworz</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Obroc o 180</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Obroc o 90</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Pelny ekran</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation> - Przegladarka obrazow</translation>
     </message>
     <message>
         <source>Loading image...</source>
-        <translation>Laduje obraz</translation>
+        <translation type="obsolete">Laduje obraz</translation>
     </message>
     <message>
         <source>Could not load image</source>
-        <translation>Nie moge zaladowac obrazu</translation>
+        <translation type="obsolete">Nie moge zaladowac obrazu</translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
-        <translation>Brak obrazu - wybierz Otworz z menu Plik</translation>
+        <translation type="obsolete">Brak obrazu - wybierz Otworz z menu Plik</translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
-        <translation>, %1/%2 kolorow</translation>
+        <translation type="obsolete">, %1/%2 kolorow</translation>
     </message>
     <message>
         <source>, %1 colors</source>
-        <translation>, %1 kolorow</translation>
+        <translation type="obsolete">, %1 kolorow</translation>
     </message>
     <message>
         <source> True color</source>
         <translation> Pelny kolor</translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
-        <translation> %1 poziomow alfa</translation>
+        <translation type="obsolete"> %1 poziomow alfa</translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
-        <translation> 8-bit kanal alfa</translation>
+        <translation type="obsolete"> 8-bit kanal alfa</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image Info ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate 270</source>
+        <translation type="unfinished">Obroc o 270</translation>
+    </message>
+    <message>
+        <source>Brightness ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Black And White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale to Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 alpha levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8-bit alpha channel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/textedit.ts b/i18n/pl/textedit.ts
index 670c250..9ecf4f4 100644
--- a/i18n/pl/textedit.ts
+++ b/i18n/pl/textedit.ts
@@ -150,48 +150,56 @@ To jest nieodwracalne!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected
  you selected a .desktop file.
 Open .desktop file or linked file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Wszystkie</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Insert Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>filePermissions</source>
         <translation>UprawnieniaPlikow</translation>
     </message>
     <message>
         <source>Set File Permissions</source>
         <translation>Ustaw uprawnienia</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Ustaw uprawnienia dla:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>wlasciciel</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupa</translation>
     </message>
     <message>
diff --git a/i18n/pl/today.ts b/i18n/pl/today.ts
index 1b72c04..922d74e 100644
--- a/i18n/pl/today.ts
+++ b/i18n/pl/today.ts
@@ -14,48 +14,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
diff --git a/i18n/pt/advancedfm.ts b/i18n/pt/advancedfm.ts
index d62968a..5508dd1 100644
--- a/i18n/pt/advancedfm.ts
+++ b/i18n/pt/advancedfm.ts
@@ -158,48 +158,70 @@
         <source>Properties</source>
         <translation>Propriedades</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
diff --git a/i18n/pt/appearance.ts b/i18n/pt/appearance.ts
index 8f9d02b..d04c594 100644
--- a/i18n/pt/appearance.ts
+++ b/i18n/pt/appearance.ts
@@ -64,47 +64,83 @@
 </translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>O esquema actual não pode ser apagado.</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Esquema actual</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>A rápida raposa castanha salta sobre o cão molenga</translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation>Aplicar</translation>
+        <translation type="obsolete">Aplicar</translation>
     </message>
     <message>
         <source>Restart</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation>Reiniciar o Opie agora?</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable advanced options in Opie apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editar esquema</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/embeddedkonsole.ts b/i18n/pt/embeddedkonsole.ts
index 25d474f..a86240b 100644
--- a/i18n/pt/embeddedkonsole.ts
+++ b/i18n/pt/embeddedkonsole.ts
@@ -165,44 +165,48 @@
     <message>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barra</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Mostrar Lista</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Esconder Lista</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Command List</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selecção de Comandos</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Adicionar comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Comando a adicionar:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libdialup.ts b/i18n/pt/libdialup.ts
index ef40095..dbb9bc9 100644
--- a/i18n/pt/libdialup.ts
+++ b/i18n/pt/libdialup.ts
@@ -120,48 +120,64 @@
     <message>
         <source>Auto-detect name servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-detect routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PCMCIA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PppMon</name>
     <message>
         <source>Waiting for activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authenticating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt/libopie.ts b/i18n/pt/libopie.ts
index 35e1f52..cea32ea 100644
--- a/i18n/pt/libopie.ts
+++ b/i18n/pt/libopie.ts
@@ -123,48 +123,67 @@
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Médio</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeno</translation>
     </message>
 </context>
 <context>
+    <name>OTimePickerDialogBase</name>
+    <message>
+        <source>TimePicker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pick Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
         <translation>Sumário:</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descrição:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridade:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progresso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
diff --git a/i18n/pt/libvmemoapplet.ts b/i18n/pt/libvmemoapplet.ts
index 4eb9e18..8371675 100644
--- a/i18n/pt/libvmemoapplet.ts
+++ b/i18n/pt/libvmemoapplet.ts
@@ -1,2 +1,13 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>VMemo</name>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/light-and-power.ts b/i18n/pt/light-and-power.ts
index e91b3b1..a38da4c 100644
--- a/i18n/pt/light-and-power.ts
+++ b/i18n/pt/light-and-power.ts
@@ -1,53 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light Settings</source>
-        <translation>Configuração da Luz</translation>
+        <translation type="obsolete">Configuração da Luz</translation>
     </message>
     <message>
         <source>Adjust to environment</source>
         <translation>Ajustar ao ambiente</translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>A luz do ecrâ será ajustada automaticamente mediante a luz ambiente. O parametro do brilho afectará o brilho médio.</translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation>Poupança de energia</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>segundos</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Reduzir brilho ao fim de</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Suspender ao fim de</translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation>Desactivar o LCD apenas ao suspender</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Desligar luz ao fim de</translation>
     </message>
     <message>
         <source>Bright</source>
         <translation>Brilho</translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation>&lt;blockquote&gt;Gastará mais bateria quanto mais brilhante seja o ecrâ.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Desligar</translation>
     </message>
+    <message>
+        <source>Light and Power Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/mail.ts b/i18n/pt/mail.ts
index eb46e5c..c8984e7 100644
--- a/i18n/pt/mail.ts
+++ b/i18n/pt/mail.ts
@@ -213,49 +213,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished">Correio</translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation>Para</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished">Cc</translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished">Bcc</translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation>Assunto.</translation>
diff --git a/i18n/pt/oipkg.ts b/i18n/pt/oipkg.ts
index af93ff8..08b3415 100644
--- a/i18n/pt/oipkg.ts
+++ b/i18n/pt/oipkg.ts
@@ -8,48 +8,52 @@
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>feeds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt/opieftp.ts b/i18n/pt/opieftp.ts
index c608836..10f73cd 100644
--- a/i18n/pt/opieftp.ts
+++ b/i18n/pt/opieftp.ts
@@ -206,26 +206,34 @@ It must be empty</source>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry name already taken</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/remote.ts b/i18n/pt/remote.ts
index 4e02091..9ac8b0d 100644
--- a/i18n/pt/remote.ts
+++ b/i18n/pt/remote.ts
@@ -1,17 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainView</name>
     <message>
         <source>Remote</source>
         <translation>Controlo Remoto</translation>
     </message>
     <message>
         <source>Learn</source>
         <translation>Aprender</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configurar</translation>
     </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/security.ts b/i18n/pt/security.ts
index 21b777b..13490c6 100644
--- a/i18n/pt/security.ts
+++ b/i18n/pt/security.ts
@@ -9,48 +9,56 @@
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt/showimg.ts b/i18n/pt/showimg.ts
index 3d21c30..a0591fd 100644
--- a/i18n/pt/showimg.ts
+++ b/i18n/pt/showimg.ts
@@ -1,77 +1,155 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ControlsDialog</name>
+    <message>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageFileSelector</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Leitor Imagens</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Virar Horizontalmente</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Virar Verticalmente</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Rodar 180º</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Rodar 90º</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Ecrâ Todo</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation>- Leitor Imagens</translation>
     </message>
     <message>
         <source>Loading image...</source>
-        <translation>A ler a imagem...</translation>
+        <translation type="obsolete">A ler a imagem...</translation>
     </message>
     <message>
         <source>Could not load image</source>
-        <translation>Erro ao carregar a imagem</translation>
+        <translation type="obsolete">Erro ao carregar a imagem</translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
-        <translation>Sem imagens - seleccione Abrir no menu.</translation>
+        <translation type="obsolete">Sem imagens - seleccione Abrir no menu.</translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
-        <translation>, %1/%2 cores</translation>
+        <translation type="obsolete">, %1/%2 cores</translation>
     </message>
     <message>
         <source>, %1 colors</source>
-        <translation>, %1 cores</translation>
+        <translation type="obsolete">, %1 cores</translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
-        <translation type="unfinished">, %1 níveis</translation>
+        <translation type="obsolete">, %1 níveis</translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image Info ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate 270</source>
+        <translation type="unfinished">Rodar 270º</translation>
+    </message>
+    <message>
+        <source>Brightness ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Black And White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale to Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 alpha levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8-bit alpha channel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/textedit.ts b/i18n/pt/textedit.ts
index 33cbeec..93d9db0 100644
--- a/i18n/pt/textedit.ts
+++ b/i18n/pt/textedit.ts
@@ -148,48 +148,56 @@ Open .desktop file or linked file?</source>
     </message>
     <message>
         <source>Do you really want
 to delete the current file
 from the disk?
 This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Insert Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt/today.ts b/i18n/pt/today.ts
index befaf80..27dccbc 100644
--- a/i18n/pt/today.ts
+++ b/i18n/pt/today.ts
@@ -14,48 +14,52 @@
         <translation>Existe &lt;b&gt; 1&lt;/b&gt; tarefa activa: &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Existem &lt;b&gt; %1&lt;/b&gt; tarefas activas: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Não existem tarefas activas</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Não existem eventos hoje</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>De</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Deve preencher o cartão de visita</translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation>O OpieMail não está instalado</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
diff --git a/i18n/pt_BR/advancedfm.ts b/i18n/pt_BR/advancedfm.ts
index 5f33236..ce9fab3 100644
--- a/i18n/pt_BR/advancedfm.ts
+++ b/i18n/pt_BR/advancedfm.ts
@@ -158,48 +158,70 @@
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
diff --git a/i18n/pt_BR/appearance.ts b/i18n/pt_BR/appearance.ts
index 0fbe756..391a1c8 100644
--- a/i18n/pt_BR/appearance.ts
+++ b/i18n/pt_BR/appearance.ts
@@ -64,47 +64,83 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable advanced options in Opie apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/embeddedkonsole.ts b/i18n/pt_BR/embeddedkonsole.ts
index 44d0ff6..ec4baad 100644
--- a/i18n/pt_BR/embeddedkonsole.ts
+++ b/i18n/pt_BR/embeddedkonsole.ts
@@ -166,44 +166,48 @@
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Command List</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Seleção de Comando</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished">Entre comando a adicionar:</translation>
     </message>
     <message>
         <source>Add command</source>
         <translation type="unfinished">Adicionar comando</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libdialup.ts b/i18n/pt_BR/libdialup.ts
index 3f85907..df00f6c 100644
--- a/i18n/pt_BR/libdialup.ts
+++ b/i18n/pt_BR/libdialup.ts
@@ -121,48 +121,64 @@
     <message>
         <source>9600</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>19200</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>38400</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>57600</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>115200</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PCMCIA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PppMon</name>
     <message>
         <source>Waiting for activity</source>
         <translation type="unfinished">Esperando por atividade</translation>
     </message>
     <message>
         <source>Initializing modem</source>
         <translation type="unfinished">Iniciando o modem</translation>
     </message>
     <message>
         <source>Connecting</source>
         <translation type="unfinished">Conectando</translation>
     </message>
     <message>
         <source>Authenticating</source>
         <translation type="unfinished">Autenticando</translation>
     </message>
     <message>
         <source>No dialtone</source>
         <translation type="unfinished">Sem tom de discagem</translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/libopie.ts b/i18n/pt_BR/libopie.ts
index 1c090f0..6736fd3 100644
--- a/i18n/pt_BR/libopie.ts
+++ b/i18n/pt_BR/libopie.ts
@@ -123,48 +123,67 @@
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>OTimePickerDialogBase</name>
+    <message>
+        <source>TimePicker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pick Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/pt_BR/libvmemoapplet.ts b/i18n/pt_BR/libvmemoapplet.ts
index a5e2858..5ed17a4 100644
--- a/i18n/pt_BR/libvmemoapplet.ts
+++ b/i18n/pt_BR/libvmemoapplet.ts
@@ -1,3 +1,14 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>VMemo</name>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/light-and-power.ts b/i18n/pt_BR/light-and-power.ts
index e4a97c6..d33cbae 100644
--- a/i18n/pt_BR/light-and-power.ts
+++ b/i18n/pt_BR/light-and-power.ts
@@ -1,54 +1,58 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>Off</source>
         <translation type="unfinished">Desligada</translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished">Conservação de enegria</translation>
     </message>
     <message>
         <source>Light Settings</source>
-        <translation type="unfinished">Configuração de iluminação</translation>
+        <translation type="obsolete">Configuração de iluminação</translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished">&lt;blockquote&gt;Quanto mais clara a luz mais bateria será usada.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished">Apagar luz após</translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished">Detectando a luz ambiente do local onde você está usando o dispositivo a iluminação pode ser ajustada automaticamente. A configuração de brilho ainda afeta a média de blilho.</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished">Diminuir a luz após</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"> segundos</translation>
     </message>
     <message>
         <source>Adjust to environment</source>
         <translation type="unfinished">Ajustar ao meio-ambiente</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished">Suspender após</translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Light and Power Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/mail.ts b/i18n/pt_BR/mail.ts
index 0ecaf66..8fdd872 100644
--- a/i18n/pt_BR/mail.ts
+++ b/i18n/pt_BR/mail.ts
@@ -213,49 +213,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/pt_BR/oipkg.ts b/i18n/pt_BR/oipkg.ts
index af93ff8..08b3415 100644
--- a/i18n/pt_BR/oipkg.ts
+++ b/i18n/pt_BR/oipkg.ts
@@ -8,48 +8,52 @@
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>feeds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/opieftp.ts b/i18n/pt_BR/opieftp.ts
index 7afd54c..ef1b861 100644
--- a/i18n/pt_BR/opieftp.ts
+++ b/i18n/pt_BR/opieftp.ts
@@ -207,26 +207,34 @@ It must be empty</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry name already taken</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/remote.ts b/i18n/pt_BR/remote.ts
index a950e82..0314a85 100644
--- a/i18n/pt_BR/remote.ts
+++ b/i18n/pt_BR/remote.ts
@@ -1,17 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainView</name>
     <message>
         <source>Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Learn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/security.ts b/i18n/pt_BR/security.ts
index 6c92ede..ebda055 100644
--- a/i18n/pt_BR/security.ts
+++ b/i18n/pt_BR/security.ts
@@ -11,48 +11,56 @@
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Mudar senha</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Senha incorreta</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Entre a senha</translation>
     </message>
     <message>
         <source>Set passcode</source>
         <translation>Ajustar senha</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>A senha inserida está incorreta.
 Acesso negado</translation>
     </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Any</source>
         <translation type="unfinished">Qualquer</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Sincronizar</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished">Mudar a senha</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">Aceitar sincronização da rede:</translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/showimg.ts b/i18n/pt_BR/showimg.ts
index 40d0e67..76ab82c 100644
--- a/i18n/pt_BR/showimg.ts
+++ b/i18n/pt_BR/showimg.ts
@@ -1,78 +1,156 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>ControlsDialog</name>
+    <message>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageFileSelector</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Visualizador de Imagens</translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
-        <translation>Sem imagem - selecione Abrir no menu Arquivo.</translation>
+        <translation type="obsolete">Sem imagem - selecione Abrir no menu Arquivo.</translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
-        <translation>, %1 níveis alfa</translation>
+        <translation type="obsolete">, %1 níveis alfa</translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
-        <translation>, %1%2 cores</translation>
+        <translation type="obsolete">, %1%2 cores</translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
-        <translation>, canal alfa de 8 bits</translation>
+        <translation type="obsolete">, canal alfa de 8 bits</translation>
     </message>
     <message>
         <source>Could not load image</source>
-        <translation>Não foi possível carregar imagem</translation>
+        <translation type="obsolete">Não foi possível carregar imagem</translation>
     </message>
     <message>
         <source>, %1 colors</source>
-        <translation>, %1 cores</translation>
+        <translation type="obsolete">, %1 cores</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>Cores reais</translation>
     </message>
     <message>
         <source>Loading image...</source>
-        <translation>Carregando imagem...</translation>
+        <translation type="obsolete">Carregando imagem...</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Giro vertical</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Giro horizontal</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image Info ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate 270</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Brightness ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Black And White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale to Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 alpha levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8-bit alpha channel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/textedit.ts b/i18n/pt_BR/textedit.ts
index 91e64af..5d0d0d6 100644
--- a/i18n/pt_BR/textedit.ts
+++ b/i18n/pt_BR/textedit.ts
@@ -149,48 +149,56 @@ This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected
  you selected a .desktop file.
 Open .desktop file or linked file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Insert Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>read</source>
         <translation>ler</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Dono</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>dono</translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/today.ts b/i18n/pt_BR/today.ts
index 57d5d67..0c3ecf8 100644
--- a/i18n/pt_BR/today.ts
+++ b/i18n/pt_BR/today.ts
@@ -15,48 +15,52 @@
         <translation>Existem &lt;b&gt; 1&lt;/b&gt; tarefas ativas:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Existem &lt;b&gt; %1&lt;/b&gt; tarefas ativas: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Nenhuma tarefa ativa</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished">Nenhum compromisso hoje</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation>Opiemail não instalado</translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished">Hoje</translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation>Quantas
 tarefas devem 
 ser mostradas ?</translation>
     </message>
diff --git a/i18n/sl/advancedfm.ts b/i18n/sl/advancedfm.ts
index 46f076f..4de0ee2 100644
--- a/i18n/sl/advancedfm.ts
+++ b/i18n/sl/advancedfm.ts
@@ -159,48 +159,70 @@
         <source>Properties</source>
         <translation>Lastnosti</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Prežarči datoteko</translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation>že obstaja Ali res želite izbrisati?</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Kot</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Kopiraj isti imenik</translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Shrani izhod v datoteko (samo ime)</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Nastavi datotečne pravice</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Nastavi datotečne pravice za:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>lastnik</translation>
     </message>
     <message>
         <source>group</source>
diff --git a/i18n/sl/appearance.ts b/i18n/sl/appearance.ts
index 4624411..4d1fcef 100644
--- a/i18n/sl/appearance.ts
+++ b/i18n/sl/appearance.ts
@@ -64,47 +64,83 @@
         <translation>Izberi</translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation>Vklopi sliko ozadja</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Privzeto</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Hitra lisica skoči čez lenega psa</translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation>Uveljavi</translation>
+        <translation type="obsolete">Uveljavi</translation>
     </message>
     <message>
         <source>Restart</source>
         <translation>Ponovno zaženi</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation>Ali želite zdaj ponovno zagnati Opie?</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>Nastavitve...</translation>
     </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable advanced options in Opie apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Uredi shemo</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/embeddedkonsole.ts b/i18n/sl/embeddedkonsole.ts
index ab2d2e1..d41e12c 100644
--- a/i18n/sl/embeddedkonsole.ts
+++ b/i18n/sl/embeddedkonsole.ts
@@ -165,44 +165,48 @@
     <message>
         <source>Left</source>
         <translation>Levo</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Desno</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Drsnik</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Prikaži seznam ukazov</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Skrij seznam ukazov</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Po izbiri</translation>
     </message>
+    <message>
+        <source>Command List</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Izbira ukazov</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Dodaj ukaz</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Vpiši ukaz, ki naj ga dodam:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libdialup.ts b/i18n/sl/libdialup.ts
index 917a9d0..5b1b7a2 100644
--- a/i18n/sl/libdialup.ts
+++ b/i18n/sl/libdialup.ts
@@ -120,48 +120,64 @@
     <message>
         <source>Auto-detect name servers</source>
         <translation>Samodejno najdi imenske strežnike</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Prehod</translation>
     </message>
     <message>
         <source>Auto-detect routing</source>
         <translation>Samozaznaj poti</translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation>Prvi DNS</translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation>Drugi DNS</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Proxy strežniki</translation>
     </message>
+    <message>
+        <source>Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PCMCIA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PppMon</name>
     <message>
         <source>Waiting for activity</source>
         <translation>Čakam na aktivnost</translation>
     </message>
     <message>
         <source>Initializing modem</source>
         <translation>Zaganjam modem</translation>
     </message>
     <message>
         <source>Connecting</source>
         <translation>Povezujem</translation>
     </message>
     <message>
         <source>Authenticating</source>
         <translation>Avtoriziram</translation>
     </message>
     <message>
         <source>No dialtone</source>
         <translation>Brez klicnega zvoka</translation>
     </message>
     <message>
diff --git a/i18n/sl/libopie.ts b/i18n/sl/libopie.ts
index 77cc3fe..be5a149 100644
--- a/i18n/sl/libopie.ts
+++ b/i18n/sl/libopie.ts
@@ -124,48 +124,67 @@
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Velika</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Srednja</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Majhna</translation>
     </message>
 </context>
 <context>
+    <name>OTimePickerDialogBase</name>
+    <message>
+        <source>TimePicker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pick Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
         <translation>Povzetek:</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Opis:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prednost:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Napredovanje:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Rok:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
diff --git a/i18n/sl/libvmemoapplet.ts b/i18n/sl/libvmemoapplet.ts
index 4eb9e18..8371675 100644
--- a/i18n/sl/libvmemoapplet.ts
+++ b/i18n/sl/libvmemoapplet.ts
@@ -1,2 +1,13 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>VMemo</name>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/light-and-power.ts b/i18n/sl/light-and-power.ts
index d965619..c6c16dc 100644
--- a/i18n/sl/light-and-power.ts
+++ b/i18n/sl/light-and-power.ts
@@ -1,53 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light Settings</source>
-        <translation>Nastavitve osvetlitve</translation>
+        <translation type="obsolete">Nastavitve osvetlitve</translation>
     </message>
     <message>
         <source>Adjust to environment</source>
         <translation>Prilagodi okolju</translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>S tipanjem svetlobe kjer uporabljate napravo, lahko nastavite avtomatično nastavljanje osvetlitve. Svetlobne nastavitve vplivajo na povprečno osvetlitev.</translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation>Varčevanje energije</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>sekundah</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Zatemni po</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Izključi po</translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation>Ugasni LCS samo pri izključitvi</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Ugasni po</translation>
     </message>
     <message>
         <source>Bright</source>
         <translation>Svetlo</translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation>&lt;blockquote&gt;Svetlejši je zaslon, več baterije je porabljeno.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Ugasnjeno</translation>
     </message>
+    <message>
+        <source>Light and Power Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/mail.ts b/i18n/sl/mail.ts
index 43aaaef..1f61179 100644
--- a/i18n/sl/mail.ts
+++ b/i18n/sl/mail.ts
@@ -213,49 +213,49 @@
         <translation>Sestavi sporočilo</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Pošta</translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation>Pošlji pošto</translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation>Postavi pošto v vrsto</translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation>Pripni datoteko</translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation>Imenik</translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation>Prekini pošiljanje</translation>
+        <translation type="obsolete">Prekini pošiljanje</translation>
     </message>
     <message>
         <source>From</source>
         <translation>Od</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Odgovori</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Za</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Kp</translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation>Skp</translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation>Zad.</translation>
diff --git a/i18n/sl/oipkg.ts b/i18n/sl/oipkg.ts
index 99e85cb..7e81375 100644
--- a/i18n/sl/oipkg.ts
+++ b/i18n/sl/oipkg.ts
@@ -8,48 +8,52 @@
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>feeds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/sl/opieftp.ts b/i18n/sl/opieftp.ts
index 4e3daa4..aecc924 100644
--- a/i18n/sl/opieftp.ts
+++ b/i18n/sl/opieftp.ts
@@ -207,26 +207,34 @@ Mora biti prazen</translation>
 </source>
         <translation>Ne uspem izbrisati datoteke</translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>Ne uspem preimenovati datoteke</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Ne morem preimenovati</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ta imenik ne obstaja</translation>
     </message>
     <message>
         <source>About</source>
         <translation>O</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Preglej</translation>
     </message>
+    <message>
+        <source>New Server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry name already taken</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/remote.ts b/i18n/sl/remote.ts
index a5c8d20..fd492ce 100644
--- a/i18n/sl/remote.ts
+++ b/i18n/sl/remote.ts
@@ -1,17 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainView</name>
     <message>
         <source>Remote</source>
         <translation>Daljinec</translation>
     </message>
     <message>
         <source>Learn</source>
         <translation>Uči</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>nastavi</translation>
     </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/security.ts b/i18n/sl/security.ts
index acfdfe0..8cd4e74 100644
--- a/i18n/sl/security.ts
+++ b/i18n/sl/security.ts
@@ -10,48 +10,56 @@
         <translation>Zamenjaj kodo</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Vpišite kodo</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Koda ni pravilna</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Vpisana koda ni pravilna.
 Dostop zavrnjen</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Karkoli</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Varnostne nastavitve</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zamenjaj kodo</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Zbriši kodo</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Potrebna koda pri vklopu</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sinhroniziraj</translation>
     </message>
     <message>
diff --git a/i18n/sl/showimg.ts b/i18n/sl/showimg.ts
index d92ace1..dbb58c5 100644
--- a/i18n/sl/showimg.ts
+++ b/i18n/sl/showimg.ts
@@ -1,77 +1,155 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ControlsDialog</name>
+    <message>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageFileSelector</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Pregledovalnik slik</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Horizontalni obrat</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Vertikalni obrat</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Odpri</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Obrni za 180</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Obrni za 90</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Cel zaslon</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation>- Pregledovalnik slik</translation>
     </message>
     <message>
         <source>Loading image...</source>
-        <translation>Nalagam sliko...</translation>
+        <translation type="obsolete">Nalagam sliko...</translation>
     </message>
     <message>
         <source>Could not load image</source>
-        <translation>Ne uspem naložiti slike</translation>
+        <translation type="obsolete">Ne uspem naložiti slike</translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
-        <translation>Ni slike - izberite Odpri iz Datoteka menuja.</translation>
+        <translation type="obsolete">Ni slike - izberite Odpri iz Datoteka menuja.</translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
-        <translation>, %1/%2 barv</translation>
+        <translation type="obsolete">, %1/%2 barv</translation>
     </message>
     <message>
         <source>, %1 colors</source>
-        <translation>, %1 barv</translation>
+        <translation type="obsolete">, %1 barv</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>Resnične barve</translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
-        <translation>, %1 alfa stopnje</translation>
+        <translation type="obsolete">, %1 alfa stopnje</translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
-        <translation>, 8-bit alfa kanal</translation>
+        <translation type="obsolete">, 8-bit alfa kanal</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Uredi</translation>
+        <translation type="obsolete">Uredi</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image Info ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate 270</source>
+        <translation type="unfinished">Obrni za 270</translation>
+    </message>
+    <message>
+        <source>Brightness ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Black And White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale to Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 alpha levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8-bit alpha channel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/textedit.ts b/i18n/sl/textedit.ts
index 6b3049c..f77fafe 100644
--- a/i18n/sl/textedit.ts
+++ b/i18n/sl/textedit.ts
@@ -153,48 +153,56 @@ To se ne da preklicati!!</translation>
     <message>
         <source>Text Editor has detected
  you selected a .desktop file.
 Open .desktop file or linked file?</source>
         <translation>Urejevalnik besedil je zaznal,
 da ste izbrali .desktop datoteko.
 Odprem .desktop datoteko ali povezano datoteko?</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>.desktop datoteka</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Povezan dokument</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Besedilo</translation>
     </message>
+    <message>
+        <source>Insert Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Nastavi datotečne pravice</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Nastavi datotečne pravice za:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>lastnik</translation>
     </message>
     <message>
         <source>group</source>
         <translation>skupina</translation>
     </message>
     <message>
         <source>others</source>
         <translation>drugi</translation>
     </message>
     <message>
diff --git a/i18n/sl/today.ts b/i18n/sl/today.ts
index a7c258c..c618ac0 100644
--- a/i18n/sl/today.ts
+++ b/i18n/sl/today.ts
@@ -14,48 +14,52 @@
         <translation>Trenutno je &lt;b&gt; %1&lt;/b&gt; tekočih opravil: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Ni tekočih opravil</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; novih sporočil, &lt;b&gt;%2&lt;/b&gt; izhodnih</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Danes ni sestankov</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Lastnik je</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Prosim izplonite poslovno kartico</translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation>OpiePošta ni nameščena</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Danes</translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation>Nastavitve Danes</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
diff --git a/i18n/zh_CN/advancedfm.ts b/i18n/zh_CN/advancedfm.ts
index 5f33236..ce9fab3 100644
--- a/i18n/zh_CN/advancedfm.ts
+++ b/i18n/zh_CN/advancedfm.ts
@@ -158,48 +158,70 @@
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
diff --git a/i18n/zh_CN/appearance.ts b/i18n/zh_CN/appearance.ts
index ba6187f..7c20f02 100644
--- a/i18n/zh_CN/appearance.ts
+++ b/i18n/zh_CN/appearance.ts
@@ -63,47 +63,83 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable advanced options in Opie apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/embeddedkonsole.ts b/i18n/zh_CN/embeddedkonsole.ts
index 2814537..5251b68 100644
--- a/i18n/zh_CN/embeddedkonsole.ts
+++ b/i18n/zh_CN/embeddedkonsole.ts
@@ -165,44 +165,48 @@
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Command List</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libdialup.ts b/i18n/zh_CN/libdialup.ts
index ef40095..dbb9bc9 100644
--- a/i18n/zh_CN/libdialup.ts
+++ b/i18n/zh_CN/libdialup.ts
@@ -120,48 +120,64 @@
     <message>
         <source>Auto-detect name servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-detect routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PCMCIA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PppMon</name>
     <message>
         <source>Waiting for activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authenticating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_CN/libopie.ts b/i18n/zh_CN/libopie.ts
index 1c090f0..6736fd3 100644
--- a/i18n/zh_CN/libopie.ts
+++ b/i18n/zh_CN/libopie.ts
@@ -123,48 +123,67 @@
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>OTimePickerDialogBase</name>
+    <message>
+        <source>TimePicker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pick Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_CN/libvmemoapplet.ts b/i18n/zh_CN/libvmemoapplet.ts
index 4eb9e18..8371675 100644
--- a/i18n/zh_CN/libvmemoapplet.ts
+++ b/i18n/zh_CN/libvmemoapplet.ts
@@ -1,2 +1,13 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>VMemo</name>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/light-and-power.ts b/i18n/zh_CN/light-and-power.ts
index 28e50a1..5a89b8d 100644
--- a/i18n/zh_CN/light-and-power.ts
+++ b/i18n/zh_CN/light-and-power.ts
@@ -1,53 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Light and Power Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/mail.ts b/i18n/zh_CN/mail.ts
index 0ecaf66..8fdd872 100644
--- a/i18n/zh_CN/mail.ts
+++ b/i18n/zh_CN/mail.ts
@@ -213,49 +213,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_CN/oipkg.ts b/i18n/zh_CN/oipkg.ts
index af93ff8..08b3415 100644
--- a/i18n/zh_CN/oipkg.ts
+++ b/i18n/zh_CN/oipkg.ts
@@ -8,48 +8,52 @@
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>feeds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_CN/opieftp.ts b/i18n/zh_CN/opieftp.ts
index fc8e689..4d84121 100644
--- a/i18n/zh_CN/opieftp.ts
+++ b/i18n/zh_CN/opieftp.ts
@@ -206,26 +206,34 @@ It must be empty</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry name already taken</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/remote.ts b/i18n/zh_CN/remote.ts
index a950e82..0314a85 100644
--- a/i18n/zh_CN/remote.ts
+++ b/i18n/zh_CN/remote.ts
@@ -1,17 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainView</name>
     <message>
         <source>Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Learn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/security.ts b/i18n/zh_CN/security.ts
index 9d17e6f..b9ec769 100644
--- a/i18n/zh_CN/security.ts
+++ b/i18n/zh_CN/security.ts
@@ -9,48 +9,56 @@
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_CN/showimg.ts b/i18n/zh_CN/showimg.ts
index 1065cd8..17b9a4c 100644
--- a/i18n/zh_CN/showimg.ts
+++ b/i18n/zh_CN/showimg.ts
@@ -1,77 +1,155 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ControlsDialog</name>
+    <message>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageFileSelector</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading image...</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Could not load image</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image Info ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate 270</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Brightness ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Black And White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale to Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 alpha levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8-bit alpha channel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/textedit.ts b/i18n/zh_CN/textedit.ts
index 22dfefb..f835083 100644
--- a/i18n/zh_CN/textedit.ts
+++ b/i18n/zh_CN/textedit.ts
@@ -148,48 +148,56 @@ This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected
  you selected a .desktop file.
 Open .desktop file or linked file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Insert Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_CN/today.ts b/i18n/zh_CN/today.ts
index 1f54aff..748913e 100644
--- a/i18n/zh_CN/today.ts
+++ b/i18n/zh_CN/today.ts
@@ -14,48 +14,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
diff --git a/i18n/zh_TW/advancedfm.ts b/i18n/zh_TW/advancedfm.ts
index 5f33236..ce9fab3 100644
--- a/i18n/zh_TW/advancedfm.ts
+++ b/i18n/zh_TW/advancedfm.ts
@@ -158,48 +158,70 @@
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
diff --git a/i18n/zh_TW/appearance.ts b/i18n/zh_TW/appearance.ts
index ba6187f..7c20f02 100644
--- a/i18n/zh_TW/appearance.ts
+++ b/i18n/zh_TW/appearance.ts
@@ -63,47 +63,83 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable advanced options in Opie apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/embeddedkonsole.ts b/i18n/zh_TW/embeddedkonsole.ts
index 2814537..5251b68 100644
--- a/i18n/zh_TW/embeddedkonsole.ts
+++ b/i18n/zh_TW/embeddedkonsole.ts
@@ -165,44 +165,48 @@
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Command List</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libdialup.ts b/i18n/zh_TW/libdialup.ts
index ef40095..dbb9bc9 100644
--- a/i18n/zh_TW/libdialup.ts
+++ b/i18n/zh_TW/libdialup.ts
@@ -120,48 +120,64 @@
     <message>
         <source>Auto-detect name servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-detect routing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IrDA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PCMCIA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PppMon</name>
     <message>
         <source>Waiting for activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authenticating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/libopie.ts b/i18n/zh_TW/libopie.ts
index 1c090f0..6736fd3 100644
--- a/i18n/zh_TW/libopie.ts
+++ b/i18n/zh_TW/libopie.ts
@@ -123,48 +123,67 @@
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>OTimePickerDialogBase</name>
+    <message>
+        <source>TimePicker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pick Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/libvmemoapplet.ts b/i18n/zh_TW/libvmemoapplet.ts
index 4eb9e18..8371675 100644
--- a/i18n/zh_TW/libvmemoapplet.ts
+++ b/i18n/zh_TW/libvmemoapplet.ts
@@ -1,2 +1,13 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>VMemo</name>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error recording</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/light-and-power.ts b/i18n/zh_TW/light-and-power.ts
index 28e50a1..5a89b8d 100644
--- a/i18n/zh_TW/light-and-power.ts
+++ b/i18n/zh_TW/light-and-power.ts
@@ -1,53 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Light and Power Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/mail.ts b/i18n/zh_TW/mail.ts
index 0ecaf66..8fdd872 100644
--- a/i18n/zh_TW/mail.ts
+++ b/i18n/zh_TW/mail.ts
@@ -213,49 +213,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/oipkg.ts b/i18n/zh_TW/oipkg.ts
index af93ff8..08b3415 100644
--- a/i18n/zh_TW/oipkg.ts
+++ b/i18n/zh_TW/oipkg.ts
@@ -8,48 +8,52 @@
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>feeds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/opieftp.ts b/i18n/zh_TW/opieftp.ts
index fc8e689..4d84121 100644
--- a/i18n/zh_TW/opieftp.ts
+++ b/i18n/zh_TW/opieftp.ts
@@ -206,26 +206,34 @@ It must be empty</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry name already taken</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/remote.ts b/i18n/zh_TW/remote.ts
index a950e82..0314a85 100644
--- a/i18n/zh_TW/remote.ts
+++ b/i18n/zh_TW/remote.ts
@@ -1,17 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainView</name>
     <message>
         <source>Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Learn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/security.ts b/i18n/zh_TW/security.ts
index 9d17e6f..b9ec769 100644
--- a/i18n/zh_TW/security.ts
+++ b/i18n/zh_TW/security.ts
@@ -9,48 +9,56 @@
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/showimg.ts b/i18n/zh_TW/showimg.ts
index 1065cd8..17b9a4c 100644
--- a/i18n/zh_TW/showimg.ts
+++ b/i18n/zh_TW/showimg.ts
@@ -1,77 +1,155 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ControlsDialog</name>
+    <message>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageFileSelector</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading image...</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Could not load image</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image Info ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate 270</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Brightness ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Black And White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale to Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 alpha levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8-bit alpha channel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/textedit.ts b/i18n/zh_TW/textedit.ts
index 22dfefb..f835083 100644
--- a/i18n/zh_TW/textedit.ts
+++ b/i18n/zh_TW/textedit.ts
@@ -148,48 +148,56 @@ This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected
  you selected a .desktop file.
 Open .desktop file or linked file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Insert Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/today.ts b/i18n/zh_TW/today.ts
index 1f54aff..748913e 100644
--- a/i18n/zh_TW/today.ts
+++ b/i18n/zh_TW/today.ts
@@ -14,48 +14,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>