1 files changed, 68 insertions, 40 deletions

diff --git a/i18n/en/security.ts b/i18n/en/security.ts
index 9dbe05b..4f105ad 100644
--- a/i18n/en/security.ts
+++ b/i18n/en/security.ts
@@ -2,5 +2,5 @@
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Set passcode</source>
+        <source>LoginBase</source>
         <translation type="unfinished"></translation>
@@ -8,3 +8,3 @@
     <message>
-        <source>Change passcode</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
@@ -12,3 +12,3 @@
     <message>
-        <source>Enter passcode</source>
+        <source>Login Automatically</source>
         <translation type="unfinished"></translation>
@@ -16,3 +16,5 @@
     <message>
-        <source>Passcode incorrect</source>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
@@ -20,8 +22,13 @@
     <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MultiauthConfig</name>
     <message>
-        <source>Any</source>
+        <source>Security configuration</source>
         <translation type="unfinished"></translation>
@@ -29,3 +36,7 @@ Access denied</source>
     <message>
-        <source>None</source>
+        <source>Load which plugins in what order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
@@ -33,3 +44,3 @@ Access denied</source>
     <message>
-        <source>Enter new passcode</source>
+        <source>Move Up</source>
         <translation type="unfinished"></translation>
@@ -37,3 +48,19 @@ Access denied</source>
     <message>
-        <source>Re-enter new passcode</source>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sync</source>
         <translation type="unfinished"></translation>
@@ -80,7 +107,4 @@ Access denied</source>
     </message>
-</context>
-<context>
-    <name>SecurityBase</name>
     <message>
-        <source>Security Settings</source>
+        <source>Any</source>
         <translation type="unfinished"></translation>
@@ -88,7 +112,10 @@ Access denied</source>
     <message>
-        <source>Change passcode</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
     <message>
-        <source>Clear passcode</source>
+        <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
@@ -96,3 +123,3 @@ Access denied</source>
     <message>
-        <source>Require pass code at power-on</source>
+        <source>on Opie start</source>
         <translation type="unfinished"></translation>
@@ -100,3 +127,3 @@ Access denied</source>
     <message>
-        <source>Sync</source>
+        <source>on Opie resume</source>
         <translation type="unfinished"></translation>
@@ -104,3 +131,3 @@ Access denied</source>
     <message>
-        <source>Accept sync from network:</source>
+        <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
@@ -108,3 +135,3 @@ Access denied</source>
     <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
+        <source>Required successes</source>
         <translation type="unfinished"></translation>
@@ -112,3 +139,3 @@ Access denied</source>
     <message>
-        <source>Passcode</source>
+        <source>Debug options</source>
         <translation type="unfinished"></translation>
@@ -116,3 +143,3 @@ Access denied</source>
     <message>
-        <source>Login</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
@@ -120,3 +147,3 @@ Access denied</source>
     <message>
-        <source>Login Automatically</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
@@ -124,5 +151,3 @@ Access denied</source>
     <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
+        <source>Allow to bypass authentication</source>
         <translation type="unfinished"></translation>
@@ -130,8 +155,16 @@ Note: This is *not* the sync password.</source>
     <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
+        <source>Note: the third option implies the second one</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Security</name>
+</context>
+<context>
+    <name>SecurityBase</name>
+</context>
+<context>
+    <name>SyncBase</name>
     <message>
-        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <source>SyncBase</source>
         <translation type="unfinished"></translation>
@@ -139,5 +172,3 @@ You can enter a new one at any time.</source>
     <message>
-        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
-
-For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
+        <source>Sync</source>
         <translation type="unfinished"></translation>
@@ -145,6 +176,3 @@ For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
     <message>
-        <source>This drop-down list allows you to select the user for auto-login
-(if enabled above).  
-
-You can only select an actually configured user.</source>
+        <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
@@ -193,3 +221,3 @@ Beware that all manually entered net ranges will be lost!</source>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
@@ -197,3 +225,3 @@ Beware that all manually entered net ranges will be lost!</source>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
@@ -201,3 +229,3 @@ Beware that all manually entered net ranges will be lost!</source>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>