Merge from BRANCH_1_0.

1 files changed, 7 insertions, 7 deletions

diff --git a/i18n/xx/qpe.ts b/i18n/xx/qpe.ts
index c19d078..3952e55 100644
--- a/i18n/xx/qpe.ts
+++ b/i18n/xx/qpe.ts
@@ -59,39 +59,32 @@ Please charge the back-up battery.</source>
     </message>
     <message>
         <source>business card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>FOO</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>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>FOO</translation>
@@ -163,32 +156,39 @@ Please charge the back-up battery.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>FOO</translation>