use translations from BRANCH

9 files changed, 426 insertions, 76 deletions

diff --git a/i18n/en/advancedfm.ts b/i18n/en/advancedfm.ts
index ed7af0f..8a9ac63 100644
--- a/i18n/en/advancedfm.ts
+++ b/i18n/en/advancedfm.ts
@@ -40,10 +40,2 @@
     <message>
-        <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Size</source>
@@ -257,2 +249,22 @@ and all it&apos;s contents ?</source>
     </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
@@ -346,2 +358,6 @@ Finished
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
diff --git a/i18n/en/calculator.ts b/i18n/en/calculator.ts
index edd7e16..5d732d0 100644
--- a/i18n/en/calculator.ts
+++ b/i18n/en/calculator.ts
@@ -135,2 +135,201 @@
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/datebook.ts b/i18n/en/datebook.ts
index 45d7547..a6ecc63 100644
--- a/i18n/en/datebook.ts
+++ b/i18n/en/datebook.ts
@@ -362,10 +362,2 @@ Quit anyway?</source>
 <context>
-    <name>DateBookWeekLstDayHdr</name>
-    <message>
-        <source>MTWTFSSM</source>
-        <comment>Week days</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DateBookWeekLstHeader</name>
@@ -476,6 +468,2 @@ Quit anyway?</source>
     <message>
-        <source>Start time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>All day</source>
@@ -523,2 +511,6 @@ Quit anyway?</source>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
diff --git a/i18n/en/libbatteryapplet.ts b/i18n/en/libbatteryapplet.ts
index 8ca62b8..5905f14 100644
--- a/i18n/en/libbatteryapplet.ts
+++ b/i18n/en/libbatteryapplet.ts
@@ -83,2 +83,14 @@
     </message>
+    <message>
+        <source>no data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
diff --git a/i18n/en/libqpe.ts b/i18n/en/libqpe.ts
index 9929ffe..49307d9 100644
--- a/i18n/en/libqpe.ts
+++ b/i18n/en/libqpe.ts
@@ -848,2 +848,18 @@ Free some memory and try again.</source>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
diff --git a/i18n/en/mailit.ts b/i18n/en/mailit.ts
index 3d729bc..fd9657c 100644
--- a/i18n/en/mailit.ts
+++ b/i18n/en/mailit.ts
@@ -202,2 +202,15 @@ Check user name and password&lt;/qt&gt;</source>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
diff --git a/i18n/en/opieftp.ts b/i18n/en/opieftp.ts
index b837b35..86fd2ef 100644
--- a/i18n/en/opieftp.ts
+++ b/i18n/en/opieftp.ts
@@ -233,2 +233,6 @@ It must be empty</source>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
diff --git a/i18n/en/qpe.ts b/i18n/en/qpe.ts
index 10ba42e..dde7446 100644
--- a/i18n/en/qpe.ts
+++ b/i18n/en/qpe.ts
@@ -2,3 +2,18 @@
 <context>
-    <name>AppMonitor</name>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
     <message>
@@ -15,8 +30,4 @@
     </message>
-</context>
-<context>
-    <name>Calibrate</name>
     <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
@@ -24,10 +35,7 @@ accurately to calibrate your screen.</source>
     <message>
-        <source>Welcome to Opie</source>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
     <message>
-        <source>Documents</source>
+        <source>Application terminated</source>
         <translation type="unfinished"></translation>
@@ -35,3 +43,3 @@ accurately to calibrate your screen.</source>
     <message>
-        <source>Icon View</source>
+        <source>Application not found</source>
         <translation type="unfinished"></translation>
@@ -39,3 +47,15 @@ accurately to calibrate your screen.</source>
     <message>
-        <source>List View</source>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
         <translation type="unfinished"></translation>
@@ -44,6 +64,5 @@ accurately to calibrate your screen.</source>
 <context>
-    <name>DesktopApplication</name>
+    <name>DesktopPowerAlerter</name>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
+        <source>Battery Status</source>
         <translation type="unfinished"></translation>
@@ -51,8 +70,10 @@ Keep power off until power restored!</source>
     <message>
-        <source>Battery is running very low.</source>
+        <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>FirstUse</name>
     <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
+        <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
@@ -60,3 +81,3 @@ Please charge the back-up battery.</source>
     <message>
-        <source>business card</source>
+        <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
@@ -64,3 +85,3 @@ Please charge the back-up battery.</source>
     <message>
-        <source>Information</source>
+        <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
@@ -68,4 +89,22 @@ Please charge the back-up battery.</source>
     <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
         <translation type="unfinished"></translation>
@@ -80,2 +119,6 @@ Please charge the back-up battery.</source>
     <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source> - Launcher</source>
@@ -92,3 +135,3 @@ Please charge the back-up battery.</source>
     <message>
-        <source>Finding documents</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
@@ -96,3 +139,3 @@ Please charge the back-up battery.</source>
     <message>
-        <source>Searching documents</source>
+        <source>View as text</source>
         <translation type="unfinished"></translation>
@@ -101,5 +144,5 @@ Please charge the back-up battery.</source>
 <context>
-    <name>LauncherView</name>
+    <name>LauncherTabWidget</name>
     <message>
-        <source>%1 files</source>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
@@ -107,3 +150,14 @@ Please charge the back-up battery.</source>
     <message>
-        <source>All types of file</source>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>All types</source>
         <translation type="unfinished"></translation>
@@ -116,9 +170,24 @@ Please charge the back-up battery.</source>
 <context>
-    <name>MediumMountGui</name>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>Medium inserted</source>
+        <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ServerApplication</name>
     <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
@@ -126,3 +195,4 @@ Please charge the back-up battery.</source>
     <message>
-        <source>Which media files</source>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
@@ -130,3 +200,4 @@ Please charge the back-up battery.</source>
     <message>
-        <source>Audio</source>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
         <translation type="unfinished"></translation>
@@ -134,3 +205,3 @@ Please charge the back-up battery.</source>
     <message>
-        <source>Image</source>
+        <source>Battery is running very low. </source>
         <translation type="unfinished"></translation>
@@ -138,3 +209,4 @@ Please charge the back-up battery.</source>
     <message>
-        <source>Text</source>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
@@ -142,3 +214,3 @@ Please charge the back-up battery.</source>
     <message>
-        <source>Video</source>
+        <source>business card</source>
         <translation type="unfinished"></translation>
@@ -146,3 +218,3 @@ Please charge the back-up battery.</source>
     <message>
-        <source>All</source>
+        <source>Safe Mode</source>
         <translation type="unfinished"></translation>
@@ -150,3 +222,3 @@ Please charge the back-up battery.</source>
     <message>
-        <source>Link apps</source>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
@@ -154,3 +226,3 @@ Please charge the back-up battery.</source>
     <message>
-        <source>Limit search to dir: (not used yet)</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
@@ -158,3 +230,3 @@ Please charge the back-up battery.</source>
     <message>
-        <source>Add</source>
+        <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
@@ -162,3 +234,3 @@ Please charge the back-up battery.</source>
     <message>
-        <source>Your decision will be stored on the medium.</source>
+        <source>Memory Status</source>
         <translation type="unfinished"></translation>
@@ -166,10 +238,10 @@ Please charge the back-up battery.</source>
     <message>
-        <source>Do not ask again for this medium</source>
+        <source>Memory Low
+Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Battery Status</source>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
         <translation type="unfinished"></translation>
@@ -180,2 +252,6 @@ Please charge the back-up battery.</source>
     <message>
+        <source>Shutdown...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Terminate</source>
@@ -208,6 +284,2 @@ These termination options are provided primarily for use while developing and te
     </message>
-    <message>
-        <source>Shutdown...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
@@ -239,7 +311,3 @@ These termination options are provided primarily for use while developing and te
     <message>
-        <source>Syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
+        <source>Abort</source>
         <translation type="unfinished"></translation>
@@ -247,3 +315,3 @@ These termination options are provided primarily for use while developing and te
     <message>
-        <source>&amp;Cancel</source>
+        <source>Syncing:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/en/showimg.ts b/i18n/en/showimg.ts
index 8f08d9e..daea628 100644
--- a/i18n/en/showimg.ts
+++ b/i18n/en/showimg.ts
@@ -123,2 +123,32 @@
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
     <name>SettingsDialogBase</name>