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
@@ -54,180 +54,202 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/appearance.ts b/i18n/en/appearance.ts
index ba6187f..7c20f02 100644
--- a/i18n/en/appearance.ts
+++ b/i18n/en/appearance.ts
@@ -1,109 +1,145 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="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
@@ -61,148 +61,152 @@
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</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>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <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
@@ -16,220 +16,236 @@
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT-dial:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4800</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Wait time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Demand Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual connect and disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Idle timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic connect and disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual connect, automatic disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>No carrier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number is busy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timed out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProxiesPageBase</name>
     <message>
         <source>Proxy Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto configure proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies for:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -19,155 +19,174 @@
     <message>
         <source>Sat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ser Permission</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
     </message>
 </context>
 </TS>
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
@@ -109,257 +109,257 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="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>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -1,159 +1,163 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InstallDialog</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -102,130 +102,138 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ?
 It must be empty</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>Unable to make directory
 </source>
         <translation type="unfinished"></translation>
     </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>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
@@ -1,93 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/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
@@ -44,197 +44,205 @@
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want
 to delete the current file
 from the disk?
 This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,117 +1,121 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/advancedfm.ts b/i18n/es/advancedfm.ts
index 2c7156e..23042dd 100644
--- a/i18n/es/advancedfm.ts
+++ b/i18n/es/advancedfm.ts
@@ -56,180 +56,202 @@
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Seguro que quiere borrar
 </translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>No puedo renombrar</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ese directorio no existe</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Copiar como</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Salida Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation>¡el comando falló!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Emisión del Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Envío IR.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Cambiar directorio</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Ejecutar</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Abrir como texto</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Crear enlace simbólico</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Actualizar</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Info fichero</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Fijar permisos</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Emitir fichero</translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation>ya existe
 ¿seguro que quiere borrarlo?</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Como</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copiar misma carpeta</translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Salvar salida en fichero(sólo nombre)</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fijar Permisos Fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos para el fichero:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>otros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lectura</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escritura</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecución</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/appearance.ts b/i18n/es/appearance.ts
index 6f2cb6a..6635246 100644
--- a/i18n/es/appearance.ts
+++ b/i18n/es/appearance.ts
@@ -1,110 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation>Apariencia</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Esquema actual</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation>Hojear...</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fondo</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation>Editar esquema actual...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Realmente quiere borrar
 </translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Borrar esquema</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Incapaz de borrar el esquema actual.</translation>
     </message>
     <message>
         <source>Select</source>
         <translation>Seleccionar</translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation>Habilitar imagen de fondo</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Por omisión</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>El Rápido Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation>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
@@ -61,148 +61,152 @@
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espacio</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Arriba</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Abajo</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Pegar</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>Tabs on Bottom</source>
         <translation>Etiquetas abajo</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Verde sobre negro</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Negro sobre blanco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Blanco sobre negro</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Blanco sobre transparente</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Negro sobre rojo</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Rojo sobre negro</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Verde sobre amarillo</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Azul sobre magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta sobre azul</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cian sobre blanco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Blanco sobre cian</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Azul sobre negro</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ámbar sobre negro</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Editar rápido</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <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
@@ -16,220 +16,236 @@
     <message>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
         <source>Phone:</source>
         <translation>Teléfono:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>Módem</translation>
     </message>
     <message>
         <source>AT-dial:</source>
         <translation>AT-dial:</translation>
     </message>
     <message>
         <source>ATDT</source>
         <translation>ATDT</translation>
     </message>
     <message>
         <source>ATDP</source>
         <translation>ATDP</translation>
     </message>
     <message>
         <source>Speed:</source>
         <translation>Velocidad:</translation>
     </message>
     <message>
         <source>4800</source>
         <translation>4800</translation>
     </message>
     <message>
         <source>9600</source>
         <translation>9600</translation>
     </message>
     <message>
         <source>19200</source>
         <translation>19200</translation>
     </message>
     <message>
         <source>38400</source>
         <translation>38400</translation>
     </message>
     <message>
         <source>57600</source>
         <translation>57600</translation>
     </message>
     <message>
         <source>115200</source>
         <translation>115200</translation>
     </message>
     <message>
         <source>Wait time:</source>
         <translation>Tiempo espera:</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>sec</source>
         <translation>seg</translation>
     </message>
     <message>
         <source>Flow control:</source>
         <translation>Control flujo:</translation>
     </message>
     <message>
         <source>Hardware flow control</source>
         <translation>Control flujo hardware</translation>
     </message>
     <message>
         <source>Demand Dialing</source>
         <translation>Petición marcado</translation>
     </message>
     <message>
         <source>Manual connect and disconnect</source>
         <translation>Conexión y desconexión manual</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>segundos</translation>
     </message>
     <message>
         <source>Idle timeout:</source>
         <translation>Interrupción inactivo:</translation>
     </message>
     <message>
         <source>Automatic connect and disconnect</source>
         <translation>Conexión y desconexión automática</translation>
     </message>
     <message>
         <source>Manual connect, automatic disconnect</source>
         <translation>Conexión manual, desconexión automática</translation>
     </message>
     <message>
         <source>Network</source>
         <translation>Red</translation>
     </message>
     <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>
         <source>No carrier</source>
         <translation>Sin portadora</translation>
     </message>
     <message>
         <source>Number is busy</source>
         <translation>Número ocupado</translation>
     </message>
     <message>
         <source>Timed out</source>
         <translation>Espera agotada</translation>
     </message>
     <message>
         <source>Connection failed</source>
         <translation>Falló la conexión</translation>
     </message>
     <message>
         <source>Authentication Failed</source>
         <translation>Falló la autentificación</translation>
     </message>
     <message>
         <source>Connected</source>
         <translation>Conectado</translation>
     </message>
 </context>
 <context>
     <name>ProxiesPageBase</name>
     <message>
         <source>Proxy Settings</source>
         <translation>Configuración proxy</translation>
     </message>
     <message>
         <source>No proxies</source>
         <translation>Sin proxies</translation>
     </message>
     <message>
         <source>Auto configure proxies</source>
         <translation>Autoconfigurar proxies</translation>
     </message>
     <message>
         <source>Set proxies</source>
         <translation>Fijar proxies</translation>
     </message>
     <message>
         <source>Config:</source>
         <translation>Configuración:</translation>
     </message>
     <message>
         <source>Port:</source>
         <translation>Puerto:</translation>
     </message>
     <message>
         <source>HTTP:</source>
         <translation>HTTP:</translation>
     </message>
     <message>
         <source>FTP:</source>
         <translation>FTP:</translation>
     </message>
     <message>
         <source>Host:</source>
         <translation>Máquina:</translation>
     </message>
     <message>
         <source>No proxies for:</source>
         <translation>Sin proxies para:</translation>
     </message>
 </context>
 </TS>
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
@@ -20,155 +20,174 @@
         <source>Sat:</source>
         <translation>Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Rojo:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation>Canal alpha:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Seleccionar color</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>DiálogoFichero</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Ficheros</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Todos ficheros</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Salvar</translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Tipo mime</translation>
     </message>
     <message>
         <source>Ser Permission</source>
         <translation>Fijar permisos</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Seguro que quiere borrar
 </translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
 </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>
     </message>
 </context>
 </TS>
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
@@ -109,257 +109,257 @@
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>No hay entradas en la libreta de direcciones.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Tiene que seleccionar al menos una dirección.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation>Recoge direcciones</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation>Por favor, seleccione una entrada primero.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation>Fijar descripción</translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation>&lt;div align=center&gt;Descripción</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation>&lt;p&gt;Tiene que especificar un destinatario.&lt;br&gt;(pe: pepe@luis.es)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Hubo un problema enviando algún correo de la cola.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Success</source>
         <translation>Éxito</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation>&lt;p&gt;El correo fue puesto con éxito en la cola.&lt;/p&gt;&lt;p&gt;La cola contiene</translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation>correos.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation>&lt;font color=#ff0000&gt;Ocurrió un error durante el envío.&lt;/font&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation>&lt;p&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El correo fue enviando con éxito.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation>&lt;p&gt;Los correos en cola </translation>
     </message>
     <message>
         <source> of </source>
         <translation>de </translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation>Componer mensaje</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation>Enviar correo</translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation>Correo en cola</translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation>Adjuntar un fichero</translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation>Libreta direcciones</translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation>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>
     </message>
     <message>
         <source>Prio.</source>
         <translation>Prio.</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baja</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation>Añadir un adjunto</translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation>Eliminar adjunto</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation>Carbiar descripción</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Tiene que seleccionar una cuenta primero.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Pregunta</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;¿Seguro que quiere borrar la cuenta seleccionada?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation>Cuantas</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation>[Oculto]</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
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
@@ -1,159 +1,163 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InstallDialog</name>
     <message>
         <source>Install</source>
         <translation>Instalar</translation>
     </message>
     <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>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
         <source>Apply</source>
         <translation>Aplicar</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Actualizar</translation>
     </message>
     <message>
         <source>Setups</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Servidores</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Destinos</translation>
     </message>
     <message>
         <source>Close Section</source>
         <translation>Cerrar sección</translation>
     </message>
     <message>
         <source>Sections</source>
         <translation>Secciones</translation>
     </message>
     <message>
         <source>Filter: </source>
         <translation>Filtro: </translation>
     </message>
     <message>
         <source>Clear Find</source>
         <translation>Limpiar búsqueda</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Cerrar búsqueda</translation>
     </message>
     <message>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
         <source>Clear Search</source>
         <translation>Limpiar búsqueda</translation>
     </message>
     <message>
         <source>Do Search</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Búsqueda</translation>
     </message>
     <message>
         <source>Destination: </source>
         <translation>Destino: </translation>
     </message>
     <message>
         <source>Link</source>
         <translation>Enlace</translation>
     </message>
     <message>
         <source>Close Destinations</source>
         <translation>Cerrar destinos</translation>
     </message>
     <message>
         <source>Package Actions</source>
         <translation>Acciones sobre paquetes</translation>
     </message>
     <message>
         <source>Install</source>
         <translation>Instalar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Package Status</source>
         <translation>Estado de paquetes</translation>
     </message>
     <message>
         <source>New version, installed</source>
         <translation>Nueva versión, instalada</translation>
     </message>
     <message>
         <source>New version, not installed</source>
         <translation>Nueva versión, no instalada</translation>
     </message>
     <message>
         <source>Old version, installed</source>
         <translation>Antigua versión, instalada</translation>
     </message>
     <message>
         <source>Old version, not installed</source>
         <translation>Antigua versión, no instalada</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
@@ -114,130 +114,138 @@
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation>Ftp</translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>Por favor, especifique servidor</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>Incapaz de conectar con
 </translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>Incapaz de registrame en
 </translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>Incapaz de subir
 </translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>No puedo subir directorios</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>Incapaz de descargar
 </translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>Incapaz de listar dir
 </translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>Incapaz de cambiar dir</translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>Incapaz de subir a dir
 </translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>Incapaz de alcanzar dir</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Cambiar directorio</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Actualizar</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Quiere realmente borrar
 </translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation>?
 Debaría estar vacío</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>Incapaz de crear dir
 </translation>
     </message>
     <message>
         <source>Unable to remove directory
 </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
@@ -1,94 +1,102 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Fijar código</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <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>
         <source>Accept sync from network:</source>
         <translation>Sincronización desde red:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>192.168.129.0/24 (predefinido)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Elegir un código proporciona un mínimo nivel de protección contra accesos ocasionales al dispositivo.</translation>
     </message>
 </context>
 </TS>
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
@@ -48,197 +48,205 @@
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Buscar...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Acercar</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Alejar</translation>
     </message>
     <message>
         <source>Bold</source>
         <translation>Negrilla</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation>Cursiva</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Cortar líneas</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Empezar con Nuevo</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Buscar siguiente</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Cerrar Buscar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editor Textos</translation>
     </message>
     <message>
         <source>Text Editor has detected
  you selected a .desktop file.
 Open .desktop file or linked file?</source>
         <translation>El Editor de Texto ha detectado
 que ha seleccionado un .desktop
 ¿Abrir el .desktop o su enlace?</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>Fichero .desktop</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Documento enlazado</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>Sin nombre</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Permisos</translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation>DiálogoLetras</translation>
     </message>
     <message>
         <source>Do you really want
 to delete the current file
 from the disk?
 This is irreversable!!</source>
         <translation>¿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>
         <source>others</source>
         <translation>otros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>leer</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escribir</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecutar</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Error - sin usuario</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Error - sin grupo</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Error fijando propietario o grupo</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Error fijando modo</translation>
     </message>
 </context>
 </TS>
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
@@ -1,127 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Pertenece a </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Por favor, rellene su información personal</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>No hay citas para hoy</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; correos nuevos, &lt;b&gt;%2&lt;/b&gt; salientes</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Hay &lt;b&gt; 1&lt;/b&gt; tarea pendiente: &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Hay &lt;b&gt; %1 &lt;/b&gt; tareas pendientes: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>No hay tareas pendientes</translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Opiemail not installed</source>
         <translation>Opiemail no está instalado</translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation>Configuración de Hoy</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation>¿Debo mostrar el
 lugar de las citas?</translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation>¿Debo mostrar las
 notas de las citas?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation>Mostrar únicamente
 las citas futuras</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation>¿Cuantas citas 
 debo mostrar?</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation>¿Cuantas tareas
 debo mostrar?</translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation>Tareas </translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation>Saltar de línea tras
 cuántas letras</translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation>¿Arrancar Hoy
 al encender?
 (sólo Opie)</translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation>¿Activar Hoy tras
 cuántos minutos
 apagado?</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varios</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/advancedfm.ts b/i18n/fr/advancedfm.ts
index 2a1ee6a..de5070b 100644
--- a/i18n/fr/advancedfm.ts
+++ b/i18n/fr/advancedfm.ts
@@ -56,180 +56,202 @@
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Voulez-vous vraiment effacer</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Impossible de renommer</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Répertoire inexistant</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Copier sous</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Sortie d&apos;AdvancedFm</translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation>la commande n&apos;a pas fonctionnée !</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>A traduire</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Envoie Ir.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Changer de répertoire</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Exécuter</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Ouvrir comme texte</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Créer un lien symbolique</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Déplacer</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Rafraichir</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Information sur le fichier</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Définir les droits</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriétés</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>A traduire</translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation>existe déjà
 Souhaitez-vous vraiment l&apos;effacer ?</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Copier</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Sous</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copier le même répertoire</translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Sauvegarder la sortie dans un fichier</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Définir les droits</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Définir les droits pour :</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propriétaire</translation>
     </message>
     <message>
         <source>group</source>
         <translation>groupe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>autres</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propriétaire</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Groupe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lire</translation>
     </message>
     <message>
         <source>write</source>
         <translation>écrire</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>exécuter</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/appearance.ts b/i18n/fr/appearance.ts
index 4c89218..2c337fa 100644
--- a/i18n/fr/appearance.ts
+++ b/i18n/fr/appearance.ts
@@ -1,254 +1,290 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation>Apparence</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Style</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Thème actuel</translation>
     </message>
     <message>
         <source>More</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Load</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Sauver</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation>Explorer...</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fond d&apos;écran</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation>Editer le thème actuel...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Voulez-vous vraiment effacer</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Effacer le thème</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Impossible d&apos;effacer le thème actuel.</translation>
     </message>
     <message>
         <source>Do you want to apply your changes?
 </source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Open File</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation>Sélectionner</translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation>Activer l&apos;image de fond</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Réglage par défaut</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Voix ambiguë d&apos;un coeur qui au zéphyr préfère les jattes de kiwis</translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation>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>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete"></translation>
     </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Name</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Hidden files</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Type: %1</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
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
@@ -621,148 +621,148 @@ Quitter ?</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>année(s)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>jours</translation>
     </message>
     <message>
         <source>day</source>
         <translation>jour</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semaines</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semaine</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>year</source>
         <translation>année</translation>
     </message>
     <message>
         <source> and </source>
         <translation>et</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 et</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, et</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Evénement qui se répète</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semaine</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mois</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>année</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Tout :</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Fréquence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Fin le :</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Pas de date de fin</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Répéter le</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Jeu</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sam</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dim</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>years</source>
         <translation>années</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/embeddedkonsole.ts b/i18n/fr/embeddedkonsole.ts
index 30e12d0..73c8ab8 100644
--- a/i18n/fr/embeddedkonsole.ts
+++ b/i18n/fr/embeddedkonsole.ts
@@ -62,148 +62,152 @@
     <message>
         <source>Enter</source>
         <translation>Entrée</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espace</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tabulation</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Monter</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Descendre</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Afficher la liste des commandes</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Cacher la liste des commandes</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>Tabs en bas</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Vert sur noir</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Noir sur blanc</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Blanc sur noir</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Noir sur transparent</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Noir sur rouge</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Rouge sur noir</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Vert sur jaune</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Bleue sur magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta sur bleue</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cyan sur blanc</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Blanc sur cyan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Bleue sur noir</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ambre sur noir</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Edition rapide</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Gauche</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Droite</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barre de défilement</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Afficher la liste des commandes</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Cacher la liste des commandes</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personaliser</translation>
     </message>
+    <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
@@ -17,220 +17,236 @@
     <message>
         <source>Password:</source>
         <translation>Mot de passe :</translation>
     </message>
     <message>
         <source>Phone:</source>
         <translation>Numéro de téléphone :</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nom : </translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>Modem</translation>
     </message>
     <message>
         <source>AT-dial:</source>
         <translation>AT-dial :</translation>
     </message>
     <message>
         <source>ATDT</source>
         <translation>ATDT</translation>
     </message>
     <message>
         <source>ATDP</source>
         <translation>ATDP</translation>
     </message>
     <message>
         <source>Speed:</source>
         <translation>Vitesse de connection :</translation>
     </message>
     <message>
         <source>4800</source>
         <translation>4800</translation>
     </message>
     <message>
         <source>9600</source>
         <translation>9600</translation>
     </message>
     <message>
         <source>19200</source>
         <translation>19200</translation>
     </message>
     <message>
         <source>38400</source>
         <translation>38400</translation>
     </message>
     <message>
         <source>57600</source>
         <translation>57600</translation>
     </message>
     <message>
         <source>115200</source>
         <translation>115200</translation>
     </message>
     <message>
         <source>Wait time:</source>
         <translation>Temps d&apos;attente :</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
         <source>Flow control:</source>
         <translation>Contrôle de flux :</translation>
     </message>
     <message>
         <source>Hardware flow control</source>
         <translation>Contrôle de flux matériel</translation>
     </message>
     <message>
         <source>Demand Dialing</source>
         <translation>Demande de numérotation</translation>
     </message>
     <message>
         <source>Manual connect and disconnect</source>
         <translation>Connection et déconnection manuel </translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>secondes</translation>
     </message>
     <message>
         <source>Idle timeout:</source>
         <translation>Duré d&apos;attente sans activité :</translation>
     </message>
     <message>
         <source>Automatic connect and disconnect</source>
         <translation>Connection et déconnection automatique</translation>
     </message>
     <message>
         <source>Manual connect, automatic disconnect</source>
         <translation>Connection manuel, déconnection automatique</translation>
     </message>
     <message>
         <source>Network</source>
         <translation>Réseau</translation>
     </message>
     <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>
         <source>No carrier</source>
         <translation>Pas de porteuse</translation>
     </message>
     <message>
         <source>Number is busy</source>
         <translation>Le numéro est occupé</translation>
     </message>
     <message>
         <source>Timed out</source>
         <translation>Durée maximale sans activité atteinte</translation>
     </message>
     <message>
         <source>Connection failed</source>
         <translation>Echec de la connection</translation>
     </message>
     <message>
         <source>Authentication Failed</source>
         <translation>Echec de l&apos;authentification</translation>
     </message>
     <message>
         <source>Connected</source>
         <translation>Connecté</translation>
     </message>
 </context>
 <context>
     <name>ProxiesPageBase</name>
     <message>
         <source>Proxy Settings</source>
         <translation>Paramètres des serveurs relais (proxies)</translation>
     </message>
     <message>
         <source>No proxies</source>
         <translation>Pas de serveurs relais</translation>
     </message>
     <message>
         <source>Auto configure proxies</source>
         <translation>Configuration automatique des serveurs relais</translation>
     </message>
     <message>
         <source>Set proxies</source>
         <translation>Définition des serveurs relais</translation>
     </message>
     <message>
         <source>Config:</source>
         <translation>Configuration :</translation>
     </message>
     <message>
         <source>Port:</source>
         <translation>Port :</translation>
     </message>
     <message>
         <source>HTTP:</source>
         <translation>HTTP :</translation>
     </message>
     <message>
         <source>FTP:</source>
         <translation>FTP : </translation>
     </message>
     <message>
         <source>Host:</source>
         <translation>Nom d&apos;hôte :</translation>
     </message>
     <message>
         <source>No proxies for:</source>
         <translation>Pas de serveurs relais pour :</translation>
     </message>
 </context>
 </TS>
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
@@ -21,155 +21,174 @@
         <source>Sat:</source>
         <translation>Saturation :</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>Valeur :</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Rouge :</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Vert :</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Bleu :</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation>Canal alpha :</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Sélectionner une couleur</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>Boite de dialogue de fichiers</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Sauver</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
         <translation>Documents</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Fichiers</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Tous les fichiers</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nom :</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Sauver</translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Type Mime</translation>
     </message>
     <message>
         <source>Ser Permission</source>
         <translation>Définir les droits</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Voulez-vous vraiment effacer
 </translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
 </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>
     </message>
 </context>
 </TS>
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
@@ -102,455 +102,455 @@ est en train d&apos;éditer les catégories.</translation>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>Create a new Document</source>
         <translation>Créer un nouveau document</translation>
     </message>
     <message>
         <source>Close the File Selector</source>
         <translation>Ferme le sélecteur de fichiers</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>There are no files in this directory.</source>
         <translation>Ce répertroire est vide.</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>La chaîne n&apos;a pas été trouvée.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation>Fin atteinte, reprise au début</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Trouver</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Trouver : </translation>
     </message>
     <message>
         <source>&amp;Find</source>
         <translation>&amp;Trouver</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie :</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Débuter la recherche à :</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>01 Dec 02</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Respecter la casse</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Recherche en sens inverse</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Vue &quot;Document&quot;</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Echec de l&apos;effacement du fichier.</translation>
     </message>
     <message>
         <source>Delete Icon and leave file</source>
         <translation>Effacer l&apos;icone et conserver fichier</translation>
     </message>
     <message>
         <source>Icon deletion failed.</source>
         <translation>Echec de l&apos;effacement de l&apos;icone.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Copie de</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliquer</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Echec de la copie de fichier.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Echec du déplacement du fichier.</translation>
     </message>
     <message>
         <source>File does not exist.</source>
         <translation>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>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
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
@@ -109,257 +109,257 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="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>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -1,159 +1,163 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InstallDialog</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -102,130 +102,138 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ?
 It must be empty</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>Unable to make directory
 </source>
         <translation type="unfinished"></translation>
     </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>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
@@ -1,93 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/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
@@ -44,197 +44,205 @@
         <source>Save As</source>
         <translation type="unfinished">Enregistrer Sous</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished">Couper</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished">Copier</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished">Coller</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished">Chercher...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bold</source>
         <translation type="unfinished">Gras</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished">Italique</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished">Fichier</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Edition</translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Effacer</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished">Editeur Texte</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want
 to delete the current file
 from the disk?
 This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
         <source>Owner</source>
         <translation type="unfinished">Propriétaire</translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished">Groupe</translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished">lectire</translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished">écriture</translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,117 +1,121 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/advancedfm.ts b/i18n/hu/advancedfm.ts
index 5f33236..ce9fab3 100644
--- a/i18n/hu/advancedfm.ts
+++ b/i18n/hu/advancedfm.ts
@@ -54,180 +54,202 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/appearance.ts b/i18n/hu/appearance.ts
index ba6187f..7c20f02 100644
--- a/i18n/hu/appearance.ts
+++ b/i18n/hu/appearance.ts
@@ -1,109 +1,145 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="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
@@ -61,148 +61,152 @@
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</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>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <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
@@ -16,220 +16,236 @@
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT-dial:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4800</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Wait time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Demand Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual connect and disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Idle timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic connect and disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual connect, automatic disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>No carrier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number is busy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timed out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProxiesPageBase</name>
     <message>
         <source>Proxy Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto configure proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies for:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -19,155 +19,174 @@
     <message>
         <source>Sat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ser Permission</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
     </message>
 </context>
 </TS>
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
@@ -109,257 +109,257 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="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>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -1,159 +1,163 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InstallDialog</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -102,130 +102,138 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ?
 It must be empty</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>Unable to make directory
 </source>
         <translation type="unfinished"></translation>
     </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>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
@@ -1,93 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/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
@@ -44,197 +44,205 @@
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want
 to delete the current file
 from the disk?
 This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,117 +1,121 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/advancedfm.ts b/i18n/ja/advancedfm.ts
index 5f33236..ce9fab3 100644
--- a/i18n/ja/advancedfm.ts
+++ b/i18n/ja/advancedfm.ts
@@ -54,180 +54,202 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/appearance.ts b/i18n/ja/appearance.ts
index ba6187f..7c20f02 100644
--- a/i18n/ja/appearance.ts
+++ b/i18n/ja/appearance.ts
@@ -1,109 +1,145 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="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
@@ -61,148 +61,152 @@
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</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>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <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
@@ -16,220 +16,236 @@
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT-dial:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4800</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Wait time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Demand Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual connect and disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Idle timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic connect and disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual connect, automatic disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>No carrier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number is busy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timed out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProxiesPageBase</name>
     <message>
         <source>Proxy Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto configure proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies for:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -19,155 +19,174 @@
     <message>
         <source>Sat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ser Permission</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
     </message>
 </context>
 </TS>
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
@@ -109,257 +109,257 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="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>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -1,159 +1,163 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InstallDialog</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -102,130 +102,138 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ?
 It must be empty</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>Unable to make directory
 </source>
         <translation type="unfinished"></translation>
     </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>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
@@ -1,93 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/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
@@ -44,197 +44,205 @@
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want
 to delete the current file
 from the disk?
 This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,117 +1,121 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/advancedfm.ts b/i18n/ko/advancedfm.ts
index 5f33236..ce9fab3 100644
--- a/i18n/ko/advancedfm.ts
+++ b/i18n/ko/advancedfm.ts
@@ -54,180 +54,202 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/appearance.ts b/i18n/ko/appearance.ts
index ba6187f..7c20f02 100644
--- a/i18n/ko/appearance.ts
+++ b/i18n/ko/appearance.ts
@@ -1,109 +1,145 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="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
@@ -61,148 +61,152 @@
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</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>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <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
@@ -16,220 +16,236 @@
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT-dial:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4800</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Wait time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Demand Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual connect and disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Idle timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic connect and disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual connect, automatic disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>No carrier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number is busy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timed out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProxiesPageBase</name>
     <message>
         <source>Proxy Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto configure proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies for:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -19,155 +19,174 @@
     <message>
         <source>Sat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ser Permission</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
     </message>
 </context>
 </TS>
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
@@ -109,257 +109,257 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="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>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -1,159 +1,163 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InstallDialog</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -102,130 +102,138 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ?
 It must be empty</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>Unable to make directory
 </source>
         <translation type="unfinished"></translation>
     </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>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
@@ -1,93 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/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
@@ -44,197 +44,205 @@
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want
 to delete the current file
 from the disk?
 This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,117 +1,121 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/todolist.ts b/i18n/ko/todolist.ts
index 8658490..8d7d35b 100644
--- a/i18n/ko/todolist.ts
+++ b/i18n/ko/todolist.ts
@@ -1,214 +1,214 @@
 <!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>
     <message>
         <source>Deadline</source>
         <translation>마감</translation>
     </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation>할일</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>자리 부족</translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation>시작 파일들을 만들수 없습니다.
 정보를 입력하기 전에 
 자리를 비워두시기 바랍니다.</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation>새 할일</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>무선 전송</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>찾기</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation>성취한 일들을 표시</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>현제 싱크 중이므로 데이타 편집 불가</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>할일 편집</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation>모든 분류</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>정리 안된것들</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>자리 부족</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>수정된 데이타를 저장할수 
 없었습니다.
 자리를 비우시고 
 다시 해보시기 바랍니다.
 
 그래도 끝낼까요?</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation>마감일을 표시</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>데이타</translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation>글꼴</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation>할일 보기</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation>지우기...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation>모두 지우기...</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>복사 하기</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>분류</translation>
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
@@ -54,180 +54,202 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/appearance.ts b/i18n/no/appearance.ts
index ba6187f..7c20f02 100644
--- a/i18n/no/appearance.ts
+++ b/i18n/no/appearance.ts
@@ -1,109 +1,145 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="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
@@ -61,148 +61,152 @@
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</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>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <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
@@ -16,220 +16,236 @@
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT-dial:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4800</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Wait time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Demand Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual connect and disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Idle timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic connect and disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual connect, automatic disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>No carrier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number is busy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timed out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProxiesPageBase</name>
     <message>
         <source>Proxy Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto configure proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies for:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -19,155 +19,174 @@
     <message>
         <source>Sat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ser Permission</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
     </message>
 </context>
 </TS>
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
@@ -109,257 +109,257 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="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>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -1,159 +1,163 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InstallDialog</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -102,130 +102,138 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ?
 It must be empty</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>Unable to make directory
 </source>
         <translation type="unfinished"></translation>
     </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>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
@@ -1,93 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/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
@@ -44,197 +44,205 @@
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want
 to delete the current file
 from the disk?
 This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,117 +1,121 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/advancedfm.ts b/i18n/pl/advancedfm.ts
index 5f33236..ce9fab3 100644
--- a/i18n/pl/advancedfm.ts
+++ b/i18n/pl/advancedfm.ts
@@ -54,180 +54,202 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/appearance.ts b/i18n/pl/appearance.ts
index 769fdd0..8f87b84 100644
--- a/i18n/pl/appearance.ts
+++ b/i18n/pl/appearance.ts
@@ -1,110 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation>Wyglad</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Styl</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation>Edytuj aktualny schemat...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Kolory</translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation>Wyszukaj...</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Tlo</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Usun schemat</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Naprade chcesz skasowac schemat?
 </translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Nie mozna usunac aktualnego schematu.</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Aktualny schemat</translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Rozmiar</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="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
@@ -61,148 +61,152 @@
     <message>
         <source>Green on Black</source>
         <translation>Zielone na czarnym</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Czarne na bialym</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Biale na czarnym</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Biale na przezroczystym</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Czarne na czerwonym</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Czerwone na czarnym</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Zielone na zoltym</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Niebieskie na magneta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magneta na Niebieskim</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cyan na bialym</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Biale na cyanie</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Niebieskie na czarnym</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Amber na czarnym</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Kolory</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Wprowadz</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Spacja</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tabulator</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Gora</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Szybka edycja</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edycja</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <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
@@ -16,220 +16,236 @@
     <message>
         <source>Password:</source>
         <translation>Haslo:</translation>
     </message>
     <message>
         <source>Phone:</source>
         <translation>Telefon:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT-dial:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Speed:</source>
         <translation>Predkosc:</translation>
     </message>
     <message>
         <source>4800</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Wait time:</source>
         <translation>Czas oczekiwania:</translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control:</source>
         <translation>Kontrola przeplywu:</translation>
     </message>
     <message>
         <source>Hardware flow control</source>
         <translation>Sprzetowa</translation>
     </message>
     <message>
         <source>Demand Dialing</source>
         <translation>Na zadanie</translation>
     </message>
     <message>
         <source>Manual connect and disconnect</source>
         <translation>Reczne</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation> sekund</translation>
     </message>
     <message>
         <source>Idle timeout:</source>
         <translation>Czas bezczynnosci</translation>
     </message>
     <message>
         <source>Automatic connect and disconnect</source>
         <translation>Automatyczne</translation>
     </message>
     <message>
         <source>Manual connect, automatic disconnect</source>
         <translation>Reczne dzwonienie, automatyczne rozlaczanie</translation>
     </message>
     <message>
         <source>Network</source>
         <translation>Siec</translation>
     </message>
     <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>
         <source>No carrier</source>
         <translation>Brak nosnej</translation>
     </message>
     <message>
         <source>Number is busy</source>
         <translation>Numer zajety</translation>
     </message>
     <message>
         <source>Timed out</source>
         <translation>Czas zakonczony</translation>
     </message>
     <message>
         <source>Connection failed</source>
         <translation>Polaczenie nie powiodlo sie</translation>
     </message>
     <message>
         <source>Authentication Failed</source>
         <translation>Blad autoryzacji</translation>
     </message>
     <message>
         <source>Connected</source>
         <translation>Polaczony</translation>
     </message>
 </context>
 <context>
     <name>ProxiesPageBase</name>
     <message>
         <source>Proxy Settings</source>
         <translation>Ustwienia proxy</translation>
     </message>
     <message>
         <source>No proxies</source>
         <translation>Bez proxy</translation>
     </message>
     <message>
         <source>Auto configure proxies</source>
         <translation>Automatyczna konfiguracja proxy</translation>
     </message>
     <message>
         <source>Set proxies</source>
         <translation>Ustaw proxy</translation>
     </message>
     <message>
         <source>Config:</source>
         <translation>Ustwienia:</translation>
     </message>
     <message>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
         <source>HTTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies for:</source>
         <translation>Bezposrednio dla:</translation>
     </message>
 </context>
 </TS>
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
@@ -19,155 +19,174 @@
     <message>
         <source>Sat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ser Permission</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
     </message>
 </context>
 </TS>
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
@@ -109,257 +109,257 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="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>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -1,159 +1,163 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InstallDialog</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -116,130 +116,138 @@
     <message>
         <source>Please set the server info</source>
         <translation>Prosze ustawic informacje o serwerze</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Notatka</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>Nie moge polaczyc do
 </translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>Nie moge sie zalogowac w
 </translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>Nie moge zaladowac
 </translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>Nie moge zaladowac katalogow</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>Nie moge sciagnac
 </translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>Nie moge wylistowac katalogu
 </translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>Nie moge zmienic katalogow
 </translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>Nie moge zmienic katalogu w gore
 </translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>Nie moge pobrac katalogu
 </translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Zmien katalog</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Naprawde chcesz skasowac
 </translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation> ?
 To musi byc puste</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>Nie moge utworzyc katalogu
 </translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>Nie moge usunac katalogu
 </translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>Nie moge usunac pliku
 </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
@@ -1,94 +1,102 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Ustaw haslo</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <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>
         <source>Accept sync from network:</source>
         <translation>Akceptuj synchronizacje z sieci:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Kazdy</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Haslo zabezpieczajace pozwala na minimalny poziom zabezpieczen do tego urzadzenia.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/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
@@ -46,197 +46,205 @@
     </message>
     <message>
         <source>Cut</source>
         <translation>Wytnij</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Znajdz...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Powieksz</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Pomniejsz</translation>
     </message>
     <message>
         <source>Bold</source>
         <translation>Pogrobiona</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation>Pochyla</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Zawijal linie</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Zacznij w nowym pliku</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Plik</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edycja</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Znajdz nastepny</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Zamknij wyszukiwanie</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Edytor tekstu</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>Nienazwany</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Uprawnienia</translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation>WyborCzcionki</translation>
     </message>
     <message>
         <source>Do you really want
 to delete the current file
 from the disk?
 This is irreversable!!</source>
         <translation>Czy naprawde
 chcesz usunac ten plikz dysku?
 To jest nieodwracalne!</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected
  you selected a .desktop file.
 Open .desktop file or linked file?</source>
         <translation type="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>
         <source>others</source>
         <translation>inni</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Wlasciciel</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupa</translation>
     </message>
     <message>
         <source>read</source>
         <translation>odczyt</translation>
     </message>
     <message>
         <source>write</source>
         <translation>zapis</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>wykonywanie</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Uwaga</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Blad- nie ma uzytkownika</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Blad- brak grupy</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Blad ustawiania uprawnien</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Blad ustawienia trybu</translation>
     </message>
 </context>
 </TS>
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
@@ -1,117 +1,121 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/advancedfm.ts b/i18n/pt/advancedfm.ts
index d62968a..5508dd1 100644
--- a/i18n/pt/advancedfm.ts
+++ b/i18n/pt/advancedfm.ts
@@ -54,180 +54,202 @@
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Executar</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Re-Lêr</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriedades</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>outros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>ler</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escrever</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>executar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/appearance.ts b/i18n/pt/appearance.ts
index 8f9d02b..d04c594 100644
--- a/i18n/pt/appearance.ts
+++ b/i18n/pt/appearance.ts
@@ -1,110 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation>Aparência</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation>Editar o esquema actual...</translation>
     </message>
     <message>
         <source>Select</source>
         <translation>Selecionar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Cores</translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation>Activar imagem de fundo</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Omissão</translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation>Procurar...</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fundo</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Apagar esquema</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Tem a certeza que quer apagar
 </translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>O esquema actual não pode ser apagado.</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Esquema actual</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>A rápida raposa castanha salta sobre o cão molenga</translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation>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
@@ -61,148 +61,152 @@
     <message>
         <source>Green on Black</source>
         <translation>Verde em Preto</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Preto em Branco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Branco em Preto</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Preto em Transparente</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Preto em Vermelho</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Vermelho em Preto</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Verde em Amarelo</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Azul em Magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta em Azul</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Ciano em Branco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Branco em Ciano</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Azul em Preto</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ambar em Preto</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Cores</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fontes</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espaço</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Edição Rápida</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <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
@@ -16,220 +16,236 @@
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT-dial:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4800</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Wait time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Demand Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual connect and disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Idle timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic connect and disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual connect, automatic disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>No carrier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number is busy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timed out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProxiesPageBase</name>
     <message>
         <source>Proxy Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto configure proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies for:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -19,155 +19,174 @@
     <message>
         <source>Sat:</source>
         <translation>Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Vermelho:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Escolha cor</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Ficheiros</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Todos os Ficheiros</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Gravar</translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
         <translation>C&amp;ancelar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ser Permission</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
 </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>
     </message>
 </context>
 </TS>
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
@@ -109,257 +109,257 @@
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished">Correio</translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="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>
     </message>
     <message>
         <source>Prio.</source>
         <translation>Prio.</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baixa</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Apagar</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation>Contas</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
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
@@ -1,159 +1,163 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InstallDialog</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -102,130 +102,138 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ?
 It must be empty</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>Unable to make directory
 </source>
         <translation type="unfinished"></translation>
     </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
@@ -1,93 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -44,197 +44,205 @@
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected
  you selected a .desktop file.
 Open .desktop file or linked file?</source>
         <translation type="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>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want
 to delete the current file
 from the disk?
 This is irreversable!!</source>
         <translation type="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>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,125 +1,129 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; novo(s) email(s), &lt;b&gt;%2&lt;/b&gt; na caixa de saída</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Existe &lt;b&gt; 1&lt;/b&gt; tarefa activa: &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Existem &lt;b&gt; %1&lt;/b&gt; tarefas activas: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Não existem tarefas activas</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Não existem eventos hoje</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>De</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Deve preencher o cartão de visita</translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation>O OpieMail não está instalado</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation>Mostrar
 localização?</translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation>Mostrar
 notas?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation>Mostrar apenas
 os últimos eventos</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation>Mostrar quantas 
 tarefas?</translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation>Tarefas</translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation>Cortar ao fim
 de quantas letras</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vários</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation>Mostrar quantos
 eventos?</translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation>Lançar ao ligar? 
 (Apenas no Opie)</translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation>Mostrar ao fim de 
 quantos minutos?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/advancedfm.ts b/i18n/pt_BR/advancedfm.ts
index 5f33236..ce9fab3 100644
--- a/i18n/pt_BR/advancedfm.ts
+++ b/i18n/pt_BR/advancedfm.ts
@@ -54,180 +54,202 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/appearance.ts b/i18n/pt_BR/appearance.ts
index 0fbe756..391a1c8 100644
--- a/i18n/pt_BR/appearance.ts
+++ b/i18n/pt_BR/appearance.ts
@@ -1,110 +1,146 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation type="unfinished">Aparncia</translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="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
@@ -62,148 +62,152 @@
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espaço</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Fixa Média</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Fixa Pequena</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>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <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
@@ -17,220 +17,236 @@
     <message>
         <source>Idle timeout:</source>
         <translation type="unfinished">Tempo limite de ociosidade</translation>
     </message>
     <message>
         <source>Network</source>
         <translation type="unfinished">Rede</translation>
     </message>
     <message>
         <source>Phone:</source>
         <translation type="unfinished">Telefone:</translation>
     </message>
     <message>
         <source>Speed:</source>
         <translation type="unfinished">Velocidade:</translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation type="unfinished">DNS Secundário</translation>
     </message>
     <message>
         <source>Wait time:</source>
         <translation type="unfinished">Tempo de espera:</translation>
     </message>
     <message>
         <source>Demand Dialing</source>
         <translation type="unfinished">Discagem por demanda</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished">Proxy</translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished">Conta</translation>
     </message>
     <message>
         <source>Hardware flow control</source>
         <translation type="unfinished">Controle de fluxo por hardware</translation>
     </message>
     <message>
         <source>Flow control:</source>
         <translation type="unfinished">Controle de fluxo</translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation type="unfinished">DNS Primário</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"> segundos</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished">Senha:</translation>
     </message>
     <message>
         <source>Manual connect, automatic disconnect</source>
         <translation type="unfinished">Conexão manual, desconexão automática</translation>
     </message>
     <message>
         <source>Automatic connect and disconnect</source>
         <translation type="unfinished">Conexão e desconexão automáticas</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished">Nome de Usuário:</translation>
     </message>
     <message>
         <source>Auto-detect routing</source>
         <translation type="unfinished">Auto detectar rota</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished">Gateway</translation>
     </message>
     <message>
         <source>Manual connect and disconnect</source>
         <translation type="unfinished">Conexão e desconexão manuais</translation>
     </message>
     <message>
         <source>Dial-up </source>
         <translation type="unfinished">Conexão Discada</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT-dial:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4800</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>No carrier</source>
         <translation type="unfinished">Sem Portadora</translation>
     </message>
     <message>
         <source>Number is busy</source>
         <translation type="unfinished">Número ocupado</translation>
     </message>
     <message>
         <source>Timed out</source>
         <translation type="unfinished">Tempo esgotado</translation>
     </message>
     <message>
         <source>Connection failed</source>
         <translation type="unfinished">Conexão falhou</translation>
     </message>
     <message>
         <source>Authentication Failed</source>
         <translation type="unfinished">Autenticação Falhou</translation>
     </message>
     <message>
         <source>Connected</source>
         <translation type="unfinished">Conectado</translation>
     </message>
 </context>
 <context>
     <name>ProxiesPageBase</name>
     <message>
         <source>Proxy Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto configure proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies for:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -19,155 +19,174 @@
     <message>
         <source>Sat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ser Permission</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
     </message>
 </context>
 </TS>
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
@@ -109,257 +109,257 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="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>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -1,159 +1,163 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InstallDialog</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -103,130 +103,138 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ?
 It must be empty</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>Unable to make directory
 </source>
         <translation type="unfinished"></translation>
     </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>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
@@ -1,95 +1,103 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Security</name>
     <message>
         <source>Any</source>
         <translation>Qualquer</translation>
     </message>
     <message>
         <source>None</source>
         <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>
         <source>Security Settings</source>
         <translation type="unfinished">Ajustes</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished">Limpar a senha</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished">Requisitar senha ao ligar</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished">&lt;P&gt;A senha provê um nível mínimo de segurança quantra o acesso casual a este dispositivo.</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished">192.168.129.0/24 (padrão)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -45,197 +45,205 @@
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Arquivo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Aproximar</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Quebrar linhas</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Localizar Próx.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editor de Texto</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation>Itálico</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Afastar</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Fechar Localização</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Salvar Como</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>Sem Nome</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Localizar...</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Iniciar com novo arquivo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">Fonte</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want
 to delete the current file
 from the disk?
 This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
         <source>write</source>
         <translation>escrever</translation>
     </message>
     <message>
         <source>others</source>
         <translation>outros</translation>
     </message>
     <message>
         <source>Set File Permissions</source>
         <translation>Ajustar Permissões de Arquivo</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>executar</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Ajustar permissões de arquivo para:</translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,125 +1,129 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; nova(s) mensagem(ns), &lt;b&gt;%2&lt;/b&gt; saída</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Existem &lt;b&gt; 1&lt;/b&gt; tarefas ativas:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Existem &lt;b&gt; %1&lt;/b&gt; tarefas ativas: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Nenhuma tarefa ativa</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished">Nenhum compromisso hoje</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation>Opiemail não instalado</translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished">Hoje</translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation>Quantas
 tarefas devem 
 ser mostradas ?</translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation>Tarefas</translation>
     </message>
     <message>
         <source>Today config</source>
         <translation>Configuração do Hoje</translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation>As notas devem 
 ser mostradas ?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation>Mostrar apenas
 compr. atrasados</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation>A localização 
 deve ser 
 mostrada ?</translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation>Truncar após
 quantas letras</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Misc</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/advancedfm.ts b/i18n/sl/advancedfm.ts
index 46f076f..4de0ee2 100644
--- a/i18n/sl/advancedfm.ts
+++ b/i18n/sl/advancedfm.ts
@@ -55,180 +55,202 @@
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Ali res želite izbrisati
 </translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Note</source>
         <translation></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Ne morem preimenovati</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ta imenik ne obstaja</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Prekopiraj kot</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>NapredniDu izhod</translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation>ukaz spodletel!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Vredu</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Naprednidu prežarči ven</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir poslan.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Zamenjaj imenik</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Izvrši</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Odpri kot besedilo</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Ustvari povezavo</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Prestavi</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Preglej</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Informacije o datoteki</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Nastavi pravice</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Lastnosti</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Prežarči datoteko</translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation>že obstaja Ali res želite izbrisati?</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Kot</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Kopiraj isti imenik</translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Shrani izhod v datoteko (samo ime)</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Nastavi datotečne pravice</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Nastavi datotečne pravice za:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>lastnik</translation>
     </message>
     <message>
         <source>group</source>
         <translation>skupina</translation>
     </message>
     <message>
         <source>others</source>
         <translation>drugi</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Lastnik</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
     <message>
         <source>read</source>
         <translation>beri</translation>
     </message>
     <message>
         <source>write</source>
         <translation>piši</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>izvrši</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/appearance.ts b/i18n/sl/appearance.ts
index 4624411..4d1fcef 100644
--- a/i18n/sl/appearance.ts
+++ b/i18n/sl/appearance.ts
@@ -1,110 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation>Videz</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Trenutna shema</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Shrani</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Barve</translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation>Prebrskaj...</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Ozadje</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation>Nastavi trenutno shemo...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Ali res želite izbrisati
 </translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Izbriši shemo</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Ne morem izbrisati trenutne sheme.</translation>
     </message>
     <message>
         <source>Select</source>
         <translation>Izberi</translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation>Vklopi sliko ozadja</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Privzeto</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Hitra lisica skoči čez lenega psa</translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation>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
@@ -61,148 +61,152 @@
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Presledek</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Gor</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Prilepi</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>Tabs on Bottom</source>
         <translation>Jezički na dnu</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Zelena na črni</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Črna na beli</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Bela na črni</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Črna na prozorni</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Črna na rdeči</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Rdeča na črni</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Zelena na rumeni</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Modra na Vijolčni</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Vijolčna na modri</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Svetlo modra na beli</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Bela na svetlo modri</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Modra na črni</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Amber na črni</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Barve</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Hitro uredi</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <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
@@ -16,220 +16,236 @@
     <message>
         <source>Password:</source>
         <translation>Geslo:</translation>
     </message>
     <message>
         <source>Phone:</source>
         <translation>Telefon:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>Modem</translation>
     </message>
     <message>
         <source>AT-dial:</source>
         <translation>AT-klici:</translation>
     </message>
     <message>
         <source>ATDT</source>
         <translation>ATDT</translation>
     </message>
     <message>
         <source>ATDP</source>
         <translation>ATDP</translation>
     </message>
     <message>
         <source>Speed:</source>
         <translation>Hitrost:</translation>
     </message>
     <message>
         <source>4800</source>
         <translation>4800</translation>
     </message>
     <message>
         <source>9600</source>
         <translation>9600</translation>
     </message>
     <message>
         <source>19200</source>
         <translation>19200</translation>
     </message>
     <message>
         <source>38400</source>
         <translation>38400</translation>
     </message>
     <message>
         <source>57600</source>
         <translation>57600</translation>
     </message>
     <message>
         <source>115200</source>
         <translation>115200</translation>
     </message>
     <message>
         <source>Wait time:</source>
         <translation>Čas čakanja:</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>sec</source>
         <translation>sek</translation>
     </message>
     <message>
         <source>Flow control:</source>
         <translation>Kontrola pretoka:</translation>
     </message>
     <message>
         <source>Hardware flow control</source>
         <translation>Strojna kontrola pretoka</translation>
     </message>
     <message>
         <source>Demand Dialing</source>
         <translation>Klic na zahtevo</translation>
     </message>
     <message>
         <source>Manual connect and disconnect</source>
         <translation>Ročno poveži in prekini</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>sekund</translation>
     </message>
     <message>
         <source>Idle timeout:</source>
         <translation>Nedajvnostni odklop:</translation>
     </message>
     <message>
         <source>Automatic connect and disconnect</source>
         <translation>Avtomatično poveži in prekini</translation>
     </message>
     <message>
         <source>Manual connect, automatic disconnect</source>
         <translation>Ročno poveži, avtomatično prekini</translation>
     </message>
     <message>
         <source>Network</source>
         <translation>Mreža</translation>
     </message>
     <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>
         <source>No carrier</source>
         <translation>Brez nosilca</translation>
     </message>
     <message>
         <source>Number is busy</source>
         <translation>Številka je zasedena</translation>
     </message>
     <message>
         <source>Timed out</source>
         <translation>Čas se je iztekel</translation>
     </message>
     <message>
         <source>Connection failed</source>
         <translation>Neuspešna povezava</translation>
     </message>
     <message>
         <source>Authentication Failed</source>
         <translation>Neuspešna avtorizacija</translation>
     </message>
     <message>
         <source>Connected</source>
         <translation>Povezan</translation>
     </message>
 </context>
 <context>
     <name>ProxiesPageBase</name>
     <message>
         <source>Proxy Settings</source>
         <translation>Nastavitve Proxy strežnika</translation>
     </message>
     <message>
         <source>No proxies</source>
         <translation>Brez Proxy strežnikov</translation>
     </message>
     <message>
         <source>Auto configure proxies</source>
         <translation>Samonastavi Proxy strežnik</translation>
     </message>
     <message>
         <source>Set proxies</source>
         <translation>Nastavi Proxy strežnik</translation>
     </message>
     <message>
         <source>Config:</source>
         <translation>Nastavitve:</translation>
     </message>
     <message>
         <source>Port:</source>
         <translation>Vrata:</translation>
     </message>
     <message>
         <source>HTTP:</source>
         <translation>HTTP:</translation>
     </message>
     <message>
         <source>FTP:</source>
         <translation>FTP:</translation>
     </message>
     <message>
         <source>Host:</source>
         <translation>Gostitelj:</translation>
     </message>
     <message>
         <source>No proxies for:</source>
         <translation>Brez Proxy strežnika za:</translation>
     </message>
 </context>
 </TS>
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
@@ -20,155 +20,174 @@
         <source>Sat:</source>
         <translation>Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Rdeča:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Zelena:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Modra:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation>Alfa kanal:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Izberi barvo</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>DatotečniDialog</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Odpri</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Shrani</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
         <translation>Dokumenti</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Datoteke</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Vse datoteke</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Shrani</translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
         <translation>P&amp;rekliči</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Mime tip</translation>
     </message>
     <message>
         <source>Ser Permission</source>
         <translation>Pravice uporabnika</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Ali res želite izbrisati
 </translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
 </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>
     </message>
 </context>
 </TS>
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
@@ -109,257 +109,257 @@
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>Ni nobenih vnosov v imeniku.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Napaka</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Izbrati morate najmanj en naslov.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation>Pobiralec naslovov</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation>Napaka</translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation>Prosim prvo izberite vnos.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation>Nastavi opis</translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation>&lt;div align=center&gt;Opis</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation>&lt;p&gt;Morate izbrati naslovnika.&lt;br&gt;(primer: nekdo@nekje.si)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Prišlo je do problema pri pošiljanju čakajoče pošte.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Success</source>
         <translation>Uspeh</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation>&lt;p&gt;Sporočilo uspešno čaka v vrsti.&lt;/p&gt;&lt;p&gt;Vrsta vsebuje</translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation>sporočil.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation>&lt;font color=#ff0000&gt;Napaka se je pojavila pri pošiljanju.&lt;/font&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation>&lt;p&gt;%1&lt;/p</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Sporočilo je bilo uspešno poslano.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation>&lt;p&gt;Čakajoča sporočila</translation>
     </message>
     <message>
         <source> of </source>
         <translation>od</translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation>Sestavi sporočilo</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Pošta</translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation>Pošlji pošto</translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation>Postavi pošto v vrsto</translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation>Pripni datoteko</translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation>Imenik</translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation>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>
     </message>
     <message>
         <source>Prio.</source>
         <translation>Prio.</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Nizka</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normalna</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Visoka</translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation>Dodaj prilogo</translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation>Odstrani prilogo</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Preimenuj</translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation>Zamenjaj opis</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation>Napaka</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Najprej morate izbrati račun.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Vprašanje</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Ali res želite izbrisati izbrani račun?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation>Nastavitve</translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation>Računi</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation>[Skrit]</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
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
@@ -1,159 +1,163 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InstallDialog</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation>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>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -103,130 +103,138 @@
     </message>
     <message>
         <source>Port</source>
         <translation>Vrata</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Nastavitve</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation>Ftp</translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>Prosimo nastavite informacije o strežniku</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Zapiski</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>Ne uspem se povezati na</translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>Ne uspem se prijaviti v</translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>Ne uspem prenesti od sebe</translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>Ne morem prenesti od sebe imenikov</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>Ne uspem prenesti k sebi</translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>Ne uspem dobiti seznama v imeniku</translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>Ne uspem zamenjati imenika</translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>Ne uspem zamenjati imenika</translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>Ne uspem dobiti delovnega imenika</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Zamenjaj imenik</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Ali res želite izbrisati</translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation>?
 Mora biti prazen</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>Ne uspem ustvariti imenika</translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>Ne uspem odstraniti imenika</translation>
     </message>
     <message>
         <source>Unable to delete file
 </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
@@ -1,94 +1,102 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Nastavi kodo</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <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>
         <source>Accept sync from network:</source>
         <translation>Sperjmi sinhronizacijo iz mreže:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Karkoli</translation>
     </message>
     <message>
         <source>None</source>
         <translation>brez</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Koda prinaša minimalno zaščito za varovanje vaše naprave.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>192.168.129.0/24 (privzeto)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
 </context>
 </TS>
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
@@ -49,197 +49,205 @@
         <translation>Izreži</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Prilepi</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Najdi...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Povečaj</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Pomanjšaj</translation>
     </message>
     <message>
         <source>Bold</source>
         <translation>Odebeljeno</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation>Poševno</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Objami vrstice</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Začni z novo datoteko</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datoteka</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Najdi naslednjega</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Zapri Najdi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Urejevalnik besedila</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>Neimenovano</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Pravice</translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation>DialogPisave</translation>
     </message>
     <message>
         <source>Do you really want
 to delete the current file
 from the disk?
 This is irreversable!!</source>
         <translation>Ali res želite
 izbrisati trenutno
 datoteko iz diska?
 To se ne da preklicati!!</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>About</source>
         <translation>O</translation>
     </message>
     <message>
         <source>Text Editor has detected
  you selected a .desktop file.
 Open .desktop file or linked file?</source>
         <translation>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>
         <source>Owner</source>
         <translation>Lastnik</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
     <message>
         <source>read</source>
         <translation>beri</translation>
     </message>
     <message>
         <source>write</source>
         <translation>piši</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>izvrši</translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation>Pravicedatoteke</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Opozorilo</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Napaka- ni uporabnika</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Napaka- ni skupine</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Napaka pri nastavitvi lastništva ali skupine</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Napaka pri nastavitvi načina</translation>
     </message>
 </context>
 </TS>
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
@@ -1,131 +1,135 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Danes</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Trenutno je &lt;b&gt; 1&lt;/b&gt; tekoče opravilo:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Trenutno je &lt;b&gt; %1&lt;/b&gt; tekočih opravil: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Ni tekočih opravil</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; novih sporočil, &lt;b&gt;%2&lt;/b&gt; izhodnih</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Danes ni sestankov</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Lastnik je</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Prosim izplonite poslovno kartico</translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation>OpiePošta ni nameščena</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Danes</translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation>Nastavitve Danes</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation>Naj bo 
 lokacija 
 prikazana?</translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation>Naj bodo zapiski 
 prikazani?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation>Prikaži samo kasnejše
 zmenke</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Koledar</translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation>Koliko opravil
 naj bo 
 prikazanih?</translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation>Opravila</translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation>Odščipni po koliko
 znakih</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Različno</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation>Koliko
 sestankov
 naj bo
 prikazanih?</translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation>Naj se danes
 avtomatsko zažene
 ob nadaljevanju? (samo Opie)</translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation>Aktiviraj
 avtomatski zagon po
 koliko minutah?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/advancedfm.ts b/i18n/zh_CN/advancedfm.ts
index 5f33236..ce9fab3 100644
--- a/i18n/zh_CN/advancedfm.ts
+++ b/i18n/zh_CN/advancedfm.ts
@@ -54,180 +54,202 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/appearance.ts b/i18n/zh_CN/appearance.ts
index ba6187f..7c20f02 100644
--- a/i18n/zh_CN/appearance.ts
+++ b/i18n/zh_CN/appearance.ts
@@ -1,109 +1,145 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="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
@@ -61,148 +61,152 @@
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</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>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <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
@@ -16,220 +16,236 @@
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT-dial:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4800</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Wait time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Demand Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual connect and disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Idle timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic connect and disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual connect, automatic disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>No carrier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number is busy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timed out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProxiesPageBase</name>
     <message>
         <source>Proxy Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto configure proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies for:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -19,155 +19,174 @@
     <message>
         <source>Sat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ser Permission</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
     </message>
 </context>
 </TS>
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
@@ -109,257 +109,257 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="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>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -1,159 +1,163 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InstallDialog</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -102,130 +102,138 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ?
 It must be empty</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>Unable to make directory
 </source>
         <translation type="unfinished"></translation>
     </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>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
@@ -1,93 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/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
@@ -44,197 +44,205 @@
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want
 to delete the current file
 from the disk?
 This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,117 +1,121 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/advancedfm.ts b/i18n/zh_TW/advancedfm.ts
index 5f33236..ce9fab3 100644
--- a/i18n/zh_TW/advancedfm.ts
+++ b/i18n/zh_TW/advancedfm.ts
@@ -54,180 +54,202 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/appearance.ts b/i18n/zh_TW/appearance.ts
index ba6187f..7c20f02 100644
--- a/i18n/zh_TW/appearance.ts
+++ b/i18n/zh_TW/appearance.ts
@@ -1,109 +1,145 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="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
@@ -61,148 +61,152 @@
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</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>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <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
@@ -16,220 +16,236 @@
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT-dial:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATDP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4800</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Wait time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Demand Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual connect and disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Idle timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic connect and disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manual connect, automatic disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>No carrier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number is busy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timed out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProxiesPageBase</name>
     <message>
         <source>Proxy Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto configure proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxies for:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -19,155 +19,174 @@
     <message>
         <source>Sat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ser Permission</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
     </message>
 </context>
 </TS>
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
@@ -109,257 +109,257 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort sending</source>
-        <translation type="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>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -1,159 +1,163 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InstallDialog</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipkg options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-force-removal-of-essential-packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To install</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old version, not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
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
@@ -102,130 +102,138 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ?
 It must be empty</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>Unable to make directory
 </source>
         <translation type="unfinished"></translation>
     </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>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
@@ -1,93 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/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
@@ -44,197 +44,205 @@
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want
 to delete the current file
 from the disk?
 This is irreversable!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,117 +1,121 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more  today</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>