use translations from BRANCH

9 files changed, 426 insertions, 68 deletions

diff --git a/i18n/no/advancedfm.ts b/i18n/no/advancedfm.ts
index 9a692b9..e0b6f28 100644
--- a/i18n/no/advancedfm.ts
+++ b/i18n/no/advancedfm.ts
@@ -117,11 +117,11 @@ og er GPL lisensiert</translation>
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>Bytt til lokal</translation>
+        <translation type="obsolete">Bytt til lokal</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>Bytt til ekstern</translation>
+        <translation type="obsolete">Bytt til ekstern</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
@@ -262,6 +262,26 @@ and all it&apos;s contents ?</source>
 %1?</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>Output</name>
@@ -351,5 +371,9 @@ Finished
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/calculator.ts b/i18n/no/calculator.ts
index 2f945c2..958c4c3 100644
--- a/i18n/no/calculator.ts
+++ b/i18n/no/calculator.ts
@@ -133,4 +133,203 @@
         <translation type="unfinished"></translation>
     </message>
 </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/no/datebook.ts b/i18n/no/datebook.ts
index 2020a7d..955ce20 100644
--- a/i18n/no/datebook.ts
+++ b/i18n/no/datebook.ts
@@ -360,14 +360,6 @@ Quit anyway?</source>
     </message>
 </context>
 <context>
-    <name>DateBookWeekLstDayHdr</name>
-    <message>
-        <source>MTWTFSSM</source>
-        <comment>Week days</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
@@ -482,10 +474,6 @@ Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
@@ -521,6 +509,10 @@ Quit anyway?</source>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
diff --git a/i18n/no/libbatteryapplet.ts b/i18n/no/libbatteryapplet.ts
index c9fe974..bb236e1 100644
--- a/i18n/no/libbatteryapplet.ts
+++ b/i18n/no/libbatteryapplet.ts
@@ -81,5 +81,17 @@
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </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>
 </TS>
diff --git a/i18n/no/libqpe.ts b/i18n/no/libqpe.ts
index 935ab0b..df7c1bc 100644
--- a/i18n/no/libqpe.ts
+++ b/i18n/no/libqpe.ts
@@ -846,6 +846,22 @@ Free some memory and try again.</source>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/no/mailit.ts b/i18n/no/mailit.ts
index 3d729bc..fd9657c 100644
--- a/i18n/no/mailit.ts
+++ b/i18n/no/mailit.ts
@@ -200,6 +200,19 @@ Check user name and password&lt;/qt&gt;</source>
 </source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>EmailHandler</name>
diff --git a/i18n/no/opieftp.ts b/i18n/no/opieftp.ts
index 8f9d52e..84bc0c7 100644
--- a/i18n/no/opieftp.ts
+++ b/i18n/no/opieftp.ts
@@ -231,5 +231,9 @@ It must be empty</source>
         <source>Sorry name already taken</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/qpe.ts b/i18n/no/qpe.ts
index 73a6c49..dde7446 100644
--- a/i18n/no/qpe.ts
+++ b/i18n/no/qpe.ts
@@ -1,6 +1,21 @@
 <!DOCTYPE TS><TS>
 <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>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
@@ -13,76 +28,96 @@
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </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>
     </message>
     <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>
     </message>
     <message>
-        <source>Icon View</source>
+        <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
 </context>
 <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>
     </message>
     <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>
     </message>
     <message>
-        <source>business card</source>
+        <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Launcher</name>
+    <name>InputMethods</name>
     <message>
-        <source>Launcher</source>
+        <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Launcher</name>
     <message>
-        <source>Finding documents</source>
+        <source>Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching documents</source>
+        <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -97,15 +132,34 @@ Please charge the back-up battery.</source>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <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>
     </message>
     <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>
     </message>
     <message>
@@ -114,64 +168,82 @@ Please charge the back-up battery.</source>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
+    <name>SafeMode</name>
     <message>
-        <source>Medium inserted</source>
+        <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Which media files</source>
+        <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Audio</source>
+        <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ServerApplication</name>
     <message>
-        <source>Image</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text</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>
     </message>
     <message>
-        <source>Video</source>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link apps</source>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Limit search to dir: (not used yet)</source>
+        <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add</source>
+        <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Your decision will be stored on the medium.</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>
     </message>
     <message>
-        <source>Do not ask again for this medium</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Battery Status</source>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Low
+Please save data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -237,15 +309,11 @@ These termination options are provided primarily for use while developing and te
 <context>
     <name>SyncDialog</name>
     <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>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/no/showimg.ts b/i18n/no/showimg.ts
index c04fa35..bb5b89a 100644
--- a/i18n/no/showimg.ts
+++ b/i18n/no/showimg.ts
@@ -121,6 +121,36 @@
     </message>
 </context>
 <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>
     <message>
         <source>Preferences</source>