Merge from BRANCH_1_0.

1 files changed, 73 insertions, 20 deletions

diff --git a/i18n/no/libqpe.ts b/i18n/no/libqpe.ts
index b75236e..935ab0b 100644
--- a/i18n/no/libqpe.ts
+++ b/i18n/no/libqpe.ts
@@ -397,6 +397,17 @@ editing categories.</source>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>New Document</source>
@@ -459,11 +470,6 @@ Free some memory and try again.</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>
     </message>
@@ -759,16 +765,26 @@ Free some memory and try again.</source>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QPEApplication</name>
     <message>
-        <source>%1 document</source>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window moveable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
@@ -777,27 +793,64 @@ Free some memory and try again.</source>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QPEManager</name>
     <message>
-        <source>Click to close this window, discarding changes.</source>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window.</source>
+        <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window and apply changes.</source>
+        <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to make this window moveable.</source>
+        <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to make this window use all available screen area.</source>
+        <source>Apr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QPEApplication</name>
+    <message>
+        <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>