From 0799b67a825c8ec00e57a63e5a5d55fd26bb2337 Mon Sep 17 00:00:00 2001
From: kergoth <kergoth>
Date: Sat, 09 Aug 2003 15:23:37 +0000
Subject: Merge from BRANCH_1_0.

---
(limited to 'i18n/xx/qpe.ts')

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
@@ -72,13 +72,6 @@ Please charge the back-up battery.</source>
     </message>
 </context>
 <context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
@@ -176,6 +169,13 @@ Please charge the back-up battery.</source>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
--
cgit v0.9.0.2