diff -ruN smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail	2008-04-21 00:28:49.000000000 -0600
+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail	2008-04-24 09:57:39.000000000 -0600
@@ -1,9 +1,5 @@
 <lexicon lang="de">
     <entry>
-        <base>Collaboration</base>
-        <trans> Zusammenarbeit </trans>
-    </entry>
-    <entry>
         <base>FORM_TITLE</base>
         <trans><![CDATA[
 		Einstellungen für den Empfang externer Mailboxen
@@ -253,6 +249,14 @@
         <trans>Imap</trans>
     </entry>
     <entry>
+        <base>SPOP3</base>
+        <trans>SSL Pop (Experimental)</trans>
+    </entry>
+    <entry>
+        <base>SIMAP</base>
+        <trans>SSL Imap (Experimental)</trans>
+    </entry>
+    <entry>
         <base>SHOW_FETCHMAIL_ACCOUNTS</base>
         <trans><![CDATA[
 		<p>
@@ -309,8 +313,8 @@
         <trans>Server Mailbox Password</trans>
     </entry>
     <entry>
-        <base>Konfiguration</base>
-        <trans>Konfiguration</trans>
+        <base>Collaboration</base>
+        <trans> Zusammenarbeit </trans>
     </entry>
     <entry>
         <base>fetchmail</base>
@@ -337,12 +341,6 @@
         <trans><![CDATA[&nbsp;]]></trans>
     </entry>
     <entry>
-        <base>SUCCESS</base>
-        <trans>Änderungen der FetchMail-Konfiguration wurden erfolgreich
-        gespeichert.
-        </trans>
-    </entry>
-    <entry>
         <base>SUCCESSFULLY_CHANGED_CONF</base>
         <trans>Änderungen der FetchMail-Konfiguration wurden erfolgreich
         gespeichert.
@@ -396,12 +394,6 @@
         </trans>
     </entry>
     <entry>
-        <base>ERROR_WHILE_MODIFYING_ROUTINGNNTP</base>
-        <trans>Die Änderungen für die SME SMTP Proxy Einstellungen
-        konnten nicht gespeichert werden.
-        </trans>
-    </entry>
-    <entry>
         <base>CREATE</base>
         <trans>Erstellen</trans>
     </entry>
diff -ruN smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail	2008-04-21 00:28:40.000000000 -0600
+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail	2008-04-24 09:57:23.000000000 -0600
@@ -349,12 +349,6 @@
         <trans><![CDATA[&nbsp;]]></trans>
     </entry>
     <entry>
-        <base>SUCCESS</base>
-        <trans>Your changes to the Fetchmail configuration have been
-        saved successfully.
-        </trans>
-    </entry>
-    <entry>
         <base>SUCCESSFULLY_CHANGED_CONF</base>
         <trans>Your changes to the Fetchmail configuration have been
         saved successfully.
@@ -408,12 +402,6 @@
         </trans>
     </entry>
     <entry>
-        <base>ERROR_WHILE_MODIFYING_ROUTINGNNTP</base>
-        <trans>Unable to apply the changes to the SME SMTP
-		Proxy configuration.
-        </trans>
-    </entry>
-    <entry>
         <base>CREATE</base>
         <trans>Create</trans>
     </entry>
diff -ruN smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail	2008-04-21 00:28:45.000000000 -0600
+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail	2008-04-24 09:57:34.000000000 -0600
@@ -1,10 +1,4 @@
 <lexicon lang="fr">
-  <entry>
-    <base>Collaboration</base>
-    <trans>
-      Collaboration
-    </trans>
-  </entry>
     <entry>
         <base>FORM_TITLE</base>
         <trans>Configuration de la récupération de BALs externes</trans>
@@ -333,6 +327,12 @@
         <base>MAIL_PASSWORD</base>
         <trans>mot de passe sur le serveur</trans>
     </entry>
+  <entry>
+    <base>Collaboration</base>
+    <trans>
+      Collaboration
+    </trans>
+  </entry>
     <entry>
         <base>fetchmail</base>
         <trans>Récupération de mails</trans>
@@ -358,12 +358,6 @@
         <trans><![CDATA[&nbsp;]]></trans>
     </entry>
     <entry>
-        <base>SUCCESS</base>
-        <trans>Vos changements à la configuration de la récupération de 
-		messages ont bien étés appliqués.
-        </trans>
-    </entry>
-    <entry>
         <base>SUCCESSFULLY_CHANGED_CONF</base>
         <trans>Vos changements à la configuration de la récupération de 
 		messages ont bien étés appliqués.
@@ -400,18 +394,6 @@
         </trans>
     </entry>
     <entry>
-        <base>SUCCESSFULLY_MODIFIED_SMTPPROXY</base>
-        <trans>Vos changements de configuration du Proxy SMTP ont
-		bien étés pris en compte.
-        </trans>
-    </entry>
-    <entry>
-        <base>ERROR_WHILE_MODIFYING_ROUTINGSMTP</base>
-        <trans>Impossible d'appliquer les changements de configuration
-		du proxy SMTP.
-        </trans>
-    </entry>
-    <entry>
         <base>SUCCESSFULLY_MODIFIED_ROUTINGNNTP</base>
         <trans>Vos changements de mode d'accès NNTP ont
 		bien étés pris en compte.
@@ -424,6 +406,12 @@
         </trans>
     </entry>
     <entry>
+        <base>SUCCESSFULLY_MODIFIED_SMTPPROXY</base>
+        <trans>Vos changements de configuration du Proxy SMTP ont
+		bien étés pris en compte.
+        </trans>
+    </entry>
+    <entry>
         <base>CREATE</base>
         <trans>Créer</trans>
     </entry>
diff -ruN smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail	2008-04-21 00:28:42.000000000 -0600
+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail	2008-04-24 09:57:28.000000000 -0600
@@ -246,6 +246,14 @@
         <trans>Imap</trans>
     </entry>
     <entry>
+        <base>SPOP3</base>
+        <trans>SSL Pop (Experimental)</trans>
+    </entry>
+    <entry>
+        <base>SIMAP</base>
+        <trans>SSL Imap (Experimental)</trans>
+    </entry>
+    <entry>
         <base>SHOW_FETCHMAIL_ACCOUNTS</base>
         <trans><![CDATA[
 		<p>
@@ -330,11 +338,6 @@
         <trans><![CDATA[&nbsp;]]></trans>
     </entry>
     <entry>
-        <base>SUCCESS</base>
-        <trans>I tuoi cambiamenti alla configurazione di scaricamento posta sono stati salvati con successo.
-        </trans>
-    </entry>
-    <entry>
         <base>SUCCESSFULLY_CHANGED_CONF</base>
         <trans>I tuoi cambiamenti alla configurazione di scaricamento posta sono stati salvati con successo.
         </trans>
@@ -380,11 +383,6 @@
         </trans>
     </entry>
     <entry>
-        <base>ERROR_WHILE_MODIFYING_ROUTINGNNTP</base>
-        <trans>Impossibile applicare i cambiamenti alla configurazione del Proxy SMTP.
-        </trans>
-    </entry>
-    <entry>
         <base>CREATE</base>
         <trans>Crea</trans>
     </entry>