Merge from BRANCH_1_0.

1 files changed, 81 insertions, 22 deletions

diff --git a/i18n/da/libqpe.ts b/i18n/da/libqpe.ts
index 03e0914..635fe39 100644
--- a/i18n/da/libqpe.ts
+++ b/i18n/da/libqpe.ts
@@ -400,4 +400,15 @@ redigere kategorierne.</translation>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nej</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
@@ -472,5 +483,5 @@ Frigør noget hukommelse og prøv igen.</translation>
         <source>Are you sure you want to delete
  %1?</source>
-        <translation>Er du sikker på du vil slette
+        <translation type="obsolete">Er du sikker på du vil slette
 %1?</translation>
     </message>
@@ -771,14 +782,24 @@ Frigør noget hukommelse og prøv igen.</translation>
         <translation>Søn</translation>
     </message>
-</context>
-<context>
-    <name>QPEApplication</name>
     <message>
-        <source>%1 document</source>
-        <translation>%1 dokument</translation>
+        <source>Click to close this window, discarding changes.</source>
+        <translation>Klik for at lukke dette vindue uden at gemme ændringer.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation>Klik for at lukke dette vindue.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation>Klik for at lukke dette vindue og anvende ændringer.</translation>
+    </message>
+    <message>
+        <source>Click to make this window moveable.</source>
+        <translation>Klik for at gøre dette vindue flytbart.</translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation>Klik for at få dette vindue til at bruge hele skærmen.</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>
@@ -789,26 +810,64 @@ Frigør noget hukommelse og prøv igen.</translation>
         <translation>Hvad er det...</translation>
     </message>
-</context>
-<context>
-    <name>QPEManager</name>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation>Klik for at lukke dette vindue og kassere ændringer.</translation>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Vil du slette(new line)
+%1?&lt;/qt&gt;</translation>
     </message>
     <message>
-        <source>Click to close this window.</source>
-        <translation>Klik for at lukke dette vindue.</translation>
+        <source>Jan</source>
+        <translation>Jan</translation>
     </message>
     <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation>Klik for at lukke dette vindue og anvende ændringer.</translation>
+        <source>Feb</source>
+        <translation>Feb</translation>
     </message>
     <message>
-        <source>Click to make this window moveable.</source>
-        <translation>Klik for at gøre dette vindue flytbart.</translation>
+        <source>Mar</source>
+        <translation>Mar</translation>
     </message>
     <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation>Klik for at få dette vindue til at bruge hele skærmen.</translation>
+        <source>Apr</source>
+        <translation>Apr</translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation>Maj</translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation>Jun</translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation>Jul</translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation>Aug</translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation>Sep</translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation>Okt</translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation>Nov</translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation>Dec</translation>
+    </message>
+</context>
+<context>
+    <name>QPEApplication</name>
+    <message>
+        <source>%1 document</source>
+        <translation>%1 dokument</translation>
     </message>
 </context>