23 files changed, 3765 insertions, 1199 deletions

diff --git a/i18n/cz/security.ts b/i18n/cz/security.ts
index 039004f..caebb09 100644
--- a/i18n/cz/security.ts
+++ b/i18n/cz/security.ts
@@ -1,268 +1,516 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>LoginBase</name>
+    <message>
+        <source>LoginBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished">Přihlášení</translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation type="unfinished">Automaticky přihlásit</translation>
+    </message>
+    <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>
+        <translation type="unfinished">Při aktivaci této volby vás opie-login automaticky přihlásí jako uživatele, kterého jste si vybrali v seznamu.
+
+Pro Zauruse 5x00 je to vždy uživatel &quot;root&quot;.</translation>
+    </message>
+    <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>
+        <translation type="unfinished">Tento seznam vám umožní vybrat uživatele pro automatické přihlášení.
+(Pokud je volba zapnutá).
+
+Můžete vybrat pouze nakonfigurované uživatele.</translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthConfig</name>
+    <message>
+        <source>Security configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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">Přihlášení</translation>
+    </message>
+    <message>
+        <source>Sync</source>
+        <translation type="unfinished">Synchronizace</translation>
+    </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished">Upozornění</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished">&lt;p&gt;Všechny uživatelovy síťové rozsahy budou ztraceny.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Storno</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished">Jakákoliv</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Žádná</translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
+    <message>
+        <source>When to lock Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple plugins authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Required successes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: the third option implies the second one</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Security</name>
     <message>
         <source>Attention</source>
-        <translation>Upozornění</translation>
+        <translation type="obsolete">Upozornění</translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation>&lt;p&gt;Všechny uživatelovy síťové rozsahy budou ztraceny.</translation>
+        <translation type="obsolete">&lt;p&gt;Všechny uživatelovy síťové rozsahy budou ztraceny.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Storno</translation>
+        <translation type="obsolete">Storno</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="obsolete">Ok</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
-        <translation>192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>Jakákoliv</translation>
+        <translation type="obsolete">Jakákoliv</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Žádná</translation>
+        <translation type="obsolete">Žádná</translation>
     </message>
     <message>
         <source>Set passcode</source>
-        <translation>Nastavit heslo</translation>
+        <translation type="obsolete">Nastavit heslo</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Změnit heslo</translation>
+        <translation type="obsolete">Změnit heslo</translation>
     </message>
     <message>
         <source>Enter passcode</source>
-        <translation>Vložit heslo</translation>
+        <translation type="obsolete">Vložit heslo</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
-        <translation>Neplatné heslo</translation>
+        <translation type="obsolete">Neplatné heslo</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
-        <translation>Vložené heslo je chybné.
+        <translation type="obsolete">Vložené heslo je chybné.
 Přístup odmítnut</translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="obsolete">VAROVÁNÍ</translation>
     </message>
     <message>
         <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
         <translation type="obsolete">&lt;p&gt;Výběrem IntelliSync vypnete FTP heslo.&lt;p&gt;Každý počítač ve vaší síti bude moci provést synchronizaci s vaším zařízením!</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
-        <translation>Zadejte nové heslo</translation>
+        <translation type="obsolete">Zadejte nové heslo</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
-        <translation>Znovu zadejte nové heslo</translation>
+        <translation type="obsolete">Znovu zadejte nové heslo</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
-        <translation>Bezpečnostní nastavení</translation>
+        <translation type="obsolete">Bezpečnostní nastavení</translation>
     </message>
     <message>
         <source>Passcode</source>
-        <translation>Heslo</translation>
+        <translation type="obsolete">Heslo</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Změnit heslo</translation>
+        <translation type="obsolete">Změnit heslo</translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
-        <translation>Toto tlačítko umožní změnit bezpečnostní heslo.
+        <translation type="obsolete">Toto tlačítko umožní změnit bezpečnostní heslo.
 
 Poznámka: Toto *není* synchronizační heslo.</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation>Vyčistit heslo</translation>
+        <translation type="obsolete">Vyčistit heslo</translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
-        <translation>Smaže aktuální heslo.
+        <translation type="obsolete">Smaže aktuální heslo.
 Můžete kdykoliv zadat heslo nové.</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation>Při zapnutí vyžadovat heslo</translation>
+        <translation type="obsolete">Při zapnutí vyžadovat heslo</translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
-        <translation>Při aktivaci této volby budete muset zadat heslo při každém zapnutí Zauruse.</translation>
+        <translation type="obsolete">Při aktivaci této volby budete muset zadat heslo při každém zapnutí Zauruse.</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation>&lt;P&gt;Ochrana heslem poskytuje minimální ochranu před náhodným přístupem k zařízení.</translation>
+        <translation type="obsolete">&lt;P&gt;Ochrana heslem poskytuje minimální ochranu před náhodným přístupem k zařízení.</translation>
     </message>
     <message>
         <source>Login</source>
-        <translation>Přihlášení</translation>
+        <translation type="obsolete">Přihlášení</translation>
     </message>
     <message>
         <source>Login Automatically</source>
-        <translation>Automaticky přihlásit</translation>
+        <translation type="obsolete">Automaticky přihlásit</translation>
     </message>
     <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>
-        <translation>Při aktivaci této volby vás opie-login automaticky přihlásí jako uživatele, kterého jste si vybrali v seznamu.
+        <translation type="obsolete">Při aktivaci této volby vás opie-login automaticky přihlásí jako uživatele, kterého jste si vybrali v seznamu.
 
 Pro Zauruse 5x00 je to vždy uživatel &quot;root&quot;.</translation>
     </message>
     <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>
-        <translation>Tento seznam vám umožní vybrat uživatele pro automatické přihlášení.
+        <translation type="obsolete">Tento seznam vám umožní vybrat uživatele pro automatické přihlášení.
 (Pokud je volba zapnutá).
 
 Můžete vybrat pouze nakonfigurované uživatele.</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation>Synchronizace</translation>
+        <translation type="obsolete">Synchronizace</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation>Akceptovat synchronizaci ze sítě:</translation>
+        <translation type="obsolete">Akceptovat synchronizaci ze sítě:</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
-        <translation>Vyberte rozsah sítě, nebo zadejte nový.
+        <translation type="obsolete">Vyberte rozsah sítě, nebo zadejte nový.
 
 Tento seznam vám umožní vybrat rozsah sítě, která je oprávněná připojovat se do Zauruse.
 
 Například síťový rozsah 192.168.1.0/24 povolí připojení a synchronizaci jakéhokoliv počítače mezi IP adresami 192.168.1.1 a 192.168.1.254.
 
 Položka &quot;Jakákoliv&quot; umožní připojení *jakékoliv* IP adrese.
 Položka &quot;Žádná&quot; zakáže *všechna* připojení.
 
 Pokud nevíte, vyberte &quot;Jakákoliv&quot;.</translation>
     </message>
     <message>
         <source>Delete Entry</source>
-        <translation>Smazat položku</translation>
+        <translation type="obsolete">Smazat položku</translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
-        <translation>Vymaže vybraný síťový rozsah ze seznamu
+        <translation type="obsolete">Vymaže vybraný síťový rozsah ze seznamu
 
 Po stisknutí tohoto tlačítka bude vybraný síťový rozsah vymazán ze seznamu.
 
 Jestliže stisknete tlačítko omylem, požitím tlačítka &quot;Obnovit výchozí&quot; dostanete
 seznam sítí do stavu jako po prvním nastartování Zauruse.</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
-        <translation>Obnovit výchozí</translation>
+        <translation type="obsolete">Obnovit výchozí</translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
-        <translation>Toto tlačítko vrátí seznam sítí do původního
+        <translation type="obsolete">Toto tlačítko vrátí seznam sítí do původního
 stavu.
 
 Uvědomte si ale, že všechny zadané rozsahy budou ztraceny!</translation>
     </message>
     <message>
         <source>Select your sync software</source>
-        <translation>Vyberte váš synchronizační program</translation>
+        <translation type="obsolete">Vyberte váš synchronizační program</translation>
     </message>
     <message>
         <source>QTopia</source>
         <translation type="obsolete">QTopia</translation>
     </message>
     <message>
         <source>IntelliSync</source>
-        <translation>IntelliSync</translation>
+        <translation type="obsolete">IntelliSync</translation>
     </message>
     <message>
         <source>This option changes the login behaviour of the internal FTP server.  
 
 If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
 
 The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
         <translation type="obsolete">Tato volba změní chování přihlašování k vnitřnímu FTP serveru.
 
 Jestliže máte problém se synchronizací, zkuste &quot;IntelliSync&quot;, což nastaví akceptování libovolného hesla na sync (FTP) portu.
 
 Výchozí je Qtopia. To vám umožní přihlášení se jménem &quot;root&quot; a heslem &quot;Qtopia&quot;. Heslo rozlišuje VeLkÁ a mAlÁ písmena.</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
-        <translation>Qtopia 1.7</translation>
+        <translation type="obsolete">Qtopia 1.7</translation>
     </message>
     <message>
         <source>Opie 1.0</source>
-        <translation>Opie 1.0</translation>
+        <translation type="obsolete">Opie 1.0</translation>
     </message>
     <message>
         <source>Both</source>
         <translation type="obsolete">Obojí</translation>
     </message>
+</context>
+<context>
+    <name>SyncBase</name>
+    <message>
+        <source>SyncBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sync</source>
+        <translation type="unfinished">Synchronizace</translation>
+    </message>
+    <message>
+        <source>Accept sync from network:</source>
+        <translation type="unfinished">Akceptovat synchronizaci ze sítě:</translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished">Vyberte rozsah sítě, nebo zadejte nový.
+
+Tento seznam vám umožní vybrat rozsah sítě, která je oprávněná připojovat se do Zauruse.
+
+Například síťový rozsah 192.168.1.0/24 povolí připojení a synchronizaci jakéhokoliv počítače mezi IP adresami 192.168.1.1 a 192.168.1.254.
+
+Položka &quot;Jakákoliv&quot; umožní připojení *jakékoliv* IP adrese.
+Položka &quot;Žádná&quot; zakáže *všechna* připojení.
+
+Pokud nevíte, vyberte &quot;Jakákoliv&quot;.</translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished">Smazat položku</translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished">Vymaže vybraný síťový rozsah ze seznamu
+
+Po stisknutí tohoto tlačítka bude vybraný síťový rozsah vymazán ze seznamu.
+
+Jestliže stisknete tlačítko omylem, požitím tlačítka &quot;Obnovit výchozí&quot; dostanete
+seznam sítí do stavu jako po prvním nastartování Zauruse.</translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished">Obnovit výchozí</translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished">Toto tlačítko vrátí seznam sítí do původního
+stavu.
+
+Uvědomte si ale, že všechny zadané rozsahy budou ztraceny!</translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished">Vyberte váš synchronizační program</translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished">Qtopia 1.7</translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished">Opie 1.0</translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished">IntelliSync</translation>
+    </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/security.ts b/i18n/da/security.ts
index a6cc677..ddbf92d 100644
--- a/i18n/da/security.ts
+++ b/i18n/da/security.ts
@@ -1,227 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Set passcode</source>
-        <translation>Vælg kode</translation>
+        <source>LoginBase</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
-        <translation>Skift kode</translation>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter passcode</source>
-        <translation>Indtast kode</translation>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode incorrect</source>
-        <translation>Koden er forkert</translation>
+        <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>
     </message>
     <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation>Den indtastede kode er forkert.
-Adgang nægtet</translation>
+        <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>
-        <translation>Vilkårlig</translation>
+        <source>Security configuration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>Ingen</translation>
+        <source>Load which plugins in what order:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter new passcode</source>
-        <translation>Indtast ny kode</translation>
+        <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>
     </message>
     <message>
-        <source>Re-enter new passcode</source>
-        <translation>Gentag ny kode</translation>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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">Synkronisering</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished">Vilkårlig</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Ingen</translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
+    <message>
+        <source>When to lock Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple plugins authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Required successes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: the third option implies the second one</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Security</name>
+    <message>
+        <source>Set passcode</source>
+        <translation type="obsolete">Vælg kode</translation>
+    </message>
+    <message>
+        <source>Change passcode</source>
+        <translation type="obsolete">Skift kode</translation>
+    </message>
+    <message>
+        <source>Enter passcode</source>
+        <translation type="obsolete">Indtast kode</translation>
+    </message>
+    <message>
+        <source>Passcode incorrect</source>
+        <translation type="obsolete">Koden er forkert</translation>
+    </message>
+    <message>
+        <source>The passcode entered is incorrect.
+Access denied</source>
+        <translation type="obsolete">Den indtastede kode er forkert.
+Adgang nægtet</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation type="obsolete">Vilkårlig</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="obsolete">Ingen</translation>
+    </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="obsolete">Indtast ny kode</translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="obsolete">Gentag ny kode</translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
-        <translation>Sikkerheds Indstillinger</translation>
+        <translation type="obsolete">Sikkerheds Indstillinger</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Skift kode</translation>
+        <translation type="obsolete">Skift kode</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation>Slet kode</translation>
+        <translation type="obsolete">Slet kode</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation>Spørg efter kode ved opstart</translation>
+        <translation type="obsolete">Spørg efter kode ved opstart</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation>Synkronisering</translation>
+        <translation type="obsolete">Synkronisering</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation>Tillad synkronisering fra netværk:</translation>
+        <translation type="obsolete">Tillad synkronisering fra netværk:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (standard)</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Vilkårlig</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ingen</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation>&lt;P&gt;Beskyttelse med kode giver en minimal sikkerhed mod almindelig adgang til denne enhed.</translation>
+        <translation type="obsolete">&lt;P&gt;Beskyttelse med kode giver en minimal sikkerhed mod almindelig adgang til denne enhed.</translation>
     </message>
     <message>
         <source>Passcode</source>
-        <translation>Kodeord</translation>
-    </message>
-    <message>
-        <source>Login</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login Automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Kodeord</translation>
     </message>
+</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>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Sync</source>
+        <translation type="unfinished">Synkronisering</translation>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Accept sync from network:</source>
+        <translation type="unfinished">Tillad synkronisering fra netværk:</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/security.ts b/i18n/de/security.ts
index 693dcc0..45571c3 100644
--- a/i18n/de/security.ts
+++ b/i18n/de/security.ts
@@ -1,250 +1,379 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Set passcode</source>
-        <translation>Passwort einstellen</translation>
+        <source>LoginBase</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
-        <translation>Passwort ändern</translation>
+        <source>Login</source>
+        <translation type="unfinished">Login</translation>
     </message>
     <message>
-        <source>Enter passcode</source>
-        <translation>Passwort eingeben</translation>
+        <source>Login Automatically</source>
+        <translation type="unfinished">Automatisch einloggen</translation>
     </message>
     <message>
-        <source>Passcode incorrect</source>
-        <translation>Passwort falsch</translation>
+        <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>
     </message>
     <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation>Das eingegebene Passwort ist falsch. Zugriff verwehrt</translation>
+        <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>
-        <translation>Alle</translation>
+        <source>Security configuration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>Keine</translation>
+        <source>Load which plugins in what order:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter new passcode</source>
-        <translation>Neues Passwort eingeben</translation>
+        <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>
     </message>
     <message>
-        <source>Re-enter new passcode</source>
-        <translation>Passwort erneut eingeben</translation>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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">Login</translation>
+    </message>
+    <message>
+        <source>Sync</source>
+        <translation type="unfinished">Synchroniseren</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished">Alle</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Keine</translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
+    <message>
+        <source>When to lock Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple plugins authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Required successes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: the third option implies the second one</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Security</name>
+    <message>
+        <source>Set passcode</source>
+        <translation type="obsolete">Passwort einstellen</translation>
+    </message>
+    <message>
+        <source>Change passcode</source>
+        <translation type="obsolete">Passwort ändern</translation>
+    </message>
+    <message>
+        <source>Enter passcode</source>
+        <translation type="obsolete">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Passcode incorrect</source>
+        <translation type="obsolete">Passwort falsch</translation>
+    </message>
+    <message>
+        <source>The passcode entered is incorrect.
+Access denied</source>
+        <translation type="obsolete">Das eingegebene Passwort ist falsch. Zugriff verwehrt</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation type="obsolete">Alle</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="obsolete">Keine</translation>
+    </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="obsolete">Neues Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="obsolete">Passwort erneut eingeben</translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="obsolete">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="obsolete">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="obsolete">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="obsolete">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="obsolete">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="obsolete">1.0.0.0/8</translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
-        <translation>Sicherheitseinstellungen</translation>
+        <translation type="obsolete">Sicherheitseinstellungen</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Passwort ändern</translation>
+        <translation type="obsolete">Passwort ändern</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation>Passwort löschen</translation>
+        <translation type="obsolete">Passwort löschen</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation>Passwort muss beim Starten 
+        <translation type="obsolete">Passwort muss beim Starten 
 eingegeben werden</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation>Synchroniseren</translation>
+        <translation type="obsolete">Synchroniseren</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation>Synchronisierung gestatten aus dem Netzwerk:</translation>
+        <translation type="obsolete">Synchronisierung gestatten aus dem Netzwerk:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Alle</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Keine</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation>&lt;P&gt;Das Passwort bietet einen minimalen Schutz, 
+        <translation type="obsolete">&lt;P&gt;Das Passwort bietet einen minimalen Schutz, 
 sollte jemand unerwünscht Zugriff auf dieses 
 Gerät erhalten.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (Standard)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Login</source>
-        <translation>Login</translation>
+        <translation type="obsolete">Login</translation>
     </message>
     <message>
         <source>Login Automatically</source>
-        <translation>Automatisch einloggen</translation>
-    </message>
-    <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Automatisch einloggen</translation>
     </message>
+</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>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Sync</source>
+        <translation type="unfinished">Synchroniseren</translation>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Accept sync from network:</source>
+        <translation type="unfinished">Synchronisierung gestatten aus dem Netzwerk:</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/security.ts b/i18n/dk/security.ts
index 1530ddb..4f105ad 100644
--- a/i18n/dk/security.ts
+++ b/i18n/dk/security.ts
@@ -1,214 +1,242 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Attention</source>
+        <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cancel</source>
+        <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</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>
     </message>
     <message>
-        <source>192.168.129.0/24</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>192.168.1.0/24</source>
+        <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <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>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
+        <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set passcode</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
+        <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter passcode</source>
+        <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode incorrect</source>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter new passcode</source>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re-enter new passcode</source>
+        <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SecurityBase</name>
     <message>
-        <source>Security Settings</source>
+        <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode</source>
+        <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
+        <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clear passcode</source>
+        <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
     <message>
-        <source>Require pass code at power-on</source>
+        <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
+        <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login</source>
+        <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login Automatically</source>
+        <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Debug options</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,214 +1,242 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Set passcode</source>
+        <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter passcode</source>
+        <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <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>
     </message>
     <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>
     </message>
     <message>
-        <source>Enter new passcode</source>
+        <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SecurityBase</name>
     <message>
-        <source>Security Settings</source>
+        <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
-        <source>Require pass code at power-on</source>
+        <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sync</source>
+        <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept sync from network:</source>
+        <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
-        <source>Passcode</source>
+        <source>Debug options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login Automatically</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <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>
     </message>
     <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>
     </message>
     <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>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/security.ts b/i18n/es/security.ts
index 5533dcb..5c5be3c 100644
--- a/i18n/es/security.ts
+++ b/i18n/es/security.ts
@@ -1,247 +1,376 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Set passcode</source>
-        <translation>Fijar código</translation>
+        <source>LoginBase</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
-        <translation>Cambiar código</translation>
+        <source>Login</source>
+        <translation type="unfinished">Identificación</translation>
     </message>
     <message>
-        <source>Enter passcode</source>
-        <translation>Introducir código</translation>
+        <source>Login Automatically</source>
+        <translation type="unfinished">Identificación automática</translation>
     </message>
     <message>
-        <source>Passcode incorrect</source>
-        <translation>Código Incorrecto</translation>
+        <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>
     </message>
     <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation>El código introducido es incorrecto.
-Acceso denegado</translation>
+        <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>Security configuration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
-        <translation>Cualquiera</translation>
+        <source>Load which plugins in what order:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>Ninguna</translation>
+        <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>
     </message>
     <message>
-        <source>Enter new passcode</source>
-        <translation>Teclee nuevo código</translation>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re-enter new passcode</source>
-        <translation>Reintroduzca nuevo código</translation>
+        <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">Identificación</translation>
+    </message>
+    <message>
+        <source>Sync</source>
+        <translation type="unfinished">Sincronizar</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished">Cualquiera</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Ninguna</translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
+    <message>
+        <source>When to lock Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple plugins authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Required successes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: the third option implies the second one</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Security</name>
+    <message>
+        <source>Set passcode</source>
+        <translation type="obsolete">Fijar código</translation>
+    </message>
+    <message>
+        <source>Change passcode</source>
+        <translation type="obsolete">Cambiar código</translation>
+    </message>
+    <message>
+        <source>Enter passcode</source>
+        <translation type="obsolete">Introducir código</translation>
+    </message>
+    <message>
+        <source>Passcode incorrect</source>
+        <translation type="obsolete">Código Incorrecto</translation>
+    </message>
+    <message>
+        <source>The passcode entered is incorrect.
+Access denied</source>
+        <translation type="obsolete">El código introducido es incorrecto.
+Acceso denegado</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation type="obsolete">Cualquiera</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="obsolete">Ninguna</translation>
+    </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="obsolete">Teclee nuevo código</translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="obsolete">Reintroduzca nuevo código</translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="obsolete">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="obsolete">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="obsolete">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="obsolete">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="obsolete">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="obsolete">1.0.0.0/8</translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
-        <translation>Configuración de Seguridad</translation>
+        <translation type="obsolete">Configuración de Seguridad</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Cambiar código</translation>
+        <translation type="obsolete">Cambiar código</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation>Borrar código</translation>
+        <translation type="obsolete">Borrar código</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation>Solicitar código al encender</translation>
+        <translation type="obsolete">Solicitar código al encender</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation>Sincronizar</translation>
+        <translation type="obsolete">Sincronizar</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation>Sincronización desde red:</translation>
+        <translation type="obsolete">Sincronización desde red:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (predefinido)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ninguna</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation>&lt;P&gt;Elegir un código proporciona un mínimo nivel de protección contra accesos ocasionales al dispositivo.</translation>
+        <translation type="obsolete">&lt;P&gt;Elegir un código proporciona un mínimo nivel de protección contra accesos ocasionales al dispositivo.</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
-        <translation>Código</translation>
+        <translation type="obsolete">Código</translation>
     </message>
     <message>
         <source>Login</source>
-        <translation>Identificación</translation>
+        <translation type="obsolete">Identificación</translation>
     </message>
     <message>
         <source>Login Automatically</source>
-        <translation>Identificación automática</translation>
-    </message>
-    <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Identificación automática</translation>
     </message>
+</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>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Sync</source>
+        <translation type="unfinished">Sincronizar</translation>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Accept sync from network:</source>
+        <translation type="unfinished">Sincronización desde red:</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/security.ts b/i18n/fr/security.ts
index b3a9e8c..52d927f 100644
--- a/i18n/fr/security.ts
+++ b/i18n/fr/security.ts
@@ -1,311 +1,541 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>LoginBase</name>
+    <message>
+        <source>LoginBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished">Nom de connexion</translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation type="unfinished">Connexion automatique</translation>
+    </message>
+    <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>
+        <translation type="unfinished">Si vous activez cette option, opie-login vous ouvrira automatiquement une session avec le nom d&apos;utilisateur de la liste déroulante.
+
+Pour le Zaurus 5x00 c&apos;est toujours l&apos;utilisateur &quot;root&quot;.</translation>
+    </message>
+    <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>
+        <translation type="unfinished">Cette liste déroulante vous permet de sélectionnez le nom d&apos;utilisateur à utiliser lors de l&apos;ouverture de session automatique.
+
+Vous ne pouvez sélectionner qu&apos;un nom d&apos;utilisateur existant.</translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthConfig</name>
+    <message>
+        <source>Security configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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">Nom de connexion</translation>
+    </message>
+    <message>
+        <source>Sync</source>
+        <translation type="unfinished">Synchronisation</translation>
+    </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished">Attention</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished">&lt;p&gt;Tous les paramètres utilisateurs seront perdus.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished">Tous</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Aucun</translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
+    <message>
+        <source>When to lock Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple plugins authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Required successes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: the third option implies the second one</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
-        <translation>Entrer le
+        <translation type="obsolete">Entrer le
 mot de passe</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Changer le
+        <translation type="obsolete">Changer le
 mot de passe</translation>
     </message>
     <message>
         <source>Enter passcode</source>
-        <translation>Entrer mot de passe</translation>
+        <translation type="obsolete">Entrer mot de passe</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
-        <translation>Mot de passe incorrect</translation>
+        <translation type="obsolete">Mot de passe incorrect</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
-        <translation>Le mot de passe est incorrect.
+        <translation type="obsolete">Le mot de passe est incorrect.
 Accès refusé</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>Tous</translation>
+        <translation type="obsolete">Tous</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Aucun</translation>
+        <translation type="obsolete">Aucun</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
-        <translation>Entrer le nouveau mot de passe</translation>
+        <translation type="obsolete">Entrer le nouveau mot de passe</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
-        <translation>Réentrez le mot de passe</translation>
+        <translation type="obsolete">Réentrez le mot de passe</translation>
     </message>
     <message>
         <source>Attention</source>
-        <translation>Attention</translation>
+        <translation type="obsolete">Attention</translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation>&lt;p&gt;Tous les paramètres utilisateurs seront perdus.</translation>
+        <translation type="obsolete">&lt;p&gt;Tous les paramètres utilisateurs seront perdus.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Annuler</translation>
+        <translation type="obsolete">Annuler</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>OK</translation>
+        <translation type="obsolete">OK</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
-        <translation>192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="obsolete">ATTENTION</translation>
     </message>
     <message>
         <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
         <translation type="obsolete">&lt;p&gt;Sélectionnez IntelliSync ici désactivera le mot de passe FTP.&lt;p&gt;Chaque machine de votre sous réseau pourra se synchroniser avec votre Zaurus!</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
-        <translation>Paramètres de sécurité</translation>
+        <translation type="obsolete">Paramètres de sécurité</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Changer le
+        <translation type="obsolete">Changer le
 mot de passe</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation>Effacer le
+        <translation type="obsolete">Effacer le
 mot de passe</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation>Demander le mot de passe au démarrage</translation>
+        <translation type="obsolete">Demander le mot de passe au démarrage</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation>Synchronisation</translation>
+        <translation type="obsolete">Synchronisation</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation>Accepter la synchronisation par réseau de : </translation>
+        <translation type="obsolete">Accepter la synchronisation par réseau de : </translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Tous</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Aucun</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation>&lt;P&gt;Ce mot de passe vous permet de protéger l&apos;accès à votre organiseur.</translation>
+        <translation type="obsolete">&lt;P&gt;Ce mot de passe vous permet de protéger l&apos;accès à votre organiseur.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (par défaut)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
-        <translation>Mot de Passe</translation>
+        <translation type="obsolete">Mot de Passe</translation>
     </message>
     <message>
         <source>Login</source>
-        <translation>Nom de connexion</translation>
+        <translation type="obsolete">Nom de connexion</translation>
     </message>
     <message>
         <source>Login Automatically</source>
-        <translation>Connexion automatique</translation>
+        <translation type="obsolete">Connexion automatique</translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
-        <translation>Ce bouton vous permet de changer le mot de passe de sécurité
+        <translation type="obsolete">Ce bouton vous permet de changer le mot de passe de sécurité
 
 Note : Ne pas confondre avec le mot de passe de synchronisation.</translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
-        <translation>Supprimer le mot de passe courant.
+        <translation type="obsolete">Supprimer le mot de passe courant.
 Vous pourrez en entrer un nouveau à n&apos;importe qu&apos;elle moment.</translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
-        <translation>Si vous activez cette option, un mot de passe sera demandé après chaque allumage du Zaurus.</translation>
+        <translation type="obsolete">Si vous activez cette option, un mot de passe sera demandé après chaque allumage du Zaurus.</translation>
     </message>
     <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>
-        <translation>Si vous activez cette option, opie-login vous ouvrira automatiquement une session avec le nom d&apos;utilisateur de la liste déroulante.
+        <translation type="obsolete">Si vous activez cette option, opie-login vous ouvrira automatiquement une session avec le nom d&apos;utilisateur de la liste déroulante.
 
 Pour le Zaurus 5x00 c&apos;est toujours l&apos;utilisateur &quot;root&quot;.</translation>
     </message>
     <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>
-        <translation>Cette liste déroulante vous permet de sélectionnez le nom d&apos;utilisateur à utiliser lors de l&apos;ouverture de session automatique.
+        <translation type="obsolete">Cette liste déroulante vous permet de sélectionnez le nom d&apos;utilisateur à utiliser lors de l&apos;ouverture de session automatique.
 
 Vous ne pouvez sélectionner qu&apos;un nom d&apos;utilisateur existant.</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
-        <translation>Sélectionnez une plage d&apos;adresses IP.
+        <translation type="obsolete">Sélectionnez une plage d&apos;adresses IP.
 
 Cette liste déroulante vous permet de sélectionnez qui du réseau peut se connecter à votre Zaurus.
 
 Par exemple, une plage d&apos;adresses du type  192.168.1.0/24 permettra aux machines ayant une adresse IP entre 192.168.1.1 et  192.168.1.254 de se connecter (et se synchroniserà avec le Zaurus.
 
 L&apos;option &quot;Tous&quot; permet à *toutes* adresse IP de se connecter.
 L&apos;option &quot;Aucun&quot; empêchera *toutes* adresse IP de se connecter.
 
 Si vous n&apos;êtes pas sur, sélectionnez &quot;Tous&quot;.</translation>
     </message>
     <message>
         <source>Delete Entry</source>
-        <translation>Supprimer entrée</translation>
+        <translation type="obsolete">Supprimer entrée</translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
-        <translation>Supprime la plage d&apos;adresse IP de la liste.</translation>
+        <translation type="obsolete">Supprime la plage d&apos;adresse IP de la liste.</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
-        <translation>Paramètres par défaut</translation>
+        <translation type="obsolete">Paramètres par défaut</translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
-        <translation>Ce bouton restaure une liste de plage IP par défaut.
+        <translation type="obsolete">Ce bouton restaure une liste de plage IP par défaut.
 
 Attention : Toutes les plages d&apos;adresse IP entrées manuellement seront perdus!</translation>
     </message>
     <message>
         <source>Select your sync software</source>
-        <translation>Sélectionnez votre logiciel de synchronisation</translation>
+        <translation type="obsolete">Sélectionnez votre logiciel de synchronisation</translation>
     </message>
     <message>
         <source>QTopia</source>
         <translation type="obsolete">QTopia</translation>
     </message>
     <message>
         <source>IntelliSync</source>
-        <translation>IntelliSync</translation>
+        <translation type="obsolete">IntelliSync</translation>
     </message>
     <message>
         <source>This option changes the login behaviour of the internal FTP server.  
 
 If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
 
 The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
         <translation type="obsolete">Cette option change la façon dont le serveur FTP interne accepte les connections.
 
 Si vous avez un problème de synchronisation, essayez le paramètrage &quot;IntelliSync&quot; qui acceptera tous les mots de passe reçu sur le port de synchronisation (FTP).
 
 Le paramètrage par défaut est Qtopia. Il permet de se connecter en tant qu&apos;utilisateur &quot;root&quot; et comme mot de passe &quot;Qtopia&quot;.
 
 Attention : les mots de passe sont sensibles à la case (i.e HeLLo est différent de Hello).</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
-        <translation>Qtopia 1.7</translation>
+        <translation type="obsolete">Qtopia 1.7</translation>
     </message>
     <message>
         <source>Opie 1.0</source>
-        <translation>Opie 1.0</translation>
+        <translation type="obsolete">Opie 1.0</translation>
     </message>
     <message>
         <source>Both</source>
         <translation type="obsolete">Les deux</translation>
     </message>
+</context>
+<context>
+    <name>SyncBase</name>
     <message>
-        <source>Alter the Sync Protocol to tweak for the different devices.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></source>
-        <translation type="obsolete">Modifie le protocole de synchronisation pour s&apos;adapter aux différents appareils.
-  IntelliSync désactivera la vérification du mot de passe mais il vous sera demandé de confirmer la connexion.
-  Opie 1.0 sera compatible avec Qtopia Desktop, MultiSync et KitchenSync.
-  Qtopia 1.7 va modifier la façon dont les données sont envoyées au client et ne fonctionnera pas avec d&apos;autres clients.</translation>
+        <source>SyncBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sync</source>
+        <translation type="unfinished">Synchronisation</translation>
+    </message>
+    <message>
+        <source>Accept sync from network:</source>
+        <translation type="unfinished">Accepter la synchronisation par réseau de : </translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished">Sélectionnez une plage d&apos;adresses IP.
+
+Cette liste déroulante vous permet de sélectionnez qui du réseau peut se connecter à votre Zaurus.
+
+Par exemple, une plage d&apos;adresses du type  192.168.1.0/24 permettra aux machines ayant une adresse IP entre 192.168.1.1 et  192.168.1.254 de se connecter (et se synchroniserà avec le Zaurus.
+
+L&apos;option &quot;Tous&quot; permet à *toutes* adresse IP de se connecter.
+L&apos;option &quot;Aucun&quot; empêchera *toutes* adresse IP de se connecter.
+
+Si vous n&apos;êtes pas sur, sélectionnez &quot;Tous&quot;.</translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished">Supprimer entrée</translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished">Supprime la plage d&apos;adresse IP de la liste.</translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished">Paramètres par défaut</translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished">Ce bouton restaure une liste de plage IP par défaut.
+
+Attention : Toutes les plages d&apos;adresse IP entrées manuellement seront perdus!</translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished">Sélectionnez votre logiciel de synchronisation</translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished">Qtopia 1.7</translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished">Opie 1.0</translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished">IntelliSync</translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/security.ts b/i18n/hu/security.ts
index 9dbe05b..4f105ad 100644
--- a/i18n/hu/security.ts
+++ b/i18n/hu/security.ts
@@ -1,214 +1,242 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Set passcode</source>
+        <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter passcode</source>
+        <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <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>
     </message>
     <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>
     </message>
     <message>
-        <source>Enter new passcode</source>
+        <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SecurityBase</name>
     <message>
-        <source>Security Settings</source>
+        <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
-        <source>Require pass code at power-on</source>
+        <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sync</source>
+        <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept sync from network:</source>
+        <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
-        <source>Passcode</source>
+        <source>Debug options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login Automatically</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <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>
     </message>
     <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>
     </message>
     <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>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/security.ts b/i18n/it/security.ts
index c32444c..15bf662 100644
--- a/i18n/it/security.ts
+++ b/i18n/it/security.ts
@@ -1,248 +1,377 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Set passcode</source>
-        <translation>Imposta password</translation>
+        <source>LoginBase</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
-        <translation>Cambia password</translation>
+        <source>Login</source>
+        <translation type="unfinished">Login</translation>
     </message>
     <message>
-        <source>Enter passcode</source>
-        <translation>Inserisci password</translation>
+        <source>Login Automatically</source>
+        <translation type="unfinished">Login Automatico</translation>
     </message>
     <message>
-        <source>Passcode incorrect</source>
-        <translation>Password errata</translation>
+        <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>
     </message>
     <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation>La password inserita è sbagliata.
-Accesso negato</translation>
+        <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>Security configuration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
-        <translation>Tutti</translation>
+        <source>Load which plugins in what order:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>Nessuno</translation>
+        <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>
     </message>
     <message>
-        <source>Enter new passcode</source>
-        <translation>Inserisci nuova password</translation>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re-enter new passcode</source>
-        <translation>Rinserisci nuova password</translation>
+        <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">Login</translation>
+    </message>
+    <message>
+        <source>Sync</source>
+        <translation type="unfinished">Sync</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
+    <message>
+        <source>When to lock Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple plugins authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Required successes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: the third option implies the second one</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Security</name>
+    <message>
+        <source>Set passcode</source>
+        <translation type="obsolete">Imposta password</translation>
+    </message>
+    <message>
+        <source>Change passcode</source>
+        <translation type="obsolete">Cambia password</translation>
+    </message>
+    <message>
+        <source>Enter passcode</source>
+        <translation type="obsolete">Inserisci password</translation>
+    </message>
+    <message>
+        <source>Passcode incorrect</source>
+        <translation type="obsolete">Password errata</translation>
+    </message>
+    <message>
+        <source>The passcode entered is incorrect.
+Access denied</source>
+        <translation type="obsolete">La password inserita è sbagliata.
+Accesso negato</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation type="obsolete">Tutti</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="obsolete">Nessuno</translation>
+    </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="obsolete">Inserisci nuova password</translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="obsolete">Rinserisci nuova password</translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="obsolete">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="obsolete">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="obsolete">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="obsolete">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="obsolete">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="obsolete">1.0.0.0/8</translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
-        <translation>Impostazioni Sicurezza</translation>
+        <translation type="obsolete">Impostazioni Sicurezza</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Cambia password</translation>
+        <translation type="obsolete">Cambia password</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation>Cancella password</translation>
+        <translation type="obsolete">Cancella password</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation>Richiedi password all&apos;avvio</translation>
+        <translation type="obsolete">Richiedi password all&apos;avvio</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation>Sync</translation>
+        <translation type="obsolete">Sync</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation>Accetta sync dalla rete:</translation>
+        <translation type="obsolete">Accetta sync dalla rete:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (predefinita)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Tutte</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nessuna</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation>&lt;P&gt;La protezione mediante password fornisce un minimo livello di protezione dall&apos;accesso illegale del dispositivo.</translation>
+        <translation type="obsolete">&lt;P&gt;La protezione mediante password fornisce un minimo livello di protezione dall&apos;accesso illegale del dispositivo.</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
-        <translation>Password</translation>
+        <translation type="obsolete">Password</translation>
     </message>
     <message>
         <source>Login</source>
-        <translation>Login</translation>
+        <translation type="obsolete">Login</translation>
     </message>
     <message>
         <source>Login Automatically</source>
-        <translation>Login Automatico</translation>
-    </message>
-    <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Login Automatico</translation>
     </message>
+</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>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Sync</source>
+        <translation type="unfinished">Sync</translation>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Accept sync from network:</source>
+        <translation type="unfinished">Accetta sync dalla rete:</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/security.ts b/i18n/ja/security.ts
index 1530ddb..4f105ad 100644
--- a/i18n/ja/security.ts
+++ b/i18n/ja/security.ts
@@ -1,214 +1,242 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Attention</source>
+        <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cancel</source>
+        <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</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>
     </message>
     <message>
-        <source>192.168.129.0/24</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>192.168.1.0/24</source>
+        <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <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>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
+        <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set passcode</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
+        <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter passcode</source>
+        <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode incorrect</source>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter new passcode</source>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re-enter new passcode</source>
+        <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SecurityBase</name>
     <message>
-        <source>Security Settings</source>
+        <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode</source>
+        <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
+        <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clear passcode</source>
+        <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
     <message>
-        <source>Require pass code at power-on</source>
+        <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
+        <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login</source>
+        <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login Automatically</source>
+        <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Debug options</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/security.ts b/i18n/ko/security.ts
index 1530ddb..4f105ad 100644
--- a/i18n/ko/security.ts
+++ b/i18n/ko/security.ts
@@ -1,214 +1,242 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Attention</source>
+        <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cancel</source>
+        <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</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>
     </message>
     <message>
-        <source>192.168.129.0/24</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>192.168.1.0/24</source>
+        <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <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>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
+        <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set passcode</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
+        <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter passcode</source>
+        <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode incorrect</source>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter new passcode</source>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re-enter new passcode</source>
+        <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SecurityBase</name>
     <message>
-        <source>Security Settings</source>
+        <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode</source>
+        <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
+        <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clear passcode</source>
+        <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
     <message>
-        <source>Require pass code at power-on</source>
+        <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
+        <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login</source>
+        <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login Automatically</source>
+        <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Debug options</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/security.ts b/i18n/lv/security.ts
index 1530ddb..4f105ad 100644
--- a/i18n/lv/security.ts
+++ b/i18n/lv/security.ts
@@ -1,214 +1,242 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Attention</source>
+        <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cancel</source>
+        <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</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>
     </message>
     <message>
-        <source>192.168.129.0/24</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>192.168.1.0/24</source>
+        <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <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>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
+        <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set passcode</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
+        <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter passcode</source>
+        <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode incorrect</source>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter new passcode</source>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re-enter new passcode</source>
+        <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SecurityBase</name>
     <message>
-        <source>Security Settings</source>
+        <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode</source>
+        <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
+        <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clear passcode</source>
+        <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
     <message>
-        <source>Require pass code at power-on</source>
+        <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
+        <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login</source>
+        <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login Automatically</source>
+        <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Debug options</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/security.ts b/i18n/mk/security.ts
index eea194d..5c1d0e5 100644
--- a/i18n/mk/security.ts
+++ b/i18n/mk/security.ts
@@ -1,247 +1,364 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Set passcode</source>
-        <translation>Намести лозинја</translation>
+        <source>LoginBase</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
-        <translation>Смени лозинка</translation>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter passcode</source>
-        <translation>Внеси лозинка</translation>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode incorrect</source>
-        <translation>Неточна лозинка</translation>
+        <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>
     </message>
     <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation>Лозинката не е точна.
-Одбиен пристап</translation>
+        <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>
-        <translation>Секој</translation>
+        <source>Security configuration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>Ништо</translation>
+        <source>Load which plugins in what order:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter new passcode</source>
-        <translation>Внеси нова лозинка</translation>
+        <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>
     </message>
     <message>
-        <source>Re-enter new passcode</source>
-        <translation>Повтторно внеси лозинка</translation>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24 </translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/24 </translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished">Секој</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Ништо</translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
+    <message>
+        <source>When to lock Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple plugins authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Required successes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: the third option implies the second one</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Security</name>
+    <message>
+        <source>Set passcode</source>
+        <translation type="obsolete">Намести лозинја</translation>
+    </message>
+    <message>
+        <source>Change passcode</source>
+        <translation type="obsolete">Смени лозинка</translation>
+    </message>
+    <message>
+        <source>Enter passcode</source>
+        <translation type="obsolete">Внеси лозинка</translation>
+    </message>
+    <message>
+        <source>Passcode incorrect</source>
+        <translation type="obsolete">Неточна лозинка</translation>
+    </message>
+    <message>
+        <source>The passcode entered is incorrect.
+Access denied</source>
+        <translation type="obsolete">Лозинката не е точна.
+Одбиен пристап</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation type="obsolete">Секој</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="obsolete">Ништо</translation>
+    </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="obsolete">Внеси нова лозинка</translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="obsolete">Повтторно внеси лозинка</translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="obsolete">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="obsolete">192.168.1.0/24 </translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="obsolete">192.168.0.0/24 </translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="obsolete">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="obsolete">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="obsolete">1.0.0.0/8</translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
-        <translation>Сигурносни подесувања</translation>
+        <translation type="obsolete">Сигурносни подесувања</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Смени лозинка</translation>
+        <translation type="obsolete">Смени лозинка</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation>Избриши лозинка</translation>
+        <translation type="obsolete">Избриши лозинка</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation>Барај лозинка на подигање</translation>
+        <translation type="obsolete">Барај лозинка на подигање</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation>Синхронизирај</translation>
+        <translation type="obsolete">Синхронизирај</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation>Прифати синхронизација од мрежа:</translation>
+        <translation type="obsolete">Прифати синхронизација од мрежа:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (основна)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24 </translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/24 </translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Секој</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ништо</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation>&lt;p&gt; Заштитата со лозинка дава минимални ниво на заштита од повремен пристап до уредот.</translation>
-    </message>
-    <message>
-        <source>Passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login Automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&lt;p&gt; Заштитата со лозинка дава минимални ниво на заштита од повремен пристап до уредот.</translation>
     </message>
+</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>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Sync</source>
+        <translation type="unfinished">Синхронизирај</translation>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Accept sync from network:</source>
+        <translation type="unfinished">Прифати синхронизација од мрежа:</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/security.ts b/i18n/nl/security.ts
index d268cb7..36d6365 100644
--- a/i18n/nl/security.ts
+++ b/i18n/nl/security.ts
@@ -1,297 +1,511 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>LoginBase</name>
+    <message>
+        <source>LoginBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished">Log in</translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation type="unfinished">Log automatich in</translation>
+    </message>
+    <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>
+        <translation type="unfinished">Als deze optie gebruikt wordt, zal opie-login automagisch voor u inloggen als de gebruiker die geselecteerd is in de lijst hieronder.
+
+Voor de Zaurus 5x00 is dit altijd &quot;root&quot;.</translation>
+    </message>
+    <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>
+        <translation type="unfinished">Op deze lijst  kunt u de gebruiker voor auto-login selecteren
+(als deze optie aanstaat)
+
+Alleen een geconfigureerd gebruiker kan geselecteerd worden.</translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthConfig</name>
+    <message>
+        <source>Security configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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">Log in</translation>
+    </message>
+    <message>
+        <source>Sync</source>
+        <translation type="unfinished">Sync</translation>
+    </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished">Attentie</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished">&lt;p&gt;Alle gebruikersinstellingen zullen verloren gaan.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuleer</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished">Ok</translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished">Iedere</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Geen</translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
+    <message>
+        <source>When to lock Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple plugins authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Required successes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: the third option implies the second one</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
-        <translation>Stel PINcode in</translation>
+        <translation type="obsolete">Stel PINcode in</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Verander PINcode</translation>
+        <translation type="obsolete">Verander PINcode</translation>
     </message>
     <message>
         <source>Enter passcode</source>
-        <translation>Voer PINcode in</translation>
+        <translation type="obsolete">Voer PINcode in</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
-        <translation>PINcode niet correct</translation>
+        <translation type="obsolete">PINcode niet correct</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
-        <translation>Ingevoerde PINcode is niet correct.
+        <translation type="obsolete">Ingevoerde PINcode is niet correct.
 Toegang geweigerd</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>Iedere</translation>
+        <translation type="obsolete">Iedere</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Geen</translation>
+        <translation type="obsolete">Geen</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
-        <translation>Voer nieuwe PINcode in</translation>
+        <translation type="obsolete">Voer nieuwe PINcode in</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
-        <translation>Voer nieuwe opnieuw PINcode in</translation>
+        <translation type="obsolete">Voer nieuwe opnieuw PINcode in</translation>
     </message>
     <message>
         <source>Attention</source>
-        <translation>Attentie</translation>
+        <translation type="obsolete">Attentie</translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation>&lt;p&gt;Alle gebruikersinstellingen zullen verloren gaan.</translation>
+        <translation type="obsolete">&lt;p&gt;Alle gebruikersinstellingen zullen verloren gaan.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Annuleer</translation>
+        <translation type="obsolete">Annuleer</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="obsolete">Ok</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
-        <translation>192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
-        <translation>Beveiligingsinstellingen</translation>
+        <translation type="obsolete">Beveiligingsinstellingen</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Verander PINcode</translation>
+        <translation type="obsolete">Verander PINcode</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation>Schoon PINcode</translation>
+        <translation type="obsolete">Schoon PINcode</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation>Vraag PINcode bij power-aan</translation>
+        <translation type="obsolete">Vraag PINcode bij power-aan</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation>Sync</translation>
+        <translation type="obsolete">Sync</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation>Accepteer sync van netwerk:</translation>
+        <translation type="obsolete">Accepteer sync van netwerk:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (standaard)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Iedere</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Geen</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation>&lt;p&gt;PINcode beveiliging biedt slechts een minimale beveiliging tegen toevallige toegang tot dit apparaat.</translation>
+        <translation type="obsolete">&lt;p&gt;PINcode beveiliging biedt slechts een minimale beveiliging tegen toevallige toegang tot dit apparaat.</translation>
     </message>
     <message>
         <source>Passcode</source>
-        <translation>PINcode</translation>
+        <translation type="obsolete">PINcode</translation>
     </message>
     <message>
         <source>Login</source>
-        <translation>Log in</translation>
+        <translation type="obsolete">Log in</translation>
     </message>
     <message>
         <source>Login Automatically</source>
-        <translation>Log automatich in</translation>
+        <translation type="obsolete">Log automatich in</translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
-        <translation>Met deze toets kan het bebeiligingswachtwoord gewijzigd worden.
+        <translation type="obsolete">Met deze toets kan het bebeiligingswachtwoord gewijzigd worden.
 
 Let op: Dit is *niet* het synchronisatiewachtwoord.</translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
-        <translation>Verwijder huidig wachtwoord.
+        <translation type="obsolete">Verwijder huidig wachtwoord.
 Een nieuwe kan altijd worden ingevoerd.</translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
-        <translation>Als deze optie gebruikt wordt, moet iedere keer dat dit apparaat ingeschakeld wordt een wachtwoord ingevoerd worden.</translation>
+        <translation type="obsolete">Als deze optie gebruikt wordt, moet iedere keer dat dit apparaat ingeschakeld wordt een wachtwoord ingevoerd worden.</translation>
     </message>
     <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>
-        <translation>Als deze optie gebruikt wordt, zal opie-login automagisch voor u inloggen als de gebruiker die geselecteerd is in de lijst hieronder.
+        <translation type="obsolete">Als deze optie gebruikt wordt, zal opie-login automagisch voor u inloggen als de gebruiker die geselecteerd is in de lijst hieronder.
 
 Voor de Zaurus 5x00 is dit altijd &quot;root&quot;.</translation>
     </message>
     <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>
-        <translation>Op deze lijst  kunt u de gebruiker voor auto-login selecteren
+        <translation type="obsolete">Op deze lijst  kunt u de gebruiker voor auto-login selecteren
 (als deze optie aanstaat)
 
 Alleen een geconfigureerd gebruiker kan geselecteerd worden.</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.
 
 The entry &quot;All&quot; will allow *any* IP to connect.
 The entry &quot;None&quot; will *deny* any connection.
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="obsolete">Selecteer een net-bereik of vul een nieuwe in.
 
 Met deze lijst kan een net-bereik gekozen worden waarmee de handheld tegestaan is te verbinden.
 
 Bijvoorbeeld, als een net-bereik ingesteld wordt als 192.168.1.0/24 kan iedere machine met een IP adres tussen 192.168.1.1 en 192.168.1.254 verbinden (en synchroniseren)met deze handheld.
 
 De instelling &quot;Iedere&quot; zal *alle* IP adressen toelaten,
 De instelling &quot;Geen&quot; zal alle IP adressen *weigeren*.
 
 Bij twifel tijdelijk &quot;Iedere&quot; gebruiken.</translation>
     </message>
     <message>
         <source>Delete Entry</source>
-        <translation>Verwijder invoer</translation>
+        <translation type="obsolete">Verwijder invoer</translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
-        <translation>Verwijder het net-bereik uit de lijst
+        <translation type="obsolete">Verwijder het net-bereik uit de lijst
 
 Als deze knop gebruikt wordt, wordt het huidige net-bereik gewist uit de lijst met net-bereiken.
 
 Als deze knop per ongeluk gebruikt wordt, kunnen de standaardinstellingen
 worden teruggezet met de knop &quot;Herstel standaardinstelling&quot;.</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
-        <translation>Herstel standaardinstelling</translation>
+        <translation type="obsolete">Herstel standaardinstelling</translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
-        <translation>Deze knop zal de lijst met net-bereiken terugbrengen
+        <translation type="obsolete">Deze knop zal de lijst met net-bereiken terugbrengen
 naar zijn standaardinstelling.
 
 Let erop dat daarmee al uw ingevulde net-bereiken zullen worden gewist!</translation>
     </message>
     <message>
         <source>Select your sync software</source>
-        <translation>Kies de synchronisatiesoftware</translation>
+        <translation type="obsolete">Kies de synchronisatiesoftware</translation>
     </message>
     <message>
         <source>IntelliSync</source>
-        <translation>IntelliSync</translation>
+        <translation type="obsolete">IntelliSync</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
-        <translation>Qtopia 1.7</translation>
+        <translation type="obsolete">Qtopia 1.7</translation>
     </message>
     <message>
         <source>Opie 1.0</source>
-        <translation>Opie 1.0</translation>
+        <translation type="obsolete">Opie 1.0</translation>
     </message>
+</context>
+<context>
+    <name>SyncBase</name>
     <message>
-        <source>Alter the Sync Protocol to tweak for the different devices.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></source>
-        <translation type="obsolete">Verander het Sync protocol om aan te sluiten op de verschillende mogelijkheden.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync zal de wachtwoordcontrole uitschakelen, maar er zal wel worden gevraagd om bevestiging van de verbinding.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 moet worden gebruit voor QtopiaDesktop, MultiSync en KitchenSync
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 heeft de wijze van dataverzending veranderd, en zal dus niet werken met oudere versies.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></translation>
+        <source>SyncBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sync</source>
+        <translation type="unfinished">Sync</translation>
+    </message>
+    <message>
+        <source>Accept sync from network:</source>
+        <translation type="unfinished">Accepteer sync van netwerk:</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished">Verwijder invoer</translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished">Verwijder het net-bereik uit de lijst
+
+Als deze knop gebruikt wordt, wordt het huidige net-bereik gewist uit de lijst met net-bereiken.
+
+Als deze knop per ongeluk gebruikt wordt, kunnen de standaardinstellingen
+worden teruggezet met de knop &quot;Herstel standaardinstelling&quot;.</translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished">Herstel standaardinstelling</translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished">Deze knop zal de lijst met net-bereiken terugbrengen
+naar zijn standaardinstelling.
+
+Let erop dat daarmee al uw ingevulde net-bereiken zullen worden gewist!</translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished">Kies de synchronisatiesoftware</translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished">Qtopia 1.7</translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished">Opie 1.0</translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished">IntelliSync</translation>
+    </message>
+    <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/security.ts b/i18n/no/security.ts
index 9dbe05b..4f105ad 100644
--- a/i18n/no/security.ts
+++ b/i18n/no/security.ts
@@ -1,214 +1,242 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Set passcode</source>
+        <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter passcode</source>
+        <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <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>
     </message>
     <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>
     </message>
     <message>
-        <source>Enter new passcode</source>
+        <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SecurityBase</name>
     <message>
-        <source>Security Settings</source>
+        <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
-        <source>Require pass code at power-on</source>
+        <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sync</source>
+        <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept sync from network:</source>
+        <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
-        <source>Passcode</source>
+        <source>Debug options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login Automatically</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <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>
     </message>
     <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>
     </message>
     <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>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/security.ts b/i18n/pl/security.ts
index 8bb2f3c..525ccc7 100644
--- a/i18n/pl/security.ts
+++ b/i18n/pl/security.ts
@@ -1,284 +1,520 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>LoginBase</name>
+    <message>
+        <source>LoginBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished">Login</translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation type="unfinished">Loguj automatycznie</translation>
+    </message>
+    <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>
+        <translation type="unfinished">Jeśli wybierzesz tą opcję, będziesz automatycznie logowany jako użytkownik, którego wybrałeś z listy rozwijanej.
+
+Dla Zaurusa 5x00 jest to zawsze użytkownik &quot;root&quot;.</translation>
+    </message>
+    <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>
+        <translation type="unfinished">Ta lista rozwijana pozwala na wybór automatycznie logowanego użytkownika
+(jeśli opcja jest włączona powyżej).
+
+Możesz wybrać tylko skonfigurowanego użytkownika.</translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthConfig</name>
+    <message>
+        <source>Security configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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">Login</translation>
+    </message>
+    <message>
+        <source>Sync</source>
+        <translation type="unfinished">Synchronizuj</translation>
+    </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished">Uwaga</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished">&lt;p&gt;Wszystkie zakresy użytkownika będę stracone.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Anuluj</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
+    <message>
+        <source>When to lock Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple plugins authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Required successes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: the third option implies the second one</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
-        <translation>Ustaw hasło</translation>
+        <translation type="obsolete">Ustaw hasło</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Zmień hasło</translation>
+        <translation type="obsolete">Zmień hasło</translation>
     </message>
     <message>
         <source>Enter passcode</source>
-        <translation>Podaj hasło</translation>
+        <translation type="obsolete">Podaj hasło</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
-        <translation>Błędne hasło</translation>
+        <translation type="obsolete">Błędne hasło</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
-        <translation>Podane hasło jest nieprawidłowe.
+        <translation type="obsolete">Podane hasło jest nieprawidłowe.
 Dostęp zabroniony</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>Wszystkie</translation>
+        <translation type="obsolete">Wszystkie</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Żadne</translation>
+        <translation type="obsolete">Żadne</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
-        <translation>Wpisz nowe hasło</translation>
+        <translation type="obsolete">Wpisz nowe hasło</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
-        <translation>Powtórz nowe hasło</translation>
+        <translation type="obsolete">Powtórz nowe hasło</translation>
     </message>
     <message>
         <source>Attention</source>
-        <translation>Uwaga</translation>
+        <translation type="obsolete">Uwaga</translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation>&lt;p&gt;Wszystkie zakresy użytkownika będę stracone.</translation>
+        <translation type="obsolete">&lt;p&gt;Wszystkie zakresy użytkownika będę stracone.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Anuluj</translation>
+        <translation type="obsolete">Anuluj</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>OK</translation>
+        <translation type="obsolete">OK</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
-        <translation>192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
-        <translation>Ustawienia bezpieczeństwa</translation>
+        <translation type="obsolete">Ustawienia bezpieczeństwa</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Zmień hasło</translation>
+        <translation type="obsolete">Zmień hasło</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation>Wyczyść hasło</translation>
+        <translation type="obsolete">Wyczyść hasło</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation>Wymagaj hasła po uruchomieniu</translation>
+        <translation type="obsolete">Wymagaj hasła po uruchomieniu</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation>Synchronizuj</translation>
+        <translation type="obsolete">Synchronizuj</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation>Akceptuj synchronizację z sieci:</translation>
+        <translation type="obsolete">Akceptuj synchronizację z sieci:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Kazdy</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Brak</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation>&lt;P&gt;Ochrona hasłem jest podstawowym zabezpieczeniem przed przypadkowym dostępem do tego urządzenia.</translation>
+        <translation type="obsolete">&lt;P&gt;Ochrona hasłem jest podstawowym zabezpieczeniem przed przypadkowym dostępem do tego urządzenia.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (domyslny)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
-        <translation>Hasło</translation>
+        <translation type="obsolete">Hasło</translation>
     </message>
     <message>
         <source>Login</source>
-        <translation>Login</translation>
+        <translation type="obsolete">Login</translation>
     </message>
     <message>
         <source>Login Automatically</source>
-        <translation>Loguj automatycznie</translation>
+        <translation type="obsolete">Loguj automatycznie</translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
-        <translation>Ten przycisk służy do zmiany hasła.
+        <translation type="obsolete">Ten przycisk służy do zmiany hasła.
 
 Uwaga: To *nie* jest hasło synchronizacji.</translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
-        <translation>Usuń aktualne hasło.
+        <translation type="obsolete">Usuń aktualne hasło.
 W dowolnej chwili możesz podać nowe.</translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
-        <translation>Jeśli włączysz tą opcję, będzie trzeba podawać hasło po każdym rozbudzeniu Zaurusa.</translation>
+        <translation type="obsolete">Jeśli włączysz tą opcję, będzie trzeba podawać hasło po każdym rozbudzeniu Zaurusa.</translation>
     </message>
     <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>
-        <translation>Jeśli wybierzesz tą opcję, będziesz automatycznie logowany jako użytkownik, którego wybrałeś z listy rozwijanej.
+        <translation type="obsolete">Jeśli wybierzesz tą opcję, będziesz automatycznie logowany jako użytkownik, którego wybrałeś z listy rozwijanej.
 
 Dla Zaurusa 5x00 jest to zawsze użytkownik &quot;root&quot;.</translation>
     </message>
     <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>
-        <translation>Ta lista rozwijana pozwala na wybór automatycznie logowanego użytkownika
+        <translation type="obsolete">Ta lista rozwijana pozwala na wybór automatycznie logowanego użytkownika
 (jeśli opcja jest włączona powyżej).
 
 Możesz wybrać tylko skonfigurowanego użytkownika.</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
-        <translation>Wybierz zakres sieciowy lub podaj nowy.
+        <translation type="obsolete">Wybierz zakres sieciowy lub podaj nowy.
 
 Ta lista rozwijana służy do wyboru zakresu adresów, z których można łączyć się z Zaurusem.
 
 Na przykład zakres 192.168.1.0/24 pozwala na połączenie (i synchronizację) każdej maszynie z IP pomiędzy 192.168.1.1 i 192.168.1.254.
 
 &quot;Wszystkie&quot; pozwoli na łączenie z *każdego* IP.
 &quot;Żadne&quot; odmówi *każdemu* połączeniu.
 
 Jeśli nie jesteś pewien co wybrać, wybierz &quot;Wszystkie&quot;.</translation>
     </message>
     <message>
         <source>Delete Entry</source>
-        <translation>Usuń wpis</translation>
+        <translation type="obsolete">Usuń wpis</translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
-        <translation>Usuń wybrany zakres sieciowy z listy
+        <translation type="obsolete">Usuń wybrany zakres sieciowy z listy
 
 Jeśli wciśniesz ten przycisk, aktualnie wybrany zakres sieciowy zostanie usunięty z listy zakresów sieciowych.
 
 Jeśli wciśniesz ten przycisk przez pomyłkę, to przycisk &quot;Przywróć domyślne&quot;
 przywróci listę do stanu w jakim była przy pierwszym starcie Zaurusa.</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
-        <translation>Przywróć domyślne</translation>
+        <translation type="obsolete">Przywróć domyślne</translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
-        <translation>Ten przycisk przywróci listę zakresów sieciowych
+        <translation type="obsolete">Ten przycisk przywróci listę zakresów sieciowych
 do stanu domyślnego.
 
 Uwaga, wszystkie ręcznie wprowadzone zakresy zostaną usunięte!</translation>
     </message>
     <message>
         <source>Select your sync software</source>
-        <translation>Wybierz oprogramowanie do synchronizacji</translation>
+        <translation type="obsolete">Wybierz oprogramowanie do synchronizacji</translation>
     </message>
     <message>
         <source>IntelliSync</source>
-        <translation>IntelliSync</translation>
+        <translation type="obsolete">IntelliSync</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
-        <translation>Qtopia 1.7</translation>
+        <translation type="obsolete">Qtopia 1.7</translation>
     </message>
     <message>
         <source>Opie 1.0</source>
-        <translation>Opie 1.0</translation>
+        <translation type="obsolete">Opie 1.0</translation>
     </message>
+</context>
+<context>
+    <name>SyncBase</name>
     <message>
-        <source>Alter the Sync Protocol to tweak for the different devices.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></source>
-        <translation type="obsolete">Zmień protokół synchronizacji aby go dostosować do różnych urządzeń.
-    IntelliSync wyłączy sprawdzanie hasła, ale zostaniesz poproszony o akceptację połączenia.
-    Opie1.0 będzie kompatybilne z QtopiaDesktop, MultiSync i KitchenSync.
-    Qtopia1.7 zmieni sposób wysyłania danych do klienta i nie będzie działać ze starszymi klientami.
-    </translation>
+        <source>SyncBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sync</source>
+        <translation type="unfinished">Synchronizuj</translation>
+    </message>
+    <message>
+        <source>Accept sync from network:</source>
+        <translation type="unfinished">Akceptuj synchronizację z sieci:</translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished">Wybierz zakres sieciowy lub podaj nowy.
+
+Ta lista rozwijana służy do wyboru zakresu adresów, z których można łączyć się z Zaurusem.
+
+Na przykład zakres 192.168.1.0/24 pozwala na połączenie (i synchronizację) każdej maszynie z IP pomiędzy 192.168.1.1 i 192.168.1.254.
+
+&quot;Wszystkie&quot; pozwoli na łączenie z *każdego* IP.
+&quot;Żadne&quot; odmówi *każdemu* połączeniu.
+
+Jeśli nie jesteś pewien co wybrać, wybierz &quot;Wszystkie&quot;.</translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished">Usuń wpis</translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished">Usuń wybrany zakres sieciowy z listy
+
+Jeśli wciśniesz ten przycisk, aktualnie wybrany zakres sieciowy zostanie usunięty z listy zakresów sieciowych.
+
+Jeśli wciśniesz ten przycisk przez pomyłkę, to przycisk &quot;Przywróć domyślne&quot;
+przywróci listę do stanu w jakim była przy pierwszym starcie Zaurusa.</translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished">Przywróć domyślne</translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished">Ten przycisk przywróci listę zakresów sieciowych
+do stanu domyślnego.
+
+Uwaga, wszystkie ręcznie wprowadzone zakresy zostaną usunięte!</translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished">Wybierz oprogramowanie do synchronizacji</translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished">Qtopia 1.7</translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished">Opie 1.0</translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished">IntelliSync</translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/security.ts b/i18n/pt/security.ts
index 3b2aa92..a2b43aa 100644
--- a/i18n/pt/security.ts
+++ b/i18n/pt/security.ts
@@ -1,247 +1,376 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Set passcode</source>
-        <translation>Mudar Chave</translation>
+        <source>LoginBase</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
-        <translation>Mudar chave</translation>
+        <source>Login</source>
+        <translation type="unfinished">Entrar</translation>
     </message>
     <message>
-        <source>Enter passcode</source>
-        <translation>Introduza chave</translation>
+        <source>Login Automatically</source>
+        <translation type="unfinished">Entrar Automaticamente</translation>
     </message>
     <message>
-        <source>Passcode incorrect</source>
-        <translation>Chave incorrecta</translation>
+        <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>
     </message>
     <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation>A chave introduzida está incorrecta.
-Acesso negado</translation>
+        <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>Security configuration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
-        <translation>Qualquer</translation>
+        <source>Load which plugins in what order:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>Nenhum</translation>
+        <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>
     </message>
     <message>
-        <source>Enter new passcode</source>
-        <translation>Introduza nova chave</translation>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re-enter new passcode</source>
-        <translation>Reintroduza a chave</translation>
+        <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">Entrar</translation>
+    </message>
+    <message>
+        <source>Sync</source>
+        <translation type="unfinished">Sincronizar</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished">Qualquer</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
+    <message>
+        <source>When to lock Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple plugins authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Required successes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: the third option implies the second one</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Security</name>
+    <message>
+        <source>Set passcode</source>
+        <translation type="obsolete">Mudar Chave</translation>
+    </message>
+    <message>
+        <source>Change passcode</source>
+        <translation type="obsolete">Mudar chave</translation>
+    </message>
+    <message>
+        <source>Enter passcode</source>
+        <translation type="obsolete">Introduza chave</translation>
+    </message>
+    <message>
+        <source>Passcode incorrect</source>
+        <translation type="obsolete">Chave incorrecta</translation>
+    </message>
+    <message>
+        <source>The passcode entered is incorrect.
+Access denied</source>
+        <translation type="obsolete">A chave introduzida está incorrecta.
+Acesso negado</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation type="obsolete">Qualquer</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="obsolete">Nenhum</translation>
+    </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="obsolete">Introduza nova chave</translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="obsolete">Reintroduza a chave</translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="obsolete">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="obsolete">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="obsolete">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="obsolete">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="obsolete">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="obsolete">1.0.0.0/8</translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
-        <translation>Configurações de Segurança</translation>
+        <translation type="obsolete">Configurações de Segurança</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Mudar chave</translation>
+        <translation type="obsolete">Mudar chave</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation>Limpar chave</translation>
+        <translation type="obsolete">Limpar chave</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation>Pedir chave ao ligar</translation>
+        <translation type="obsolete">Pedir chave ao ligar</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation>Sincronizar</translation>
+        <translation type="obsolete">Sincronizar</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation>Aceitar sincronização da rede:</translation>
+        <translation type="obsolete">Aceitar sincronização da rede:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (omissão)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Qualquer</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nenhuma</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation>&lt;p&gt;O uso de chave permite uma protecção mínima contra acessos pontuais ao dispositivo.</translation>
+        <translation type="obsolete">&lt;p&gt;O uso de chave permite uma protecção mínima contra acessos pontuais ao dispositivo.</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
-        <translation>Palavra Chave</translation>
+        <translation type="obsolete">Palavra Chave</translation>
     </message>
     <message>
         <source>Login</source>
-        <translation>Entrar</translation>
+        <translation type="obsolete">Entrar</translation>
     </message>
     <message>
         <source>Login Automatically</source>
-        <translation>Entrar Automaticamente</translation>
-    </message>
-    <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Entrar Automaticamente</translation>
     </message>
+</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>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Sync</source>
+        <translation type="unfinished">Sincronizar</translation>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Accept sync from network:</source>
+        <translation type="unfinished">Aceitar sincronização da rede:</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/security.ts b/i18n/pt_BR/security.ts
index f863d1d..e7b589f 100644
--- a/i18n/pt_BR/security.ts
+++ b/i18n/pt_BR/security.ts
@@ -1,228 +1,313 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Any</source>
-        <translation>Qualquer</translation>
+        <source>LoginBase</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>Nenhum</translation>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
-        <translation>Mudar senha</translation>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode incorrect</source>
-        <translation>Senha incorreta</translation>
+        <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>
     </message>
     <message>
-        <source>Enter passcode</source>
-        <translation>Entre a senha</translation>
+        <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>Set passcode</source>
-        <translation>Ajustar senha</translation>
+        <source>Security configuration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation>A senha inserida está incorreta.
-Acesso negado</translation>
+        <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>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>plugins</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter new passcode</source>
+        <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re-enter new passcode</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Sync</source>
+        <translation type="unfinished">Sincronizar</translation>
+    </message>
+    <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished">Qualquer</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Nenhum</translation>
+    </message>
 </context>
 <context>
-    <name>SecurityBase</name>
+    <name>MultiauthGeneralConfig</name>
+    <message>
+        <source>When to lock Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple plugins authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Required successes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: the third option implies the second one</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Security</name>
     <message>
         <source>Any</source>
         <translation type="obsolete">Qualquer</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nenhum</translation>
     </message>
     <message>
-        <source>Sync</source>
-        <translation type="unfinished">Sincronizar</translation>
+        <source>Change passcode</source>
+        <translation type="obsolete">Mudar senha</translation>
     </message>
     <message>
-        <source>Change passcode</source>
-        <translation type="unfinished">Mudar a senha</translation>
+        <source>Passcode incorrect</source>
+        <translation type="obsolete">Senha incorreta</translation>
     </message>
     <message>
-        <source>Accept sync from network:</source>
-        <translation type="unfinished">Aceitar sincronização da rede:</translation>
+        <source>Enter passcode</source>
+        <translation type="obsolete">Entre a senha</translation>
     </message>
     <message>
-        <source>Security Settings</source>
-        <translation type="unfinished">Ajustes</translation>
+        <source>Set passcode</source>
+        <translation type="obsolete">Ajustar senha</translation>
     </message>
     <message>
-        <source>Clear passcode</source>
-        <translation type="unfinished">Limpar a senha</translation>
+        <source>The passcode entered is incorrect.
+Access denied</source>
+        <translation type="obsolete">A senha inserida está incorreta.
+Acesso negado</translation>
     </message>
+</context>
+<context>
+    <name>SecurityBase</name>
     <message>
-        <source>Require pass code at power-on</source>
-        <translation type="unfinished">Requisitar senha ao ligar</translation>
+        <source>Any</source>
+        <translation type="obsolete">Qualquer</translation>
     </message>
     <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="unfinished">&lt;P&gt;A senha provê um nível mínimo de segurança quantra o acesso casual a este dispositivo.</translation>
+        <source>None</source>
+        <translation type="obsolete">Nenhum</translation>
     </message>
     <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="obsolete">192.168.129.0/24 (padrão)</translation>
+        <source>Sync</source>
+        <translation type="obsolete">Sincronizar</translation>
     </message>
     <message>
-        <source>Passcode</source>
-        <translation type="unfinished"></translation>
+        <source>Change passcode</source>
+        <translation type="obsolete">Mudar a senha</translation>
     </message>
     <message>
-        <source>Login</source>
-        <translation type="unfinished"></translation>
+        <source>Accept sync from network:</source>
+        <translation type="obsolete">Aceitar sincronização da rede:</translation>
     </message>
     <message>
-        <source>Login Automatically</source>
-        <translation type="unfinished"></translation>
+        <source>Security Settings</source>
+        <translation type="obsolete">Ajustes</translation>
     </message>
     <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
-        <translation type="unfinished"></translation>
+        <source>Clear passcode</source>
+        <translation type="obsolete">Limpar a senha</translation>
     </message>
     <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
-        <translation type="unfinished"></translation>
+        <source>Require pass code at power-on</source>
+        <translation type="obsolete">Requisitar senha ao ligar</translation>
     </message>
     <message>
-        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
+        <translation type="obsolete">&lt;P&gt;A senha provê um nível mínimo de segurança quantra o acesso casual a este dispositivo.</translation>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>192.168.129.0/24 (default)</source>
+        <translation type="obsolete">192.168.129.0/24 (padrão)</translation>
     </message>
+</context>
+<context>
+    <name>SyncBase</name>
     <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>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Sync</source>
+        <translation type="unfinished">Sincronizar</translation>
+    </message>
+    <message>
+        <source>Accept sync from network:</source>
+        <translation type="unfinished">Aceitar sincronização da rede:</translation>
+    </message>
+    <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/security.ts b/i18n/ru/security.ts
index 0f04883..edc3616 100644
--- a/i18n/ru/security.ts
+++ b/i18n/ru/security.ts
@@ -1,272 +1,528 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>LoginBase</name>
+    <message>
+        <source>LoginBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished">Войти</translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation type="unfinished">Входить автоматически</translation>
+    </message>
+    <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>
+        <translation type="unfinished">Если вы выберите эту опцию, opie-login автоматически войдет в систему под выбранным из списка пользователем.  
+
+На Zaurus 5x00 это всегда пользователь &quot;root&quot;.</translation>
+    </message>
+    <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>
+        <translation type="unfinished">Этот список позволит выбрать пользователя для авто-входа
+(если разрешен).  
+
+Вы можете выбрать только уже настроенное имя пользователя.</translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthConfig</name>
+    <message>
+        <source>Security configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+    </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished">Внимание</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished">&lt;p&gt;Все заданные пользователем участки будут потеряны.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Отмена</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished">Да</translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished">Любой</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Ни одного</translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
+    <message>
+        <source>When to lock Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple plugins authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Required successes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: the third option implies the second one</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
-        <translation>Уст. пароль</translation>
+        <translation type="obsolete">Уст. пароль</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Изменить пароль</translation>
+        <translation type="obsolete">Изменить пароль</translation>
     </message>
     <message>
         <source>Enter passcode</source>
-        <translation>Введите пароль</translation>
+        <translation type="obsolete">Введите пароль</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
-        <translation>Неверный пароль</translation>
+        <translation type="obsolete">Неверный пароль</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
-        <translation>Введеный пароль неверен.
+        <translation type="obsolete">Введеный пароль неверен.
 Доступ запрещен</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>Любой</translation>
+        <translation type="obsolete">Любой</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Ни одного</translation>
+        <translation type="obsolete">Ни одного</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
-        <translation>Введите новый пароль</translation>
+        <translation type="obsolete">Введите новый пароль</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
-        <translation>Введите пароль еще раз</translation>
+        <translation type="obsolete">Введите пароль еще раз</translation>
     </message>
     <message>
         <source>Attention</source>
-        <translation>Внимание</translation>
+        <translation type="obsolete">Внимание</translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation>&lt;p&gt;Все заданные пользователем участки будут потеряны.</translation>
+        <translation type="obsolete">&lt;p&gt;Все заданные пользователем участки будут потеряны.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Отмена</translation>
+        <translation type="obsolete">Отмена</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>Да</translation>
+        <translation type="obsolete">Да</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
-        <translation>192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="obsolete">ВНИМАНИЕ</translation>
     </message>
     <message>
         <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
         <translation type="obsolete">&lt;p&gt;Выбор IntelliSync запретит пароль FTP.&lt;p&gt;Любая машина в заданном участке сможет синхронизироваться с вашим КПК!</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
-        <translation>Настройки безопасности</translation>
+        <translation type="obsolete">Настройки безопасности</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Изменить пароль</translation>
+        <translation type="obsolete">Изменить пароль</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation>Сбросить пароль</translation>
+        <translation type="obsolete">Сбросить пароль</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation>Требовать пароль при включении</translation>
+        <translation type="obsolete">Требовать пароль при включении</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation>Синхр.</translation>
+        <translation type="obsolete">Синхр.</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation>Принимать запросы из сети:</translation>
+        <translation type="obsolete">Принимать запросы из сети:</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation>&lt;P&gt;Пароль предоставляет минимальный уровень защиты от случайного доступа к устройству.</translation>
+        <translation type="obsolete">&lt;P&gt;Пароль предоставляет минимальный уровень защиты от случайного доступа к устройству.</translation>
     </message>
     <message>
         <source>Passcode</source>
-        <translation>Пароль</translation>
+        <translation type="obsolete">Пароль</translation>
     </message>
     <message>
         <source>Login</source>
-        <translation>Войти</translation>
+        <translation type="obsolete">Войти</translation>
     </message>
     <message>
         <source>Login Automatically</source>
-        <translation>Входить автоматически</translation>
+        <translation type="obsolete">Входить автоматически</translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
-        <translation>Эта кнопка позволит вам изменить пароль.  
+        <translation type="obsolete">Эта кнопка позволит вам изменить пароль.  
 
 Заметьте: это НЕ пароль для синхронизации.</translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
-        <translation>Удалить текущий пароль.  
+        <translation type="obsolete">Удалить текущий пароль.  
 Вы всегда сможете ввести новый.</translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
-        <translation>Если вы разрешите эту опцию, нужно будет вводить пароль при каждом включении КПК.</translation>
+        <translation type="obsolete">Если вы разрешите эту опцию, нужно будет вводить пароль при каждом включении КПК.</translation>
     </message>
     <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>
-        <translation>Если вы выберите эту опцию, opie-login автоматически войдет в систему под выбранным из списка пользователем.  
+        <translation type="obsolete">Если вы выберите эту опцию, opie-login автоматически войдет в систему под выбранным из списка пользователем.  
 
 На Zaurus 5x00 это всегда пользователь &quot;root&quot;.</translation>
     </message>
     <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>
-        <translation>Этот список позволит выбрать пользователя для авто-входа
+        <translation type="obsolete">Этот список позволит выбрать пользователя для авто-входа
 (если разрешен).  
 
 Вы можете выбрать только уже настроенное имя пользователя.</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
-        <translation>Выберите или введите новый участок сети.  
+        <translation type="obsolete">Выберите или введите новый участок сети.  
 
 Этот список позволяет выбрать участок сети из которого можно подключится к вашему КПК.  
 
 Например, участок сети 192.168.1.0/24 позволит любой машине с IP между 192.168.1.1 и 192.168.1.254 подключаться к (и синхронизироваться с) вашим КПК.  
 
 Запись &quot;Все&quot; позволит подключиться *любому* IP. 
 Запись &quot;Ни одного&quot; *запретит* все соединения.  
 
 Если неуверены, выберите &quot;Все&quot;.</translation>
     </message>
     <message>
         <source>Delete Entry</source>
-        <translation>Удалить запись</translation>
+        <translation type="obsolete">Удалить запись</translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
-        <translation>Удалить выбранный участок из списка
+        <translation type="obsolete">Удалить выбранный участок из списка
 
 Если вы нажмете эту кнопку, выбранный участок будет удален из списка.
 
 Если вы нажали эту кнопку случайно, кнопка &quot;По умолчанию&quot;
 восстановит список в том виде, когда вы первый раз запустили ваш КПК.</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
-        <translation>По умолчанию</translation>
+        <translation type="obsolete">По умолчанию</translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
-        <translation>Эта кнопка восстановит список участков сети
+        <translation type="obsolete">Эта кнопка восстановит список участков сети
 по умолчанию.
 
 Учтите что вручную введенные участки будут потеряны!</translation>
     </message>
     <message>
         <source>Select your sync software</source>
-        <translation>Выберите программу</translation>
+        <translation type="obsolete">Выберите программу</translation>
     </message>
     <message>
         <source>QTopia</source>
         <translation type="obsolete">QTopia</translation>
     </message>
     <message>
         <source>IntelliSync</source>
-        <translation>IntelliSync</translation>
+        <translation type="obsolete">IntelliSync</translation>
     </message>
     <message>
         <source>This option changes the login behaviour of the internal FTP server.  
 
 If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
 
 The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
         <translation type="obsolete">Эта опция изменяет поведение внутреннего FTP сервера.  
 
 Если есть проблемы с соединением, попробуйте значение &quot;IntelliSync&quot;, с которым будет приниматься любое соединение по FTP порту.
 
 Значение по умолчанию - Qtopia. Оно позволит соединяться с именем &quot;root&quot; и паролем &quot;Qtopia&quot;.   Пароль чувствителен к РеГиСтРу.</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
-        <translation>Qtopia 1.7</translation>
+        <translation type="obsolete">Qtopia 1.7</translation>
     </message>
     <message>
         <source>Opie 1.0</source>
-        <translation>Opie 1.0</translation>
+        <translation type="obsolete">Opie 1.0</translation>
     </message>
     <message>
         <source>Both</source>
         <translation type="obsolete">Оба</translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></source>
-        <translation>Изменить протокол синхронизации для разных устройств.
+        <translation type="obsolete">Изменить протокол синхронизации для разных устройств.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync запретит пароль но будет каждый раз спрашивать разрешение для соединения.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 совместим с QtopiaDesktop, MultiSync и KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 изменит способ отправки данных и несовместим со старыми клиентами.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></translation>
     </message>
 </context>
+<context>
+    <name>SyncBase</name>
+    <message>
+        <source>SyncBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sync</source>
+        <translation type="unfinished">Синхр.</translation>
+    </message>
+    <message>
+        <source>Accept sync from network:</source>
+        <translation type="unfinished">Принимать запросы из сети:</translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished">Выберите или введите новый участок сети.  
+
+Этот список позволяет выбрать участок сети из которого можно подключится к вашему КПК.  
+
+Например, участок сети 192.168.1.0/24 позволит любой машине с IP между 192.168.1.1 и 192.168.1.254 подключаться к (и синхронизироваться с) вашим КПК.  
+
+Запись &quot;Все&quot; позволит подключиться *любому* IP. 
+Запись &quot;Ни одного&quot; *запретит* все соединения.  
+
+Если неуверены, выберите &quot;Все&quot;.</translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished">Удалить запись</translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished">Удалить выбранный участок из списка
+
+Если вы нажмете эту кнопку, выбранный участок будет удален из списка.
+
+Если вы нажали эту кнопку случайно, кнопка &quot;По умолчанию&quot;
+восстановит список в том виде, когда вы первый раз запустили ваш КПК.</translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished">По умолчанию</translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished">Эта кнопка восстановит список участков сети
+по умолчанию.
+
+Учтите что вручную введенные участки будут потеряны!</translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished">Выберите программу</translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished">Qtopia 1.7</translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished">Opie 1.0</translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished">IntelliSync</translation>
+    </message>
+    <message>
+        <source>Alter the Sync Protocol to tweak for the different devices.
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/security.ts b/i18n/sl/security.ts
index 1c23c6b..5272fc3 100644
--- a/i18n/sl/security.ts
+++ b/i18n/sl/security.ts
@@ -1,247 +1,356 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Set passcode</source>
-        <translation>Nastavi kodo</translation>
+        <source>LoginBase</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
-        <translation>Zamenjaj kodo</translation>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter passcode</source>
-        <translation>Vpišite kodo</translation>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode incorrect</source>
-        <translation>Koda ni pravilna</translation>
+        <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>
     </message>
     <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation>Vpisana koda ni pravilna.
-Dostop zavrnjen</translation>
+        <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>
-        <translation>Karkoli</translation>
+        <source>Security configuration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>Brez</translation>
+        <source>Load which plugins in what order:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter new passcode</source>
+        <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>
     </message>
     <message>
-        <source>Re-enter new passcode</source>
+        <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <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">Sinhroniziraj</translation>
+    </message>
+    <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished">Karkoli</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
+    <message>
+        <source>When to lock Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple plugins authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Required successes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: the third option implies the second one</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Security</name>
+    <message>
+        <source>Set passcode</source>
+        <translation type="obsolete">Nastavi kodo</translation>
+    </message>
+    <message>
+        <source>Change passcode</source>
+        <translation type="obsolete">Zamenjaj kodo</translation>
+    </message>
+    <message>
+        <source>Enter passcode</source>
+        <translation type="obsolete">Vpišite kodo</translation>
+    </message>
+    <message>
+        <source>Passcode incorrect</source>
+        <translation type="obsolete">Koda ni pravilna</translation>
+    </message>
+    <message>
+        <source>The passcode entered is incorrect.
+Access denied</source>
+        <translation type="obsolete">Vpisana koda ni pravilna.
+Dostop zavrnjen</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation type="obsolete">Karkoli</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="obsolete">Brez</translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="obsolete">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="obsolete">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="obsolete">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="obsolete">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="obsolete">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="obsolete">1.0.0.0/8</translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
-        <translation>Varnostne nastavitve</translation>
+        <translation type="obsolete">Varnostne nastavitve</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Zamenjaj kodo</translation>
+        <translation type="obsolete">Zamenjaj kodo</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation>Zbriši kodo</translation>
+        <translation type="obsolete">Zbriši kodo</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation>Potrebna koda pri vklopu</translation>
+        <translation type="obsolete">Potrebna koda pri vklopu</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation>Sinhroniziraj</translation>
+        <translation type="obsolete">Sinhroniziraj</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation>Sperjmi sinhronizacijo iz mreže:</translation>
+        <translation type="obsolete">Sperjmi sinhronizacijo iz mreže:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Karkoli</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">brez</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation>&lt;P&gt;Koda prinaša minimalno zaščito za varovanje vaše naprave.</translation>
+        <translation type="obsolete">&lt;P&gt;Koda prinaša minimalno zaščito za varovanje vaše naprave.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (privzeto)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
+</context>
+<context>
+    <name>SyncBase</name>
     <message>
-        <source>Passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login Automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <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>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Sync</source>
+        <translation type="unfinished">Sinhroniziraj</translation>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Accept sync from network:</source>
+        <translation type="unfinished">Sperjmi sinhronizacijo iz mreže:</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/security.ts b/i18n/xx/security.ts
index 9f0f8fd..7d80f0f 100644
--- a/i18n/xx/security.ts
+++ b/i18n/xx/security.ts
@@ -1,246 +1,363 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Set passcode</source>
-        <translation>FOO</translation>
+        <source>LoginBase</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
-        <translation>FOO</translation>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter passcode</source>
-        <translation>FOO</translation>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode incorrect</source>
-        <translation>FOO</translation>
+        <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>
     </message>
     <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation>FOO</translation>
+        <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>
-        <translation>FOO</translation>
+        <source>Security configuration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>FOO</translation>
+        <source>Load which plugins in what order:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter new passcode</source>
-        <translation>FOO</translation>
+        <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>
     </message>
     <message>
-        <source>Re-enter new passcode</source>
-        <translation>FOO</translation>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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">FOO</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">FOO {192.168.129.0/24?}</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">FOO</translation>
     </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
+    <message>
+        <source>When to lock Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple plugins authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Required successes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: the third option implies the second one</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Security</name>
+    <message>
+        <source>Set passcode</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Change passcode</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Enter passcode</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Passcode incorrect</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>The passcode entered is incorrect.
+Access denied</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="obsolete">FOO {192.168.129.0/24?}</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">FOO</translation>
     </message>
+</context>
+<context>
+    <name>SyncBase</name>
     <message>
-        <source>Passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login Automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <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>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Sync</source>
+        <translation type="unfinished">FOO</translation>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Accept sync from network:</source>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/security.ts b/i18n/zh_CN/security.ts
index 1530ddb..4f105ad 100644
--- a/i18n/zh_CN/security.ts
+++ b/i18n/zh_CN/security.ts
@@ -1,214 +1,242 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Attention</source>
+        <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cancel</source>
+        <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</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>
     </message>
     <message>
-        <source>192.168.129.0/24</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>192.168.1.0/24</source>
+        <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <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>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
+        <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set passcode</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
+        <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter passcode</source>
+        <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode incorrect</source>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter new passcode</source>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re-enter new passcode</source>
+        <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SecurityBase</name>
     <message>
-        <source>Security Settings</source>
+        <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode</source>
+        <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
+        <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clear passcode</source>
+        <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
     <message>
-        <source>Require pass code at power-on</source>
+        <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
+        <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login</source>
+        <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login Automatically</source>
+        <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Debug options</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/security.ts b/i18n/zh_TW/security.ts
index dc36a67..f785032 100644
--- a/i18n/zh_TW/security.ts
+++ b/i18n/zh_TW/security.ts
@@ -1,247 +1,364 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Security</name>
+    <name>LoginBase</name>
     <message>
-        <source>Set passcode</source>
-        <translation>設定通行碼</translation>
+        <source>LoginBase</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change passcode</source>
-        <translation>改變通行碼</translation>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter passcode</source>
-        <translation>輸入通行碼</translation>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode incorrect</source>
-        <translation>通行碼不正確</translation>
+        <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>
     </message>
     <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation>輸入的通行碼不正確.
-存取已拒絕</translation>
+        <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>
-        <translation>任何</translation>
+        <source>Security configuration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>無</translation>
+        <source>Load which plugins in what order:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter new passcode</source>
-        <translation>輸入新的通行碼</translation>
+        <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>
     </message>
     <message>
-        <source>Re-enter new passcode</source>
-        <translation>重新輸入新的通行碼</translation>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished">任何</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">無</translation>
+    </message>
+</context>
+<context>
+    <name>MultiauthGeneralConfig</name>
+    <message>
+        <source>When to lock Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Opie resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple plugins authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Required successes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t protect this config screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show explanatory screens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow to bypass authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: the third option implies the second one</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Security</name>
+    <message>
+        <source>Set passcode</source>
+        <translation type="obsolete">設定通行碼</translation>
+    </message>
+    <message>
+        <source>Change passcode</source>
+        <translation type="obsolete">改變通行碼</translation>
+    </message>
+    <message>
+        <source>Enter passcode</source>
+        <translation type="obsolete">輸入通行碼</translation>
+    </message>
+    <message>
+        <source>Passcode incorrect</source>
+        <translation type="obsolete">通行碼不正確</translation>
+    </message>
+    <message>
+        <source>The passcode entered is incorrect.
+Access denied</source>
+        <translation type="obsolete">輸入的通行碼不正確.
+存取已拒絕</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation type="obsolete">任何</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="obsolete">無</translation>
+    </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation type="obsolete">輸入新的通行碼</translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation type="obsolete">重新輸入新的通行碼</translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="obsolete">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="obsolete">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="obsolete">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="obsolete">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="obsolete">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="obsolete">1.0.0.0/8</translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
-        <translation>安全性設定</translation>
+        <translation type="obsolete">安全性設定</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>改變通行碼</translation>
+        <translation type="obsolete">改變通行碼</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation>清除通行碼</translation>
+        <translation type="obsolete">清除通行碼</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation>在電源開啟時要求輸入通行碼</translation>
+        <translation type="obsolete">在電源開啟時要求輸入通行碼</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation>同步化</translation>
+        <translation type="obsolete">同步化</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation>允許來自網路的同步化:</translation>
+        <translation type="obsolete">允許來自網路的同步化:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">任何</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">無</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation>&lt;P&gt;通行碼防護提供基本層級的保護以避免對此裝置隨意的存取.</translation>
+        <translation type="obsolete">&lt;P&gt;通行碼防護提供基本層級的保護以避免對此裝置隨意的存取.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (預設值)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
+</context>
+<context>
+    <name>SyncBase</name>
     <message>
-        <source>Passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login Automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <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>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Sync</source>
+        <translation type="unfinished">同步化</translation>
     </message>
     <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>
-        <translation type="unfinished"></translation>
+        <source>Accept sync from network:</source>
+        <translation type="unfinished">允許來自網路的同步化:</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IntelliSync</source>
+        <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qtopia 1.7</source>
+        <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie 1.0</source>
+        <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>