Merge from BRANCH_1_0.

1 files changed, 13 insertions, 2 deletions

diff --git a/i18n/xx/opie-login.ts b/i18n/xx/opie-login.ts
index 333c5bf..e88e202 100644
--- a/i18n/xx/opie-login.ts
+++ b/i18n/xx/opie-login.ts
@@ -1,83 +1,94 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>User</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Could not start Opie.</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 </TS>