Merge from BRANCH_1_0.

1 files changed, 7 insertions, 7 deletions

diff --git a/i18n/en/opie-login.ts b/i18n/en/opie-login.ts
index 42551e6..f4806d5 100644
--- a/i18n/en/opie-login.ts
+++ b/i18n/en/opie-login.ts
@@ -16,68 +16,68 @@ accurately to calibrate your screen.</source>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
+        <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failure</source>
+        <source>Could not switch to new user identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not start OPIE.</source>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not switch to new user identity</source>
+        <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>