smeserver-fetchmail/contribs8/smeserver-fetchmail-1.4-locale-2013-07-14.patch

--- smeserver-fetchmail-1.4/root/etc/e-smith/locale/da/etc/e-smith/web/functions/fetchmail      2012-06-03 14:27:58.000000000 -0600
+++ smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/da/etc/e-smith/web/functions/fetchmail       2013-07-14 00:32:27.878463697 -0600
@@ -5,7 +5,7 @@
     </entry>
     <entry>
         <base>FIRST_PAGE_DESCRIPTION</base>
-           <trans><![CDATA[ <p> Dette panel bruges til at konfigurere din SME server til at hente post fra eksterne postkasser. Hvad betyder det?<br> Nogle af dine brugere har måske eksterne postkasse(r). Normalt vil det være nødvendigt at konfigurere hver enkelt klient til at hente post fra disse eksterne postkasser foruden at konfigurere dem til at hente post fra SME serveren. Ved at bruge dette panel, kan SME serveren konfigureres til at hente posten fra eksterne postkasser og dernæst automatisk videresende denne post til interne postkasser. Det gør konfigurationen af postklienter meget let. <br> Ved at bruge denne metode til at hente post (og forudsat at klienterne bruger IMAP) betyder det, at post bliver sikkerhedskopieret som en del af den normale sikkerhedskopiering.<br> Yderligere tilgængelige funktioner under dette panel:<br> - En postkasse kan videresendes til mange postkasser<br> - Du kan oprette "skygge konti": Post sendt til en sådan konto videresendes til andre(s) postkasse(r).<br> - Logning af hændelser for postkasser.<br> ]]></trans>
+           <trans><![CDATA[ <p> This panel allows configuration of external mailbox retrieval by your SME Server. What does this mean?<br> Some of your users may have external mailbox(es). Usually, the email clients on individual workstations have to be configured to fetch mail from these external mailboxes as well as from the normal mailboxes provided by the SME server. Using this control panel, the SME server can be configured to fetch mail from external mailboxes and then automatically forward these mails to internal mail boxes. This makes configuration of the email clients on individual workstations very easy.<br> Using this method of mail retrieval (and provided that the individual workstations are using IMAP) means that emails are backed up as part of the normal backup process.<br> Other functions available through this panel are:<br> - A mailbox can be distributed to many mailboxes<br> - You can create 'Ghost account' : Mails sent to this account are distributed to other(s) mailbox(es) only.<br> - logging of events for a mailboxes.<br> ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_SERVICE_0</base>
@@ -89,7 +89,7 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_USERS</base>
-        <trans><![CDATA[ Nedenfor er en oversigt over de nuværende brugere defineret i dette system, inklusiv en oversigt over fetchmail konfigurationen for hver bruger.<br> Her kan du oprette, redigere og fjerne fetchmail-regler for enhver bruger. ]]></trans>
+        <trans><![CDATA[ Below is a table summarizing the current users defined on this system with a summary of the fetchmail configuration for each user.<br> Here you can create, modify, and remove fetchmail rules for any user. ]]></trans>
     </entry>
     <entry>
         <base>NO_USER_ACCOUNTS</base>
@@ -101,11 +101,11 @@
     </entry>
     <entry>
         <base>SET_GENERAL_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Vælg de generelle informationer for fetchmail kontoen.<br> De specifikke postkasser til modtagelse angives på de næste skærmbilleder. </p> ]]></trans>
+        <trans><![CDATA[ <p> Select the general information for the fetchmail accounts.<br> The specific mailboxes to retrieve will be set on the next screens. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERROR_NO_FINAL_RECIPIENT</base>
-        <trans><![CDATA[ Ups ! Der er ikke nogen slutmodtager for denne regel.<br> Post kan leveres til den lokale konto. Det sker hvis du vælger "NEJ" for "Skygge Tilstand".<br> Post kan leveres til andre lokale konti. Denne tilstand vælges ved at aktivere et eller flere afkrydsningsfelter nedenfor.<br> Post kan leveres til en ekstern postkasse. Denne tilstand vælges, hvis der indtastes en e-mail adresse i feltet "E-mail adresse der skal videresendes til".<br> Du skal angive mindst en type modtager. ]]></trans>
+        <trans><![CDATA[ Oups ! There is no final recipient for this rule.<br> Mails can be delivered to the local account. This mode is selected if you choose 'NO' for the 'Ghost Mode'.<br> Mails can be delivered to other local accounts. This mode is selected by checking one or more cases in the chart below.<br> Mails can be delivered to an external Mailbox. This mode is selected if an E-Mail is set in the 'Email address to forward mail' field.<br> You must set at least one kind of recipient. ]]></trans>
     </entry>
     <entry>
         <base>LABEL_USER_ACCOUNT</base>
@@ -169,7 +169,7 @@
     </entry>
     <entry>
         <base>SET_ACCOUNTS_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Her kan du angive den nødvendige information for adgang til til din eksterne postkasse: Navnet på serveren med postkassen, postservertypen, kontonavn og adgangskode. </p> ]]></trans>
+        <trans><![CDATA[ <p> Here you can set the information needed to access your external mailboxes : Name of the server storing the mailbox, type of mailbox server, account name, account password. </p> ]]></trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_SERVER</base>
@@ -205,19 +205,19 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_ACCOUNTS</base>
-        <trans><![CDATA[ <p> Dette er liste over eksterne postkasser som allerede er konfigureret for denne bruger. </p> ]]></trans>
+        <trans><![CDATA[ <p> This is the list of external mailboxes already configured for this user. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADSERVER</base>
-        <trans><![CDATA[ Det lader ikke til at være et gyldigt server navn eller IP adresse.<br> For at være gyldigt, skal feltet udfyldes med enten et gyldigt servernavn eller en gyldig IP adresse.<br> Et gyldigt servernavn indeholder mellem 2 og 5 dele, adskilt af punktummer "."<br> For alle dele, bortset fra den sidste, er de tilladte tegn bogstaver(eksl. æ, ø og å), tal og bindestreg "-". Delene kan være alle størrelser.<br> I den sidste del (også kaldet tld) er kun bogstaver tilladt og skal indeholde mellem 2 og 5 bogstaver.<br> En gyldig IP adresse består af tal delt i 4 dele af punktummer, hvert tal mellem 0 og 255. ]]></trans>
+        <trans><![CDATA[ This doesn't seems to be a valid server namei or IP address.<br> To be valid, this field must contain either a valid server name or a valid IP address.<br> A valid server name contains between two and 5 parts separated by dots '.'<br> For all parts but the last, characters allowed are letters, numbers and '-'. The parts can be of any size.<br> For the last part (also named tld), only letters are allowed, and the part must contain between two and seven characters.<br> A valid IP address is made with four decimal integers, each between 0 and 255. The four numbers are put together, separated by one dot. ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADCHARS</base>
-        <trans><![CDATA[ Ups ! Du har desværre indsat et af de specialtegn som ikke er tilladt. I disse felter kan du bruge alle karakterer, UNDTAGEN pipe | og de 2 meget specielle tegn, 0x1E and 0x1F. ]]></trans>
+        <trans><![CDATA[ Oops ! I'm affraid you just entered one of the special characters we cannot allow. In theses fields, you can use any characters EXCEPT pipe '|' and the two very special characters, 0x1E and 0x1F. ]]></trans>
     </entry>
     <entry>
         <base>ERR_FIELD_EMPTY</base>
-        <trans><![CDATA[ Du kan ikke lade nogen af de 3 felter "server navn", "bruger navn" eller "adgangskode" være tomme. ]]></trans>
+        <trans><![CDATA[ You cannot leave any of the three fields 'server name', 'user name' or 'user passord' empty. ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_VALIDATE_ACCOUNT</base>
@@ -245,7 +245,7 @@
     </entry>
     <entry>
         <base>BLANK</base>
-        <trans><![CDATA[ ]]></trans>
+        <trans><![CDATA[&nbsp;]]></trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_CHANGED_CONF</base>
@@ -301,7 +301,7 @@
     </entry>
     <entry>
         <base>ERR_BADMAIL</base>
-        <trans><![CDATA[ Den E-Mail adresse du gav lader ikke til at være gyldig.<br> En gyldig E-mail adresse indeholder kun bogstaver(eksl. æ, ø og å), tal og understregningstegn i navnedelen. Der kan også være bindestreg "-" og punktum "." i navnet, men ikke i begyndelsen eller enden. Domænedelen (delen til højre for @) må kun bestå af store eller små bogstaver, tal og bindestreg "-". Domænenavnet indeholder normalt mellem 1 og 4 punktummer ".". Det sidste ord kan kun indeholde bogstaver og skal bestå af mindst 2 og højst 5 tegn.<br> Du kan oprette mere end en ekstern postkasse. I så fald skal hver postkasse adskilles med et kolon ":" ]]></trans>
+        <trans><![CDATA[ The E-Mail address you gave doesn't seems to be valid.<br> A valid E-Mail contains only letters, digits and undescores in the name part. There can also be '-' and '.' in the name, but not at begining or end. The domain part (to the right of the @ sign) should only contain upper- and lowercase letters, numbers and the '-' character. The domain name normally contains between 1 and 4 dot (.) characters. The last word (the tld) can only contains letters and it should have a least 2 characters, but not more than 7.<br> You can set more than one external mailbox. In this case, just separate each e-mail address with a colon ':' ]]></trans>
     </entry>
     <entry>
         <base>STATUS_1</base>
@@ -329,6 +329,6 @@
        </entry>
     <entry>
         <base>SHOW_SCHEDULE_INFOS</base>
-        <trans><![CDATA[ <center><h4>Information om intervaller</h4></center>Afhentning af post sker med regelmæssige intervaller. Reglerne er de samme som de regler der er sat i panelet "E-Post".<br> Hvis du ønsker at ændre intervallerne, så ændres de under panelet "E-post".<br> <b>BEMÆRK!</b> : Du kan kun ændre intervallerne, hvis du bruger ETRN eller multi-drop!<br> For at omgå denne begrænsning, skal du gøre følgende: <br> - Vælg ETRN og vælg dernæst de nye intervaller og gem ændringerne. <br> - Vælg så "Standard (SMTP)" og gem igen. ]]></trans>
+        <trans><![CDATA[ <center><h4>Scheduling information</h4></center> E-mail retrieval is done at regular intervals. The scheduling rules are the same as the rules set in the 'E-Mails' panel.<br> If you want to change the schedule, simply change them in the E-Mail panel.<br> <b>NOTE!</b> : If you don't use ETRN or Multi-Drop, you cannot change the schedule !<br> To work around this limitation, do the following :<br> - Select ETRN and select your new schedule then 'Save'.<br> - Then select 'Standard (SMTP)' and 'Save' again. ]]></trans>
     </entry>
 </lexicon>
--- smeserver-fetchmail-1.4/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail      2012-06-03 14:27:57.000000000 -0600
+++ smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail       2013-07-14 00:32:28.148460018 -0600
@@ -5,7 +5,7 @@
     </entry>
     <entry>
         <base>FIRST_PAGE_DESCRIPTION</base>
-           <trans><![CDATA[ <p> Hier können die Einstellungen für den Empfang externer Mailboxen auf dem SME-Server vorgenommen werden. Was heißt das? Einige Benutzer haben eine oder mehrere externe Mailboxen. FetchMail erlaubt, Mails von diesen Mailboxen zentral auf dem SME-Server zu empfangen und den Benutzern in deren SME-Mailbox bereitzustellen.<br> Zusätzlich zur ohnehin vorhandenen Backup-Funktion können mit FetchMail folgende weitere Funktionen eingestellt werden :<br> - Verteilung einer Mailbox auf mehrere Mailboxen<br> - Es kann ein 'versteckter Benutzer' erstellt werden, dessen empfangene Mails immer an eine oder mehrere andere Mailboxen verteilt werden.<br> - Ereignisse in den Mailboxen können geloggt werden.<br> ]]></trans>
+           <trans><![CDATA[ <p> This panel allows configuration of external mailbox retrieval by your SME Server. What does this mean?<br> Some of your users may have external mailbox(es). Usually, the email clients on individual workstations have to be configured to fetch mail from these external mailboxes as well as from the normal mailboxes provided by the SME server. Using this control panel, the SME server can be configured to fetch mail from external mailboxes and then automatically forward these mails to internal mail boxes. This makes configuration of the email clients on individual workstations very easy.<br> Using this method of mail retrieval (and provided that the individual workstations are using IMAP) means that emails are backed up as part of the normal backup process.<br> Other functions available through this panel are:<br> - A mailbox can be distributed to many mailboxes<br> - You can create 'Ghost account' : Mails sent to this account are distributed to other(s) mailbox(es) only.<br> - logging of events for a mailboxes.<br> ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_SERVICE_0</base>
@@ -89,7 +89,7 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_USERS</base>
-        <trans><![CDATA[ Es folgt eine Tabelle mit den aktuell im System registrierten Benutzern und eine Zusammenfassung der FetchMail-Einstellungen für jeden Benutzer.<br> Hier können die FetchMail-Regeln für die Benutzer erstellt, geändert und gelöscht werden. ]]></trans>
+        <trans><![CDATA[ Below is a table summarizing the current users defined on this system with a summary of the fetchmail configuration for each user.<br> Here you can create, modify, and remove fetchmail rules for any user. ]]></trans>
     </entry>
     <entry>
         <base>NO_USER_ACCOUNTS</base>
@@ -101,11 +101,11 @@
     </entry>
     <entry>
         <base>SET_GENERAL_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Auswahl der allgemeinen Informationen für die FetchMail-Benutzer.<br> Die Details zum Mail-Empfang können in der nächsten Seite eingestellt werden. </p> ]]></trans>
+        <trans><![CDATA[ <p> Select the general information for the fetchmail accounts.<br> The specific mailboxes to retrieve will be set on the next screens. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERROR_NO_FINAL_RECIPIENT</base>
-        <trans><![CDATA[ Oups ! Keine Regeln für den Empfang definiert.<br> Mails können an den lokalen Benutzer ausgelifert werden. Dieser Modus wird bei Auswahl von 'Nein' für den 'Ghost Mode' ausgewählt.<br> Mails können an andere lokale Benutzer ausgeliefert werden. Dieser Modus wird auswählt, wenn in der Tabelle ein oder mehrere Kästchen neben den Benutzern angeklickt werden.<br> Mails können an externe Mailboxen ausgeliefert werden. Dieser Modus wird ausgewählt, wenn im Feld 'E-Mail-Adresse weiterleiten an' eine E-Mail-Adresse eingetragen wird.<br> Der Mail-Empfang muss wenigstens auf eine Art eingestellt werden. ]]></trans>
+        <trans><![CDATA[ Oups ! There is no final recipient for this rule.<br> Mails can be delivered to the local account. This mode is selected if you choose 'NO' for the 'Ghost Mode'.<br> Mails can be delivered to other local accounts. This mode is selected by checking one or more cases in the chart below.<br> Mails can be delivered to an external Mailbox. This mode is selected if an E-Mail is set in the 'Email address to forward mail' field.<br> You must set at least one kind of recipient. ]]></trans>
     </entry>
     <entry>
         <base>LABEL_USER_ACCOUNT</base>
@@ -169,7 +169,7 @@
     </entry>
     <entry>
         <base>SET_ACCOUNTS_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Hier müssen die Informationen für den Zugang zu externen Mailboxen hinterlegt werden : Name des Servers, der die Mailbox enthält, Typ des Mailservers, Benutzer-Name, Benutzer-Passwort. </p> ]]></trans>
+        <trans><![CDATA[ <p> Here you can set the information needed to access your external mailboxes : Name of the server storing the mailbox, type of mailbox server, account name, account password. </p> ]]></trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_SERVER</base>
@@ -205,19 +205,19 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_ACCOUNTS</base>
-        <trans><![CDATA[ <p> Liste der bereits eingerichtetn externen Mailboxen für diesen Benutzer. </p> ]]></trans>
+        <trans><![CDATA[ <p> This is the list of external mailboxes already configured for this user. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADSERVER</base>
-        <trans><![CDATA[ Kein erlaubter Servername.<br> Erlaubte Servernamen enthalten zwischen 2 und 5 Teile, die mit Punkten '.' voneinander getrennt sind.<br> Mit Ausnahme des letzten Teils sind Buchstaben, Ziffern und Gedankenstriche '-' zugelassen. Die Teile können beliebig lang sein.<br> Für den letzten Teil (auch tld genannt) sind nur 2 bis 5 Buchstaben zugelassen ]]></trans>
+        <trans><![CDATA[ This doesn't seems to be a valid server namei or IP address.<br> To be valid, this field must contain either a valid server name or a valid IP address.<br> A valid server name contains between two and 5 parts separated by dots '.'<br> For all parts but the last, characters allowed are letters, numbers and '-'. The parts can be of any size.<br> For the last part (also named tld), only letters are allowed, and the part must contain between two and seven characters.<br> A valid IP address is made with four decimal integers, each between 0 and 255. The four numbers are put together, separated by one dot. ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADCHARS</base>
-        <trans><![CDATA[ Oops ! Es wurden nicht zugelassene Zeichen eingegeben. ]]></trans>
+        <trans><![CDATA[ Oops ! I'm affraid you just entered one of the special characters we cannot allow. In theses fields, you can use any characters EXCEPT pipe '|' and the two very special characters, 0x1E and 0x1F. ]]></trans>
     </entry>
     <entry>
         <base>ERR_FIELD_EMPTY</base>
-        <trans><![CDATA[ Die Eingabefelder 'Server-Name', 'Benutzer-Name' und 'Benutzer-Passwort' dürfen nicht leer sein. ]]></trans>
+        <trans><![CDATA[ You cannot leave any of the three fields 'server name', 'user name' or 'user passord' empty. ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_VALIDATE_ACCOUNT</base>
@@ -301,7 +301,7 @@
     </entry>
     <entry>
         <base>ERR_BADMAIL</base>
-        <trans><![CDATA[ Die angegebene E-Mail-Adresse existiert scheinbar nicht.<br> Eine zugelassene E-Mail-Adresse besteht im Namens-Teil nur aus Buchstaben Zifferen und Unterstrichen. Außerdem können auch die Zeichen '-' und '.' im Namens-Teil enthalten sein, nur nicht am Anfang und am Ende. Der Domain-Teil (rechts neben dem @-Zeichen) sollte nur Großbuchstaben, Kleinbuchstaben, Ziffern und Bindestriche '-' enthalten. Er darf zwischen 1 und 4 Punkten enthalten. Das letzte Wort (die tld) muss aus mindestens 2, aber nicht mehr als 5 Buchstaben bestehen.<br> Es kann mehr als eine externe Mailbox eingestellt werden. Dabei bitte die einzelnen E-Mail-Adressen mit einem Semikolon ':' trennen. ]]></trans>
+        <trans><![CDATA[ The E-Mail address you gave doesn't seems to be valid.<br> A valid E-Mail contains only letters, digits and undescores in the name part. There can also be '-' and '.' in the name, but not at begining or end. The domain part (to the right of the @ sign) should only contain upper- and lowercase letters, numbers and the '-' character. The domain name normally contains between 1 and 4 dot (.) characters. The last word (the tld) can only contains letters and it should have a least 2 characters, but not more than 7.<br> You can set more than one external mailbox. In this case, just separate each e-mail address with a colon ':' ]]></trans>
     </entry>
     <entry>
         <base>STATUS_1</base>
@@ -329,6 +329,6 @@
        </entry>
     <entry>
         <base>SHOW_SCHEDULE_INFOS</base>
-        <trans><![CDATA[ <center><h4>Information zum Zeitplan</h4></center> Der E-Mail-Abrufmodus findet in geplanten Zeitintervallen statt. Die Regeln für diesen Zeitplan können unter 'E-Mails' eingestellt werden.<br> Aber Achtung: Bei Benutzung von ETRN oder Multi-Drop kann der Zeitplan für den E-Mail-Empfang nicht geändert werden !<br> In diesem Fall folgendermaßen vorgehen :<br> - Erst unter E-Mail Abrufmodus ETRN auswählen und dann den neuen Zeitplan mit 'Speichern' absichern.<br> - Erst danach unter E-Mail Abrufmodus 'Standard (SMTP)' auswählen und erneut mit 'Speichern' absichern. ]]></trans>
+        <trans><![CDATA[ <center><h4>Scheduling information</h4></center> E-mail retrieval is done at regular intervals. The scheduling rules are the same as the rules set in the 'E-Mails' panel.<br> If you want to change the schedule, simply change them in the E-Mail panel.<br> <b>NOTE!</b> : If you don't use ETRN or Multi-Drop, you cannot change the schedule !<br> To work around this limitation, do the following :<br> - Select ETRN and select your new schedule then 'Save'.<br> - Then select 'Standard (SMTP)' and 'Save' again. ]]></trans>
     </entry>
 </lexicon>
--- smeserver-fetchmail-1.4/root/etc/e-smith/locale/es/etc/e-smith/web/functions/fetchmail      2012-06-03 14:27:58.000000000 -0600
+++ smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/es/etc/e-smith/web/functions/fetchmail       2013-07-14 00:32:28.687452669 -0600
@@ -5,7 +5,7 @@
     </entry>
     <entry>
         <base>FIRST_PAGE_DESCRIPTION</base>
-           <trans><![CDATA[ <p> Esta panel permite la configuración de recuperación de casillas externas por intermedio de su Servidor SME. ¿Qué significa esto?<br> Algunos de sus usuarios tienen casillas de correo externas. Habitualmente, los clientes de correo en la estaciones de trabajo individuales deben configurarse para recuperar el correo desde esas casillas externas como también desde las casillas normales provistas por el Servidor SME. Utilizando este panel, el Servidor SME puede ser configurado para recuperar el correo desde casillas externas y luego automáticamente reenviar esos correos a casillas internas. Esto hace que la configuración en los clientes de correo en cada estación de trabajo sea mucho muy fácil.<br> El uso de este método de recuperación de correo (y siempre que las estaciones de trabajo utilicen IMAP) significa que los emails estarán respaldados como parte del proceso normal de respaldo.<br> Otras funciones disponibles a través de este panel son:<br> - Una casilla puede distribuirse a varias casillas<br> - Usted puede crear una cuenta fantasma 'cuenta Ghost' : Los correos enviados a esta cuenta son solamente distribuidos a otras casillas.<br> - registrando los eventos de las casillas.<br> ]]></trans>
+           <trans><![CDATA[ <p> This panel allows configuration of external mailbox retrieval by your SME Server. What does this mean?<br> Some of your users may have external mailbox(es). Usually, the email clients on individual workstations have to be configured to fetch mail from these external mailboxes as well as from the normal mailboxes provided by the SME server. Using this control panel, the SME server can be configured to fetch mail from external mailboxes and then automatically forward these mails to internal mail boxes. This makes configuration of the email clients on individual workstations very easy.<br> Using this method of mail retrieval (and provided that the individual workstations are using IMAP) means that emails are backed up as part of the normal backup process.<br> Other functions available through this panel are:<br> - A mailbox can be distributed to many mailboxes<br> - You can create 'Ghost account' : Mails sent to this account are distributed to other(s) mailbox(es) only.<br> - logging of events for a mailboxes.<br> ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_SERVICE_0</base>
@@ -89,7 +89,7 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_USERS</base>
-        <trans><![CDATA[ La siguiente tabla resume los usuarios actuales definidos en este sistema con un resumen de los ajustes individuales de fetchmail para cada usuario.<br> Aquí puede crear, modificar y eliminar reglas de fetchmail para cualquier usuario. ]]></trans>
+        <trans><![CDATA[ Below is a table summarizing the current users defined on this system with a summary of the fetchmail configuration for each user.<br> Here you can create, modify, and remove fetchmail rules for any user. ]]></trans>
     </entry>
     <entry>
         <base>NO_USER_ACCOUNTS</base>
@@ -101,11 +101,11 @@
     </entry>
     <entry>
         <base>SET_GENERAL_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Seleccione la información para las cuentas de fetchmail.<br> La casillas a recuperar serán configuradas en las siguientes pantallas. </p> ]]></trans>
+        <trans><![CDATA[ <p> Select the general information for the fetchmail accounts.<br> The specific mailboxes to retrieve will be set on the next screens. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERROR_NO_FINAL_RECIPIENT</base>
-        <trans><![CDATA[ Ups ! Esta regla no tiene un destinatario final.<br> Los correos pueden ser entregados a la cuenta local. Este modo es seleccionado si usted elige 'NO' para el 'Modo Ghost'.<br> Los correos pueden entregarse a otras cuentas locales. Este modo es seleccionado tildando uno o más casos en la carta de abajo.<br> Los correos pueden entregarse a una cuenta externa. Este modo es seleccionado si un E-Mail es configurado en el campo 'Dirección de email para reenvío'.<br> Usted debe fijar al menos un tipo de destinatario. ]]></trans>
+        <trans><![CDATA[ Oups ! There is no final recipient for this rule.<br> Mails can be delivered to the local account. This mode is selected if you choose 'NO' for the 'Ghost Mode'.<br> Mails can be delivered to other local accounts. This mode is selected by checking one or more cases in the chart below.<br> Mails can be delivered to an external Mailbox. This mode is selected if an E-Mail is set in the 'Email address to forward mail' field.<br> You must set at least one kind of recipient. ]]></trans>
     </entry>
     <entry>
         <base>LABEL_USER_ACCOUNT</base>
@@ -169,7 +169,7 @@
     </entry>
     <entry>
         <base>SET_ACCOUNTS_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Aquí puede establecer la información necesaria para acceder a sus casillas externas : Nombre del servidor que almacena la casilla, tipo de casilla del servidor, nombre de cuenta, contraseña de cuenta. </p> ]]></trans>
+        <trans><![CDATA[ <p> Here you can set the information needed to access your external mailboxes : Name of the server storing the mailbox, type of mailbox server, account name, account password. </p> ]]></trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_SERVER</base>
@@ -205,11 +205,11 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_ACCOUNTS</base>
-        <trans><![CDATA[ <p> Esta es la lista de las casillas externas configuradas para este usuario. </p> ]]></trans>
+        <trans><![CDATA[ <p> This is the list of external mailboxes already configured for this user. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADSERVER</base>
-        <trans><![CDATA[ Esto no parece ser un nombre de servidor o dirección IP válida.<br> Para que sea válido, este campo debe contener un nombre válido de servidor o una dirección IP válida.<br> Un nombre de servidor válido contiene entre dos y 5 partes separadas por puntos '.'<br> Para todas las partes excepto la última, los caracteres permitidos son letras, números y guión '-'. Las partes pueden ser de cualquier tamaño.<br> Para la última parte (también conocida como tld), sólo tres letras son permitidas, y la parte debe contener entre dos y cinco caracteres.<br> Una dirección IP válida esta formada con cuatro decimales enteros, cada uno entre 0 y 255. Los cuatro números son puestos uno a continuación del otro, separados por un punto. ]]></trans>
+        <trans><![CDATA[ This doesn't seems to be a valid server namei or IP address.<br> To be valid, this field must contain either a valid server name or a valid IP address.<br> A valid server name contains between two and 5 parts separated by dots '.'<br> For all parts but the last, characters allowed are letters, numbers and '-'. The parts can be of any size.<br> For the last part (also named tld), only letters are allowed, and the part must contain between two and seven characters.<br> A valid IP address is made with four decimal integers, each between 0 and 255. The four numbers are put together, separated by one dot. ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADCHARS</base>
@@ -301,7 +301,7 @@
     </entry>
     <entry>
         <base>ERR_BADMAIL</base>
-        <trans><![CDATA[ La dirección de E-Mail que proporcionó no parece ser válida.<br> Un E-Mail válido contiene sólo letras, dígitos y subguiones en la parte del nombre. También puede contener '-' y '.' en el nombre, pero ni al comienzo ni al final. La parte del dominio (a la derecha del signo @) sólo debe contener letras mayúsculas y minúsculas, números y el caracter '-'. El nombre de dominio normalmente contiene entre 1 y 4 caracteres de punto (.). La última palabra (el tld) puede contener solamente letras y tener al menos 2 caracteres, pero no mas de 7.<br> Usted puede configurar más de una casilla externa. En este caso, separar las direcciones de cada e-mail con dos puntos ':' ]]></trans>
+        <trans><![CDATA[ The E-Mail address you gave doesn't seems to be valid.<br> A valid E-Mail contains only letters, digits and undescores in the name part. There can also be '-' and '.' in the name, but not at begining or end. The domain part (to the right of the @ sign) should only contain upper- and lowercase letters, numbers and the '-' character. The domain name normally contains between 1 and 4 dot (.) characters. The last word (the tld) can only contains letters and it should have a least 2 characters, but not more than 7.<br> You can set more than one external mailbox. In this case, just separate each e-mail address with a colon ':' ]]></trans>
     </entry>
     <entry>
         <base>STATUS_1</base>
@@ -329,6 +329,6 @@
        </entry>
     <entry>
         <base>SHOW_SCHEDULE_INFOS</base>
-        <trans><![CDATA[ <center><h4>Programar información</h4></center> La recuperación de correos es hecha a intervalos regulares. Las reglas de programación son las mismas reglas que las que están en el panel 'E-Mails'.<br> Si usted desea cambiar la configuración, simplemente cámbielas en el panel de E-Mail.<br> <b>¡NOTA!</b> : Si usted no utiliza ETRN o Multi-Drop, usted no puede cambiar la programación !<br> Para poder superar esta limitación, haga lo siguiente :<br> - Seleccione ETRN y seleccione su nueva programación  y luego 'Guardar'.<br> - Luego seleccione 'Standar (SMTP)' y 'Guardar' nuevamente. ]]></trans>
+        <trans><![CDATA[ <center><h4>Scheduling information</h4></center> E-mail retrieval is done at regular intervals. The scheduling rules are the same as the rules set in the 'E-Mails' panel.<br> If you want to change the schedule, simply change them in the E-Mail panel.<br> <b>NOTE!</b> : If you don't use ETRN or Multi-Drop, you cannot change the schedule !<br> To work around this limitation, do the following :<br> - Select ETRN and select your new schedule then 'Save'.<br> - Then select 'Standard (SMTP)' and 'Save' again. ]]></trans>
     </entry>
 </lexicon>
--- smeserver-fetchmail-1.4/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail      2012-06-03 14:27:58.000000000 -0600
+++ smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail       2013-07-14 00:32:29.224445348 -0600
@@ -5,7 +5,7 @@
     </entry>
     <entry>
         <base>FIRST_PAGE_DESCRIPTION</base>
-           <trans><![CDATA[ <p> Vous pouvez ici configurer la récupération de boites aux lettres externes sur votre serveur SME. Qu'est ce à dire ?<br> Certains de vos utilisateurs peuvent disposer de boites aux lettres situées sur des serveurs différents de votre serveur SME. D'ici, vous pouvez demander à votre serveur SME de récupérer le contenu de ces BALS dans des BALS de SME. Ceci présente l'avantage de gérer toute la configuration 'lourde' sur le serveur SME, permettant une configuration aisée du poste utilisateur. Ceci permet également le backup et le passage à l'antivirus des Mails via le serveur SME (Si vos clients utilisent IMAP et/ou WEBMAIL pour accéder à leur messagerie, et si votre serveur est doté d'un anti-virus et de sauvegardes !)<br> Ce panneau vous permet en outre d'autres opérations :<br> - Le contenu d'une boite peut être distribuée dans plusieurs boites additionnelles.<br> - Vous pouvez créer des boites 'fantômes : elles ne stockent rien, et ne font que de la redistribution.<br> - Il est possible de logguer les opérations sur une ou plusieurs boites.<br> - ... ]]></trans>
+           <trans><![CDATA[ <p> This panel allows configuration of external mailbox retrieval by your SME Server. What does this mean?<br> Some of your users may have external mailbox(es). Usually, the email clients on individual workstations have to be configured to fetch mail from these external mailboxes as well as from the normal mailboxes provided by the SME server. Using this control panel, the SME server can be configured to fetch mail from external mailboxes and then automatically forward these mails to internal mail boxes. This makes configuration of the email clients on individual workstations very easy.<br> Using this method of mail retrieval (and provided that the individual workstations are using IMAP) means that emails are backed up as part of the normal backup process.<br> Other functions available through this panel are:<br> - A mailbox can be distributed to many mailboxes<br> - You can create 'Ghost account' : Mails sent to this account are distributed to other(s) mailbox(es) only.<br> - logging of events for a mailboxes.<br> ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_SERVICE_0</base>
@@ -89,7 +89,7 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_USERS</base>
-        <trans><![CDATA[ Vous trouverez ci-après un tableau avec la liste des utilisateurs définis sur ce serveur et un résumé de la configuration de la récupération de messages pour chacun d'eux.<br> Vous pourrez ici créer, modifier ou supprimer la configuration de cette récupération de messages pour chaque compte. ]]></trans>
+        <trans><![CDATA[ Below is a table summarizing the current users defined on this system with a summary of the fetchmail configuration for each user.<br> Here you can create, modify, and remove fetchmail rules for any user. ]]></trans>
     </entry>
     <entry>
         <base>NO_USER_ACCOUNTS</base>
@@ -101,11 +101,11 @@
     </entry>
     <entry>
         <base>SET_GENERAL_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Indiquez ici les paramètres généraux de récupération pour ce compte de messagerie.<br> Les coordonées des comptes externes seront renseignées page suivante. </p> ]]></trans>
+        <trans><![CDATA[ <p> Select the general information for the fetchmail accounts.<br> The specific mailboxes to retrieve will be set on the next screens. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERROR_NO_FINAL_RECIPIENT</base>
-        <trans><![CDATA[ Oups ! Il n'y a pas de destinataire final désigné pour cette règle.<br> Les courriels peuvent être distribués dans la boite du compte courant. Ce choix est validé en répondant 'non' à la question : 'Est-ce un compte fantôme'.<br> Les courriels peuvent être distribuées dans d'autres boites locales. Ce choix est validé en cochant une ou plusieurs des cases se trouvant dans le tableau plus bas.<br> Les courriels peuvent être renvoyés vers une adresse de courriel externe. Ce choix est validé par la présence d'une adresse courriel dans le champ 'Adresse pour le transfert des messages'<br> Vous devez choisir au moins une de ces trois solutions. ]]></trans>
+        <trans><![CDATA[ Oups ! There is no final recipient for this rule.<br> Mails can be delivered to the local account. This mode is selected if you choose 'NO' for the 'Ghost Mode'.<br> Mails can be delivered to other local accounts. This mode is selected by checking one or more cases in the chart below.<br> Mails can be delivered to an external Mailbox. This mode is selected if an E-Mail is set in the 'Email address to forward mail' field.<br> You must set at least one kind of recipient. ]]></trans>
     </entry>
     <entry>
         <base>LABEL_USER_ACCOUNT</base>
@@ -169,7 +169,7 @@
     </entry>
     <entry>
         <base>SET_ACCOUNTS_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> C'est ici que vous indiquez les références des boites aux lettres que vous souhaitez récupérer :<br> serveur, type de messagerie, nom du compte, mot de passe. </p> ]]></trans>
+        <trans><![CDATA[ <p> Here you can set the information needed to access your external mailboxes : Name of the server storing the mailbox, type of mailbox server, account name, account password. </p> ]]></trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_SERVER</base>
@@ -205,19 +205,19 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_ACCOUNTS</base>
-        <trans><![CDATA[ <p> Ceci est la liste des comptes externes déjà défini pour cet utilisateur. </p> ]]></trans>
+        <trans><![CDATA[ <p> This is the list of external mailboxes already configured for this user. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADSERVER</base>
-        <trans><![CDATA[ Ceci ne semble pas être un nom ou une adresse IP de serveur valide.<br> Ce champ doit contenir soit un nom de serveur soit une adresse IP.<br> Un nom de serveur doit comprendre entre 2 et 5 groupes de caractères, séparés par des points '.'.<br> Les premiers groupes peuvent contenir des lettres, des chiffres et le signe moins '-' . <br> Le dernier groupe (à droite) peut contenir entre 2 et 5 lettres.<br> Une adresse IP valide est constituée de 4 nombres entiers compris entre 0 et 255, séparés par des points. ]]></trans>
+        <trans><![CDATA[ This doesn't seems to be a valid server namei or IP address.<br> To be valid, this field must contain either a valid server name or a valid IP address.<br> A valid server name contains between two and 5 parts separated by dots '.'<br> For all parts but the last, characters allowed are letters, numbers and '-'. The parts can be of any size.<br> For the last part (also named tld), only letters are allowed, and the part must contain between two and seven characters.<br> A valid IP address is made with four decimal integers, each between 0 and 255. The four numbers are put together, separated by one dot. ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADCHARS</base>
-        <trans><![CDATA[ Votre saisie comprend des caractères interdits : Vous pouvez saisir dans ce champ n'importe quel caractère mis à part la barre verticale ( | ) et deux caractères très spéciaux (normalement insaisissables) dont voici la valeur hexadécimale : 0x1E et 0x1F. ]]></trans>
+        <trans><![CDATA[ Oops ! I'm affraid you just entered one of the special characters we cannot allow. In theses fields, you can use any characters EXCEPT pipe '|' and the two very special characters, 0x1E and 0x1F. ]]></trans>
     </entry>
     <entry>
         <base>ERR_FIELD_EMPTY</base>
-        <trans><![CDATA[ Vous ne pouvez laisser vide aucun des trois champs "nom de serveur", "nom de compte" ou "mot de passe de compte". ]]></trans>
+        <trans><![CDATA[ You cannot leave any of the three fields 'server name', 'user name' or 'user passord' empty. ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_VALIDATE_ACCOUNT</base>
@@ -245,7 +245,7 @@
     </entry>
     <entry>
         <base>BLANK</base>
-        <trans><![CDATA[ ]]></trans>
+        <trans><![CDATA[&nbsp;]]></trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_CHANGED_CONF</base>
@@ -301,7 +301,7 @@
     </entry>
     <entry>
         <base>ERR_BADMAIL</base>
-        <trans><![CDATA[ L'adresse de messagerie que vous avez saisi ne semble pas conforme.<br> Une adresse de messagerie conforme ne contient que des lettres, des chiffres et le symbole souligné "_ "<br> Il peut également y avoir des signes moins "-" et point "." mais pas au début ni à la fin. <br>La partie 'domaine' (la partie à droite du signe "@" ) ne peut contenir que des lettres, des chiffres et le signe moins "-". <br>Cette partie doit contenir entre 1 et 4 points ".". <br>La dernière partie ( entre le dernier point et la droite de l'adresse ) doit comprendre entre 2 et 5 lettres en minuscules. <br>Vous pouvez indiquer plus d'une adresse de mail externe. Il suffit de séparer chaque adresse par un double-point ":" ]]></trans>
+        <trans><![CDATA[ The E-Mail address you gave doesn't seems to be valid.<br> A valid E-Mail contains only letters, digits and undescores in the name part. There can also be '-' and '.' in the name, but not at begining or end. The domain part (to the right of the @ sign) should only contain upper- and lowercase letters, numbers and the '-' character. The domain name normally contains between 1 and 4 dot (.) characters. The last word (the tld) can only contains letters and it should have a least 2 characters, but not more than 7.<br> You can set more than one external mailbox. In this case, just separate each e-mail address with a colon ':' ]]></trans>
     </entry>
     <entry>
         <base>STATUS_1</base>
@@ -329,6 +329,6 @@
        </entry>
     <entry>
         <base>SHOW_SCHEDULE_INFOS</base>
-        <trans><![CDATA[ <center><h4>Informations de planification</h4></center> La récupération de messages est faite à intervalles réguliers. Les règles de planifications sont les mêmes que celles définies dans le panneau 'Courrier électronique'.<br> Si vous souhaitez modifier la planification, changez celle-ci dans le panneau 'Courrier électronique'.<br> Mais il y a un truc ! Si vous n'utilisez pas le mode ETRN ou le mode multidrop, vous ne pouvez pas enregistrer les changements de planification.<br> Dans ce cas, procédez ainsi :<br> 1) Choisissez le mode ETRN et faites votre nouvelle planification. Enregistrez vos changements.<br> 2) Immédiatement après, choisissez à nouveau le mode 'standard' et enregistrez à nouveau. ]]></trans>
+        <trans><![CDATA[ <center><h4>Scheduling information</h4></center> E-mail retrieval is done at regular intervals. The scheduling rules are the same as the rules set in the 'E-Mails' panel.<br> If you want to change the schedule, simply change them in the E-Mail panel.<br> <b>NOTE!</b> : If you don't use ETRN or Multi-Drop, you cannot change the schedule !<br> To work around this limitation, do the following :<br> - Select ETRN and select your new schedule then 'Save'.<br> - Then select 'Standard (SMTP)' and 'Save' again. ]]></trans>
     </entry>
 </lexicon>
--- smeserver-fetchmail-1.4/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail      2012-06-03 14:27:57.000000000 -0600
+++ smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail       2013-07-14 00:32:30.290430819 -0600
@@ -5,7 +5,7 @@
     </entry>
     <entry>
         <base>FIRST_PAGE_DESCRIPTION</base>
-           <trans><![CDATA[ <p> Questo pannello ti permette di configurare il recupero da caselle di email esterne al tuo Server. Cosa significa? Alcuni dei tuoi utenti potrebbero avere delle caselle email esterne. È più conveniente recuperare e smistare le email da queste caselle nel tuo Server locale. Questo ti permette di avere una configurazione molto semplice sulle postazioni degli utenti, che devono configurare un unico account, sul tuo server locale..<br> Ti permette inoltre di effettuare il backup di queste email sul server locale (se la postazione dell'utente usa IMAP e se fai il backup del tuo server, naturalmente!).<br> Ma questo pannello ti offre anche altre funzioni:<br> - Una casella email può essere distribuita a molte caselle<br> - Puoi creare un 'Account Fantasma': le email inviate a questo account sono esclusivamente distribuite ad altre caselle email.<br> - si può tenere uno storico degli eventi di una casella email.<br> ]]></trans>
+           <trans><![CDATA[ <p> This panel allows configuration of external mailbox retrieval by your SME Server. What does this mean?<br> Some of your users may have external mailbox(es). Usually, the email clients on individual workstations have to be configured to fetch mail from these external mailboxes as well as from the normal mailboxes provided by the SME server. Using this control panel, the SME server can be configured to fetch mail from external mailboxes and then automatically forward these mails to internal mail boxes. This makes configuration of the email clients on individual workstations very easy.<br> Using this method of mail retrieval (and provided that the individual workstations are using IMAP) means that emails are backed up as part of the normal backup process.<br> Other functions available through this panel are:<br> - A mailbox can be distributed to many mailboxes<br> - You can create 'Ghost account' : Mails sent to this account are distributed to other(s) mailbox(es) only.<br> - logging of events for a mailboxes.<br> ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_SERVICE_0</base>
@@ -89,7 +89,7 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_USERS</base>
-        <trans><![CDATA[ Di seguito troverai una tabella che riassume gli utenti attualmente definiti in questo sistema ed un sommario della configurazione di scaricamento posta per ogni utente.<br> Da qui puoi creare, modificare e rimuovere le regole di scaricamento posta per ogni utente. ]]></trans>
+        <trans><![CDATA[ Below is a table summarizing the current users defined on this system with a summary of the fetchmail configuration for each user.<br> Here you can create, modify, and remove fetchmail rules for any user. ]]></trans>
     </entry>
     <entry>
         <base>NO_USER_ACCOUNTS</base>
@@ -101,11 +101,11 @@
     </entry>
     <entry>
         <base>SET_GENERAL_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Seleziona le informazioni generali per gli account di recupero posta esterna.<br> Le caselle specifiche da recuperare saranno impostate nelle prossime schermate. </p> ]]></trans>
+        <trans><![CDATA[ <p> Select the general information for the fetchmail accounts.<br> The specific mailboxes to retrieve will be set on the next screens. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERROR_NO_FINAL_RECIPIENT</base>
-        <trans><![CDATA[ Oups! Non esiste un destinatario finale per questa regola.<br> Le email possono essere smistate all'account locale. Questo modo può essere impostato se scegli 'NO' per il 'Modo Fantasma'.<br> Le email possono essere smistate ad altri account locali. Questo modo può essere impostato selezionando uno o più casi dalla tabella seguente.<br> Le email possono essere smistate ad una casella esterna. Questo modo può essere impostato se si inserisce un'email nel campo 'Indirizzo cui inoltrare le email'.<br> Devi impostare almeno un tipo di regola. ]]></trans>
+        <trans><![CDATA[ Oups ! There is no final recipient for this rule.<br> Mails can be delivered to the local account. This mode is selected if you choose 'NO' for the 'Ghost Mode'.<br> Mails can be delivered to other local accounts. This mode is selected by checking one or more cases in the chart below.<br> Mails can be delivered to an external Mailbox. This mode is selected if an E-Mail is set in the 'Email address to forward mail' field.<br> You must set at least one kind of recipient. ]]></trans>
     </entry>
     <entry>
         <base>LABEL_USER_ACCOUNT</base>
@@ -169,7 +169,7 @@
     </entry>
     <entry>
         <base>SET_ACCOUNTS_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Qui puoi impostare le informazioni necessarie ad accedere alle tue caselle email esterne : Nome del server dove risiede la casella email, il tipo di server email, il nome dell'account, e la password dell'account. </p> ]]></trans>
+        <trans><![CDATA[ <p> Here you can set the information needed to access your external mailboxes : Name of the server storing the mailbox, type of mailbox server, account name, account password. </p> ]]></trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_SERVER</base>
@@ -205,19 +205,19 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_ACCOUNTS</base>
-        <trans><![CDATA[ <p> Questo è un elenco delle caselle email esterne già configurate per questo utente. </p> ]]></trans>
+        <trans><![CDATA[ <p> This is the list of external mailboxes already configured for this user. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADSERVER</base>
-        <trans><![CDATA[ Questo non sembra essere un nome o IP Address di server valido.<br> Un nome di server valido contiene da 2 a 5 parti separate da punti '.'<br> Per tutte le parti, tranne l'ultima, i caratteri permessi sono lettere, numeri e '-'. Le parti possono essere di qualsiasi lunghezza.<br> Per l'ultima parte (chiamata anche tld), sono ammesse solo lettere, e deve contenere da 2 a 5 caratteri. ]]></trans>
+        <trans><![CDATA[ This doesn't seems to be a valid server namei or IP address.<br> To be valid, this field must contain either a valid server name or a valid IP address.<br> A valid server name contains between two and 5 parts separated by dots '.'<br> For all parts but the last, characters allowed are letters, numbers and '-'. The parts can be of any size.<br> For the last part (also named tld), only letters are allowed, and the part must contain between two and seven characters.<br> A valid IP address is made with four decimal integers, each between 0 and 255. The four numbers are put together, separated by one dot. ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADCHARS</base>
-        <trans><![CDATA[ Oops ! Spiacente, hai appena inserito uno dei caratteri che non sono ammessi. In queste caselle, puoi usare qualsiasi carattere a parte la 'pipe' '|' e due caratteri molto speciali, 0x1E e 0x1F. ]]></trans>
+        <trans><![CDATA[ Oops ! I'm affraid you just entered one of the special characters we cannot allow. In theses fields, you can use any characters EXCEPT pipe '|' and the two very special characters, 0x1E and 0x1F. ]]></trans>
     </entry>
     <entry>
         <base>ERR_FIELD_EMPTY</base>
-        <trans><![CDATA[ Non puoi lasciare vuote nessuna delle tre caselle 'nome server', 'nome utente' e 'password utente' empty. ]]></trans>
+        <trans><![CDATA[ You cannot leave any of the three fields 'server name', 'user name' or 'user passord' empty. ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_VALIDATE_ACCOUNT</base>
@@ -301,7 +301,7 @@
     </entry>
     <entry>
         <base>ERR_BADMAIL</base>
-        <trans><![CDATA[ L'indirizzo email che hai fornito non sembra essere valido.<br> Un indirizzo email valido contiene solo lettere, numeri e trattini di sottolineatura nella parte del nome. Possono esserci anche '-' e '.' nel nome, ma non all'inizio o alla fine. La parte di dominio (a destra del simbolo @) dovrebbe contenere solo caratteri maiuscoli, minuscoli, numeri e '-'. Il nome dovrebbe contenere da 1 a 4 punti. L'ultima parola (il tld) può contenere solo lettere e dovrebbe avere almeno 2 caratteri, ma non più di 5.<br> Puoi impostare più di una casella email esterna. In questo caso, separa semplicemente ogni indirizzo email con ':' ]]></trans>
+        <trans><![CDATA[ The E-Mail address you gave doesn't seems to be valid.<br> A valid E-Mail contains only letters, digits and undescores in the name part. There can also be '-' and '.' in the name, but not at begining or end. The domain part (to the right of the @ sign) should only contain upper- and lowercase letters, numbers and the '-' character. The domain name normally contains between 1 and 4 dot (.) characters. The last word (the tld) can only contains letters and it should have a least 2 characters, but not more than 7.<br> You can set more than one external mailbox. In this case, just separate each e-mail address with a colon ':' ]]></trans>
     </entry>
     <entry>
         <base>STATUS_1</base>
@@ -329,6 +329,6 @@
        </entry>
     <entry>
         <base>SHOW_SCHEDULE_INFOS</base>
-        <trans><![CDATA[ <center><h4>Informazioni di programmazione</h4></center> Il recupero delle email è fatto ad intervalli regolari. Le regole di programmazione sono le stesse di quelle impostate nel pannello 'Email'.<br> Se vuoi cambiare la programmazione, semplicemente cambiala dal pannello Email.<br> Ma c'è un trucco : se non usi ETRN o Multi-Drop, non puoi cambiare la programmazione !<br> In questo caso, fai come segue :<br> - Seleziona ETRN e seleziona la tua nuova programmazione, quindi 'Salva'.<br> - Subito dopo, seleziona 'Standard (SMTP)' e 'Salva' di nuovo. ]]></trans>
+        <trans><![CDATA[ <center><h4>Scheduling information</h4></center> E-mail retrieval is done at regular intervals. The scheduling rules are the same as the rules set in the 'E-Mails' panel.<br> If you want to change the schedule, simply change them in the E-Mail panel.<br> <b>NOTE!</b> : If you don't use ETRN or Multi-Drop, you cannot change the schedule !<br> To work around this limitation, do the following :<br> - Select ETRN and select your new schedule then 'Save'.<br> - Then select 'Standard (SMTP)' and 'Save' again. ]]></trans>
     </entry>
 </lexicon>
--- smeserver-fetchmail-1.4/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/fetchmail      2012-06-03 14:27:58.000000000 -0600
+++ smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/fetchmail       2013-07-14 00:32:31.100419776 -0600
@@ -5,7 +5,7 @@
     </entry>
     <entry>
         <base>FIRST_PAGE_DESCRIPTION</base>
-           <trans><![CDATA[ <p> Dit paneel is voor configuratie van het ophalen van externe postbussen door uw SME Server. Wat betekend dit?<br> Een aantal van uw gebruikers kunnen een of meerdere externe postbussen hebben. Normaal gesproken moeten dan de e-mail cliënten op de individuele werkstations geconfigureerd worden om zowel deze externe postbussen alsook de normale postbussen van deze SME server. Door middel van dit controle paneel kan de SME server geconfigureerd worden om de post van externe postbussen op te halen en deze automatisch door te sturen naar de interne postbus. Dit maakt de configuratie van e-mail cliënten op individuele werkstations heel eenvoudig.<br> Deze methode van post ophalen (en aannemende dat de individuele werkstations IMAP gebruiken) betekend ook dat post onderdeel is van het normale back-up proces.<br> Andere functies die via dit paneel beschikbaar zijn:<br> - Een postbus kan naar meerdere andere postbussen doorgestuurd worden<br> - U kunt een 'Geest account' aanmaken: Post die naar deze account gestuurd word alleen verdeeld over andere postbussen.<br> - loggen van gebeurtenissen voor postbussen.<br> ]]></trans>
+           <trans><![CDATA[ <p> This panel allows configuration of external mailbox retrieval by your SME Server. What does this mean?<br> Some of your users may have external mailbox(es). Usually, the email clients on individual workstations have to be configured to fetch mail from these external mailboxes as well as from the normal mailboxes provided by the SME server. Using this control panel, the SME server can be configured to fetch mail from external mailboxes and then automatically forward these mails to internal mail boxes. This makes configuration of the email clients on individual workstations very easy.<br> Using this method of mail retrieval (and provided that the individual workstations are using IMAP) means that emails are backed up as part of the normal backup process.<br> Other functions available through this panel are:<br> - A mailbox can be distributed to many mailboxes<br> - You can create 'Ghost account' : Mails sent to this account are distributed to other(s) mailbox(es) only.<br> - logging of events for a mailboxes.<br> ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_SERVICE_0</base>
@@ -89,7 +89,7 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_USERS</base>
-        <trans><![CDATA[ De onderstaande tabel is een samenvatting van de huidige gebruikers zoals gedefinieerd op dit systeem en de fetchmail configuratie voor elke gebruiker. Hier kunt u fetchmail regels aanmaken, wijzigen en verwijderen voor een gebruiker. ]]></trans>
+        <trans><![CDATA[ Below is a table summarizing the current users defined on this system with a summary of the fetchmail configuration for each user.<br> Here you can create, modify, and remove fetchmail rules for any user. ]]></trans>
     </entry>
     <entry>
         <base>NO_USER_ACCOUNTS</base>
@@ -101,11 +101,11 @@
     </entry>
     <entry>
         <base>SET_GENERAL_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Selecteer de algemene informatie voor de fetchmail accounts.<br> De op te halen specifieke postbussen word ingesteld op de volgende schermen. </p> ]]></trans>
+        <trans><![CDATA[ <p> Select the general information for the fetchmail accounts.<br> The specific mailboxes to retrieve will be set on the next screens. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERROR_NO_FINAL_RECIPIENT</base>
-        <trans><![CDATA[ Oeps ! Er is geen uiteindelijke ontvanger voor deze regel.Berichten kunnen worden afgeleverd bij het lokale account. Deze modus is geselecteerd indien 'NEE' wordt gekozen voor de 'Geest Modus'.<br> Berichten kunnen worden afgeleverd bij andere lokale accounts. Deze modus is geselecteerd indien een of meerder gevallen worden geselecteerd in het overzicht hieronder.<br> Berichten kunnen worden afgeleverd bij een externe postbus. Deze modus is geselecteerd indien een adres is ingevuld in het 'E-mail adres voor doorsturen berichten'-veld.<br> Er dient tenminste een soort ontvanger te worden gekozen. ]]></trans>
+        <trans><![CDATA[ Oups ! There is no final recipient for this rule.<br> Mails can be delivered to the local account. This mode is selected if you choose 'NO' for the 'Ghost Mode'.<br> Mails can be delivered to other local accounts. This mode is selected by checking one or more cases in the chart below.<br> Mails can be delivered to an external Mailbox. This mode is selected if an E-Mail is set in the 'Email address to forward mail' field.<br> You must set at least one kind of recipient. ]]></trans>
     </entry>
     <entry>
         <base>LABEL_USER_ACCOUNT</base>
@@ -169,7 +169,7 @@
     </entry>
     <entry>
         <base>SET_ACCOUNTS_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Hier kunt u de informatie ingevullen welke nodig is om toegang te krijgen to uw externe postbussen : Naam van de server waarop uw postbus is opgeslagen, type postbus server, accountnaam, account wachtwoord. </p> ]]></trans>
+        <trans><![CDATA[ <p> Here you can set the information needed to access your external mailboxes : Name of the server storing the mailbox, type of mailbox server, account name, account password. </p> ]]></trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_SERVER</base>
@@ -205,19 +205,19 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_ACCOUNTS</base>
-        <trans><![CDATA[ <p> Dit is de lijst van externe postbussen reeds geconfigureerd voor deze gebruiker. </p> ]]></trans>
+        <trans><![CDATA[ <p> This is the list of external mailboxes already configured for this user. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADSERVER</base>
-        <trans><![CDATA[ Dit lijkt geen geldige server-naam of IP adres te zijn.Om geldig te zijn dient dit veld of een geldige server-naam of geldig IP adres te bevatten.<br> Een geldige server-naam bevat tussen de 2 en 5 delen welke worden gescheiden door een punt '.'<br> Geldige tekens voor alle behalve het laatste deel zijn letters, cijfers en '-'. De delen kunnen elke grootte zijn.<br> Voor het laatste deel (ookwel tld genaamd), mogen enkel letters worden gebruikt en dit dient twee tot vijf tekens lang te zijn.<br> Een geldig IP adres bestaat uit vier gehele getallen tussen de 0 een 255. Deze getallen worden samengesteld gescheiden door een punt. ]]></trans>
+        <trans><![CDATA[ This doesn't seems to be a valid server namei or IP address.<br> To be valid, this field must contain either a valid server name or a valid IP address.<br> A valid server name contains between two and 5 parts separated by dots '.'<br> For all parts but the last, characters allowed are letters, numbers and '-'. The parts can be of any size.<br> For the last part (also named tld), only letters are allowed, and the part must contain between two and seven characters.<br> A valid IP address is made with four decimal integers, each between 0 and 255. The four numbers are put together, separated by one dot. ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADCHARS</base>
-        <trans><![CDATA[ Oeps ! Ik ben bang dat u zojuist een speciaal karakter heeft gebruikt welke niet kan worden toegestaan. In deze velden kunt u elke gewenst karakter gebruiken BEHALVE pijp '|' en de twee zeer speciale karakters 0x1E en 0x1F. ]]></trans>
+        <trans><![CDATA[ Oops ! I'm affraid you just entered one of the special characters we cannot allow. In theses fields, you can use any characters EXCEPT pipe '|' and the two very special characters, 0x1E and 0x1F. ]]></trans>
     </entry>
     <entry>
         <base>ERR_FIELD_EMPTY</base>
-        <trans><![CDATA[ Geen van de drie velden 'server naam', 'gebruikersnaam' of 'gebruikers-wachtwoord' mogen leeg worden gelaten. ]]></trans>
+        <trans><![CDATA[ You cannot leave any of the three fields 'server name', 'user name' or 'user passord' empty. ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_VALIDATE_ACCOUNT</base>
@@ -245,7 +245,7 @@
     </entry>
     <entry>
         <base>BLANK</base>
-        <trans><![CDATA[ ]]></trans>
+        <trans><![CDATA[&nbsp;]]></trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_CHANGED_CONF</base>
@@ -301,7 +301,7 @@
     </entry>
     <entry>
         <base>ERR_BADMAIL</base>
-        <trans><![CDATA[ Het opgegeven e-mail adres lijkt niet correct.Een geldig e-mail bevat alleen letters, cijfers en lage streepjes in het naam gedeelte. Er kunnen ook '-' en '.' in de name voorkomen, maar niet aan het begin of einde. Het domein gedeelte (rechts van het @ teken) mag alleen hoofd en kleine letters, cijfers en het '-' teken bevatten. De domein naam bevat normaal 1 tot 4 punten (.). Het laatste woord (het tld) kan alleen letters bevatten en tenminste uit 2 maar niet meer dan 7 karakters bestaan.<br> U kunt meer dan één externe postbus instellen. In dat geval, dient u de e-mail adressen met een dubbele punt ':' te scheiden. ]]></trans>
+        <trans><![CDATA[ The E-Mail address you gave doesn't seems to be valid.<br> A valid E-Mail contains only letters, digits and undescores in the name part. There can also be '-' and '.' in the name, but not at begining or end. The domain part (to the right of the @ sign) should only contain upper- and lowercase letters, numbers and the '-' character. The domain name normally contains between 1 and 4 dot (.) characters. The last word (the tld) can only contains letters and it should have a least 2 characters, but not more than 7.<br> You can set more than one external mailbox. In this case, just separate each e-mail address with a colon ':' ]]></trans>
     </entry>
     <entry>
         <base>STATUS_1</base>
@@ -329,6 +329,6 @@
        </entry>
     <entry>
         <base>SHOW_SCHEDULE_INFOS</base>
-        <trans><![CDATA[ <center><h4>Plan informatie</h4></center> Post word regelmatig opgehaald. De plan regels zijn hetzelfde als de regels zoals die gezet zijn in het 'E-Mails' paneel.<br> Als u het plan wilt wijzigen, verander ze dan in het E-Mail paneel.<br> <b>MERK OP!</b> : Als u geen gebruik maakt van ETRN of Multi-Drop, kunt u het plan niet wijzigen!<br> Doe het volgende om deze beperking te overbruggen:<br> - Selecteer ETRN en selecteer uw nieuwe plan en dan 'Opslaan'.<br> - Dan selecteert u 'Standaard (SMTP)' en weer 'Opslaan'. ]]></trans>
+        <trans><![CDATA[ <center><h4>Scheduling information</h4></center> E-mail retrieval is done at regular intervals. The scheduling rules are the same as the rules set in the 'E-Mails' panel.<br> If you want to change the schedule, simply change them in the E-Mail panel.<br> <b>NOTE!</b> : If you don't use ETRN or Multi-Drop, you cannot change the schedule !<br> To work around this limitation, do the following :<br> - Select ETRN and select your new schedule then 'Save'.<br> - Then select 'Standard (SMTP)' and 'Save' again. ]]></trans>
     </entry>
 </lexicon>
--- smeserver-fetchmail-1.4/root/etc/e-smith/locale/pt/etc/e-smith/web/functions/fetchmail      2012-06-03 14:27:57.000000000 -0600
+++ smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/pt/etc/e-smith/web/functions/fetchmail       2013-07-14 00:32:31.644412361 -0600
@@ -5,7 +5,7 @@
     </entry>
     <entry>
         <base>FIRST_PAGE_DESCRIPTION</base>
-           <trans><![CDATA[ <p> Este painel permite a configuração de busca em caixas postais externas. O que isso significa?<br> Alguns de seus usuário podem ter outras contas de e-mail externas. Normalmente os clientes de e-mail em cada micro tem que ser configurados para fazer download destas contas e também da conta no servidor SME. Usando este painel de controle, o servidor SME pode ser configurado para buscar as mensagens nestas caixas externa e então enviá-las automaticamente para as caixas internas. Isto faz a configuração dos clientes de e-mail nos micros locais muito simples. <br> Usando este método de busca de e-mails (e assumindo que os micros da rede local estarão usando IMAP) significará que todos e-mail terão backup como parte do processo normal de backup que ocorrerá no servidor..<br> Outras funções disponível através deste painel são:<br> - Uma caixa postal pode ser distribuida para muitas caixas postais<br> - Você pode criar uma 'Conta fantasma': e-mail enviados para esta conta serão distribuidos para outras caixas-postais.<br> - logging de eventos para caixas-postais.<br> ]]></trans>
+           <trans><![CDATA[ <p> This panel allows configuration of external mailbox retrieval by your SME Server. What does this mean?<br> Some of your users may have external mailbox(es). Usually, the email clients on individual workstations have to be configured to fetch mail from these external mailboxes as well as from the normal mailboxes provided by the SME server. Using this control panel, the SME server can be configured to fetch mail from external mailboxes and then automatically forward these mails to internal mail boxes. This makes configuration of the email clients on individual workstations very easy.<br> Using this method of mail retrieval (and provided that the individual workstations are using IMAP) means that emails are backed up as part of the normal backup process.<br> Other functions available through this panel are:<br> - A mailbox can be distributed to many mailboxes<br> - You can create 'Ghost account' : Mails sent to this account are distributed to other(s) mailbox(es) only.<br> - logging of events for a mailboxes.<br> ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_SERVICE_0</base>
@@ -89,7 +89,7 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_USERS</base>
-        <trans><![CDATA[ Abaixo está uma tabela que resume os usuários definidos atualmente neste sistema com a configuração do fetchmail para cada um.<br>Aqui você pode criar, modificar e remover regras de fetchmail para qualquer usuário. ]]></trans>
+        <trans><![CDATA[ Below is a table summarizing the current users defined on this system with a summary of the fetchmail configuration for each user.<br> Here you can create, modify, and remove fetchmail rules for any user. ]]></trans>
     </entry>
     <entry>
         <base>NO_USER_ACCOUNTS</base>
@@ -101,11 +101,11 @@
     </entry>
     <entry>
         <base>SET_GENERAL_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Selecione a informação geral para as contas do fetchmail.<br> As caixas postais específicas para busca serão definidas nas próximas telas. </p> ]]></trans>
+        <trans><![CDATA[ <p> Select the general information for the fetchmail accounts.<br> The specific mailboxes to retrieve will be set on the next screens. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERROR_NO_FINAL_RECIPIENT</base>
-        <trans><![CDATA[ Oops ! Não há destinatário final para esta regra.<br> e-mails podem ser entregues para a conta local. Este modo será selecionado se você escolher 'NÃO' para o 'Modo Fantasma'.<br> e-mails podem ser entregues para outras contas locais. Este modo será selecionado se você marcar uma ou mais caixas no gráfico abaixo.<br> e-mails podem ser entregues para uma caixa postal externa. Este modo é selecionado se um e-mail é configurado no campo 'Endereço de e-mail para encaminhar mensagens' .<br> Você deve definir ao menso um tipo de destinatário. ]]></trans>
+        <trans><![CDATA[ Oups ! There is no final recipient for this rule.<br> Mails can be delivered to the local account. This mode is selected if you choose 'NO' for the 'Ghost Mode'.<br> Mails can be delivered to other local accounts. This mode is selected by checking one or more cases in the chart below.<br> Mails can be delivered to an external Mailbox. This mode is selected if an E-Mail is set in the 'Email address to forward mail' field.<br> You must set at least one kind of recipient. ]]></trans>
     </entry>
     <entry>
         <base>LABEL_USER_ACCOUNT</base>
@@ -169,7 +169,7 @@
     </entry>
     <entry>
         <base>SET_ACCOUNTS_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Aqui você define as informações necessárias para acessar as caixas postais externas: Nome do servidor armazenando a caixa postal, tipo de servidor de e-mail, nome da conta e sua senha. </p> ]]></trans>
+        <trans><![CDATA[ <p> Here you can set the information needed to access your external mailboxes : Name of the server storing the mailbox, type of mailbox server, account name, account password. </p> ]]></trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_SERVER</base>
@@ -205,19 +205,19 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_ACCOUNTS</base>
-        <trans><![CDATA[ <p> Esta é a lista de caixas postais externas já configuradas para este usuário </p> ]]></trans>
+        <trans><![CDATA[ <p> This is the list of external mailboxes already configured for this user. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADSERVER</base>
-        <trans><![CDATA[ Este não parece ser um nome válido de servidor ou endereço IP.<br> Para ser válido este campo deve conter um nome de servidor válido ou um endereço de IP válido. <br> Um nome de servidor válido contém entre duas e cinco partes separadas por pontos '.'<br> Para todas as partes exceto a última, os caracteres permitidos são letras, números e o hifen '-'. As partes podem ser de qualquer tamanho.<br> Para a última parte (também chamada de TLD), somente letras são permitidas, e a parte deve conter entre dois e cinco caracteres.<br> Um endereço válido é feito de quatro números decimais inteiros, cada um entre 0 e 255. Os quatro números são organizados juntos, separando-os com um ponto '.' ]]></trans>
+        <trans><![CDATA[ This doesn't seems to be a valid server namei or IP address.<br> To be valid, this field must contain either a valid server name or a valid IP address.<br> A valid server name contains between two and 5 parts separated by dots '.'<br> For all parts but the last, characters allowed are letters, numbers and '-'. The parts can be of any size.<br> For the last part (also named tld), only letters are allowed, and the part must contain between two and seven characters.<br> A valid IP address is made with four decimal integers, each between 0 and 255. The four numbers are put together, separated by one dot. ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADCHARS</base>
-        <trans><![CDATA[ Ooops ! Eu receio que você digitou um dos caracteres especiais que não não podemos permitir. Nestes campos, você pode usar qualquer caracter EXCETO pipe '|' e outros dois caracteres muitos especiais, 0x1E and 0x1F. ]]></trans>
+        <trans><![CDATA[ Oops ! I'm affraid you just entered one of the special characters we cannot allow. In theses fields, you can use any characters EXCEPT pipe '|' and the two very special characters, 0x1E and 0x1F. ]]></trans>
     </entry>
     <entry>
         <base>ERR_FIELD_EMPTY</base>
-        <trans><![CDATA[ Você não pode deixar nenhum dos três campos em branco: nome do servidor, nome do usuário e senha do usuário. ]]></trans>
+        <trans><![CDATA[ You cannot leave any of the three fields 'server name', 'user name' or 'user passord' empty. ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_VALIDATE_ACCOUNT</base>
@@ -301,7 +301,7 @@
     </entry>
     <entry>
         <base>ERR_BADMAIL</base>
-        <trans><![CDATA[ O endereço de e-mail que você forneceu não parece ser válido.<br> Um e-mail válido contem apenas letras, dígitos e sublinhados na parte do nome. O nome também pode conter '-' e '.' mas não no início ou no fim. A parte do domínio (a direita do simbolo @) deve conter apenas letras minusculas ou maiúsculas, números e o caractere '-' . O domínionormalmente contém entre 1 e 4 pontos ('.'). A última palavra (chamada TLD) somente pode conter letras e deve ter ao menos 2 caracteres e não mais do que 5.<br> Você pode definir mais do que uma caixa postal externa. Neste caso, apenas separe os endereços de e-mail usando o símbolo ':' ]]></trans>
+        <trans><![CDATA[ The E-Mail address you gave doesn't seems to be valid.<br> A valid E-Mail contains only letters, digits and undescores in the name part. There can also be '-' and '.' in the name, but not at begining or end. The domain part (to the right of the @ sign) should only contain upper- and lowercase letters, numbers and the '-' character. The domain name normally contains between 1 and 4 dot (.) characters. The last word (the tld) can only contains letters and it should have a least 2 characters, but not more than 7.<br> You can set more than one external mailbox. In this case, just separate each e-mail address with a colon ':' ]]></trans>
     </entry>
     <entry>
         <base>STATUS_1</base>
@@ -329,6 +329,6 @@
        </entry>
     <entry>
         <base>SHOW_SCHEDULE_INFOS</base>
-        <trans><![CDATA[ <center><h4>Informação de programação</h4></center> A busca do e-mail é feita em intervalos regulares. As regras para programação são as mesmas regras definidas no painel 'E-Mails'.<br> Se você gostaria de mudar a programação simplesmente a mude no painel de e-mail .<br> <b>NOTA!</b> : Se você não usa ETRN ou Multi-Drop, você não pode mudar a programação!<br> Para contornar essa limitação, faça o seguinte:<br> - Selecione ETRN e mude a nova programação e salve-a.<br> - Depois selecione 'SMTP Padrão' e salve-a novamente. ]]></trans>
+        <trans><![CDATA[ <center><h4>Scheduling information</h4></center> E-mail retrieval is done at regular intervals. The scheduling rules are the same as the rules set in the 'E-Mails' panel.<br> If you want to change the schedule, simply change them in the E-Mail panel.<br> <b>NOTE!</b> : If you don't use ETRN or Multi-Drop, you cannot change the schedule !<br> To work around this limitation, do the following :<br> - Select ETRN and select your new schedule then 'Save'.<br> - Then select 'Standard (SMTP)' and 'Save' again. ]]></trans>
     </entry>
 </lexicon>
--- smeserver-fetchmail-1.4/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/fetchmail   2012-06-03 14:27:58.000000000 -0600
+++ smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/fetchmail    2013-07-14 00:32:31.917408643 -0600
@@ -5,7 +5,7 @@
     </entry>
     <entry>
         <base>FIRST_PAGE_DESCRIPTION</base>
-           <trans><![CDATA[ <p> Este painel permite a configuração de busca em caixas postais externas. O que isso significa?<br> Alguns de seus usuário podem ter outras contas de e-mail externas. Normalmente os clientes de e-mail em cada micro tem que ser configurados para fazer download destas contas e também da conta no servidor SME. Usando este painel de controle, o servidor SME pode ser configurado para buscar as mensagens nestas caixas externa e então enviá-las automaticamente para as caixas internas. Isto faz a configuração dos clientes de e-mail nos micros locais muito simples. <br> Usando este método de busca de e-mails (e assumindo que os micros da rede local estarão usando IMAP) significará que todos e-mail terão backup como parte do processo normal de backup que ocorrerá no servidor..<br> Outras funções disponível através deste painel são:<br> - Uma caixa postal pode ser distribuida para muitas caixas postais<br> - Você pode criar uma 'Conta fantasma': e-mail enviados para esta conta serão distribuidos para outras caixas-postais.<br> - logging de eventos para caixas-postais.<br> ]]></trans>
+           <trans><![CDATA[ <p> This panel allows configuration of external mailbox retrieval by your SME Server. What does this mean?<br> Some of your users may have external mailbox(es). Usually, the email clients on individual workstations have to be configured to fetch mail from these external mailboxes as well as from the normal mailboxes provided by the SME server. Using this control panel, the SME server can be configured to fetch mail from external mailboxes and then automatically forward these mails to internal mail boxes. This makes configuration of the email clients on individual workstations very easy.<br> Using this method of mail retrieval (and provided that the individual workstations are using IMAP) means that emails are backed up as part of the normal backup process.<br> Other functions available through this panel are:<br> - A mailbox can be distributed to many mailboxes<br> - You can create 'Ghost account' : Mails sent to this account are distributed to other(s) mailbox(es) only.<br> - logging of events for a mailboxes.<br> ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_SERVICE_0</base>
@@ -89,7 +89,7 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_USERS</base>
-        <trans><![CDATA[ Abaixo está uma tabela que resume os usuários definidos atualmente neste sistema com a configuração do fetchmail para cada um.Aqui você pode criar, modificar e remover regras de fetchmail para qualquer usuário. ]]></trans>
+        <trans><![CDATA[ Below is a table summarizing the current users defined on this system with a summary of the fetchmail configuration for each user.<br> Here you can create, modify, and remove fetchmail rules for any user. ]]></trans>
     </entry>
     <entry>
         <base>NO_USER_ACCOUNTS</base>
@@ -101,11 +101,11 @@
     </entry>
     <entry>
         <base>SET_GENERAL_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Selecione a informação geral para as contas do fetchmail.<br> As caixas postais específicas para busca serão definidas nas próximas telas. </p> ]]></trans>
+        <trans><![CDATA[ <p> Select the general information for the fetchmail accounts.<br> The specific mailboxes to retrieve will be set on the next screens. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERROR_NO_FINAL_RECIPIENT</base>
-        <trans><![CDATA[ Oops ! Não há destinatário final para esta regra.E-mails podem ser entregues para a conta local. Este modo será selecionado se você escolher 'NÃO' para o 'Modo Fantasma'.<br>E-mails podem ser entregues para outras contas locais. Este modo será selecionado se você marcar uma ou mais caixas no gráfico abaixo.<br>E-mails podem ser entregues para uma caixa postal externa. Este modo é selecionado se um e-mail é definido no campo 'Endereço de e-mail para encaminhar mensagens' .<br> Você deve definir ao menos um tipo de destinatário. ]]></trans>
+        <trans><![CDATA[ Oups ! There is no final recipient for this rule.<br> Mails can be delivered to the local account. This mode is selected if you choose 'NO' for the 'Ghost Mode'.<br> Mails can be delivered to other local accounts. This mode is selected by checking one or more cases in the chart below.<br> Mails can be delivered to an external Mailbox. This mode is selected if an E-Mail is set in the 'Email address to forward mail' field.<br> You must set at least one kind of recipient. ]]></trans>
     </entry>
     <entry>
         <base>LABEL_USER_ACCOUNT</base>
@@ -169,7 +169,7 @@
     </entry>
     <entry>
         <base>SET_ACCOUNTS_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Aqui você define as informações necessárias para acessar as caixas postais externas: Nome do servidor armazenando a caixa postal, tipo de servidor de e-mail, nome da conta e sua senha. </p> ]]></trans>
+        <trans><![CDATA[ <p> Here you can set the information needed to access your external mailboxes : Name of the server storing the mailbox, type of mailbox server, account name, account password. </p> ]]></trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_SERVER</base>
@@ -205,19 +205,19 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_ACCOUNTS</base>
-        <trans><![CDATA[ <p> Esta é a lista de caixas postais externas já configuradas para este usuário </p> ]]></trans>
+        <trans><![CDATA[ <p> This is the list of external mailboxes already configured for this user. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADSERVER</base>
-        <trans><![CDATA[ Este não parece ser um nome de servidor válido ou endereço IP válido.Para ser válido este campo deve conter um nome de servidor válido ou um endereço de IP válido. <br> Um nome de servidor válido contém entre duas e cinco partes separadas por pontos '.'<br> Para todas as partes exceto a última, os caracteres permitidos são letras, números e o hifen '-'. As partes podem ser de qualquer tamanho.<br> Para a última parte (também chamada de TLD), somente letras são permitidas e a parte deve conter entre dois e sete caracteres.<br> Um endereço IP válido é feito de quatro números decimais inteiros, cada um entre 0 e 255. Os quatro números são organizados juntos, separando-os com um ponto '.' ]]></trans>
+        <trans><![CDATA[ This doesn't seems to be a valid server namei or IP address.<br> To be valid, this field must contain either a valid server name or a valid IP address.<br> A valid server name contains between two and 5 parts separated by dots '.'<br> For all parts but the last, characters allowed are letters, numbers and '-'. The parts can be of any size.<br> For the last part (also named tld), only letters are allowed, and the part must contain between two and seven characters.<br> A valid IP address is made with four decimal integers, each between 0 and 255. The four numbers are put together, separated by one dot. ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADCHARS</base>
-        <trans><![CDATA[ Ooops ! Eu receio que você digitou um dos caracteres especiais que não podemos permitir. Nestes campos, você pode usar qualquer caracter EXCETO pipe '|' e outros dois caracteres muito especiais, 0x1E and 0x1F. ]]></trans>
+        <trans><![CDATA[ Oops ! I'm affraid you just entered one of the special characters we cannot allow. In theses fields, you can use any characters EXCEPT pipe '|' and the two very special characters, 0x1E and 0x1F. ]]></trans>
     </entry>
     <entry>
         <base>ERR_FIELD_EMPTY</base>
-        <trans><![CDATA[ Você não pode deixar nenhum dos três campos em branco: 'nome do servidor', 'nome do usuário' e 'senha do usuário'. ]]></trans>
+        <trans><![CDATA[ You cannot leave any of the three fields 'server name', 'user name' or 'user passord' empty. ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_VALIDATE_ACCOUNT</base>
@@ -245,7 +245,7 @@
     </entry>
     <entry>
         <base>BLANK</base>
-        <trans><![CDATA[ ]]></trans>
+        <trans><![CDATA[&nbsp;]]></trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_CHANGED_CONF</base>
@@ -301,7 +301,7 @@
     </entry>
     <entry>
         <base>ERR_BADMAIL</base>
-        <trans><![CDATA[ O endereço de e-mail que você forneceu não parece ser válido.Um e-mail válido contém apenas letras, dígitos e sublinhados na parte do nome. O nome também pode conter '-' e '.' mas não no início ou no fim. A parte do domínio (a direita do simbolo @) deve conter apenas letras minusculas ou maiúsculas, números e o caractere '-' . O domínio normalmente contém entre 1 e 4 pontos ('.'). A última palavra (chamada TLD) somente pode conter letras e deve ter ao menos 2 caracteres e não mais do que 7.<br> Você pode definir mais do que uma caixa postal externa. Neste caso, apenas separe os endereços de e-mail usando o símbolo ':' ]]></trans>
+        <trans><![CDATA[ The E-Mail address you gave doesn't seems to be valid.<br> A valid E-Mail contains only letters, digits and undescores in the name part. There can also be '-' and '.' in the name, but not at begining or end. The domain part (to the right of the @ sign) should only contain upper- and lowercase letters, numbers and the '-' character. The domain name normally contains between 1 and 4 dot (.) characters. The last word (the tld) can only contains letters and it should have a least 2 characters, but not more than 7.<br> You can set more than one external mailbox. In this case, just separate each e-mail address with a colon ':' ]]></trans>
     </entry>
     <entry>
         <base>STATUS_1</base>
@@ -329,6 +329,6 @@
        </entry>
     <entry>
         <base>SHOW_SCHEDULE_INFOS</base>
-        <trans><![CDATA[ <center><h4>Informação de programação</h4></center> A busca do e-mail é feita em intervalos regulares. As regras para programação são as mesmas regras definidas no painel 'E-Mails'.<br> Se você gostaria de mudar a programação simplesmente a mude no painel de e-mail .<br> <b>NOTA!</b> : Se você não usa ETRN ou Multi-Drop, você não pode mudar a programação!<br> Para contornar essa limitação, faça o seguinte:<br> - Selecione ETRN e mude a nova programação e escolha 'Salvar'.<br> - Depois selecione 'SMTP Padrão' e salve-a novamente. ]]></trans>
+        <trans><![CDATA[ <center><h4>Scheduling information</h4></center> E-mail retrieval is done at regular intervals. The scheduling rules are the same as the rules set in the 'E-Mails' panel.<br> If you want to change the schedule, simply change them in the E-Mail panel.<br> <b>NOTE!</b> : If you don't use ETRN or Multi-Drop, you cannot change the schedule !<br> To work around this limitation, do the following :<br> - Select ETRN and select your new schedule then 'Save'.<br> - Then select 'Standard (SMTP)' and 'Save' again. ]]></trans>
     </entry>
 </lexicon>
--- smeserver-fetchmail-1.4/root/etc/e-smith/locale/ro/etc/e-smith/web/functions/fetchmail      2012-06-03 14:27:58.000000000 -0600
+++ smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/ro/etc/e-smith/web/functions/fetchmail       2013-07-14 00:32:32.188404949 -0600
@@ -1,287 +1,287 @@
 <lexicon lang="ro">
     <entry>
         <base>FORM_TITLE</base>
-        <trans>Configure External Mailbox Retrieval</trans>
+        <trans>Configurați importul de Mailuri externe</trans>
     </entry>
     <entry>
         <base>FIRST_PAGE_DESCRIPTION</base>
-           <trans><![CDATA[ <p> This panel allows configuration of external mailbox retrieval by your SME Server. What does this mean?<br> Some of your users may have external mailbox(es). Usually, the email clients on individual workstations have to be configured to fetch mail from these external mailboxes as well as from the normal mailboxes provided by the SME server. Using this control panel, the SME server can be configured to fetch mail from external mailboxes and then automatically forward these mails to internal mail boxes. This makes configuration of the email clients on individual workstations very easy.<br> Using this method of mail retrieval (and provided that the individual workstations are using IMAP) means that emails are backed up as part of the normal backup process.<br> Other functions available through this panel are:<br> - A mailbox can be distributed to many mailboxes<br> - You can create 'Ghost account' : Mails sent to this account are distributed to other(s) mailbox(es) only.<br> - logging of events for a mailboxes.<br> ]]></trans>
+           <trans><![CDATA[ <p> Acest panou configurează importul de mailuri externe de către serverul SME Ce înseamnă aceasta?<br> Unii din utilizatorii serverului pot avea si conturi externe. De obicei, clientii de mail de la fiecare utilizator trebuei configurat să preia aceste mailuri externe. Utilizând acest panou de control, serverul SME poate fi configurat să preia mailurile din conturile externe direct în contul local al utilizatorului. Aceasta înlesnțte configurarea clienților locali.<br> Utilizând această metodă de import (și presupunând ca clienții de mail sunt setați in mod IMAP) înseaamnă ca mailurile vor fi salvate ca parte integrantă a salvărilor curente.<br> Alte funcționalități disponibile prin acest panou:<br> - O adresă poate fi redistribuită mai multor adrese<br> - Puteți crea 'Cont Fantomă' : Mailurile destinate acetui cont vor fi redistribuite altor conturi.<br> - rapoare pentru evenimetele casutelor de mail.<br> ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_SERVICE_0</base>
-        <trans>Enable Fetchmail</trans>
+        <trans>Activați import de mesaje</trans>
     </entry>
     <entry>
         <base>SERVICE_0</base>
-        <trans>Fetchmail is Disabled</trans>
+        <trans>Importul de mailuri este dezactivat</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_SERVICE_1</base>
-        <trans>Disable Fetchmail</trans>
+        <trans>Dezactivați import mailuri</trans>
     </entry>
     <entry>
         <base>SERVICE_1</base>
-        <trans>Fetchmail is Enabled</trans>
+        <trans>Importul de mailuri este dezactivat</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_ROUTING_0</base>
-        <trans>Enable External POP and IMAP server access</trans>
+        <trans>Activați acces la POP și IMAP extern</trans>
     </entry>
     <entry>
         <base>ROUTING_0</base>
-        <trans>Workstations on the internal LAN cannot access external POP and IMAP servers</trans>
+        <trans>Stațiile de lucru din LAN nu pot accesa servere POP și IMAP externe</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_ROUTING_1</base>
-        <trans>Disable External POP and IMAP server access</trans>
+        <trans>Dezactivați acces la serverul POP și IMAP din exterior </trans>
     </entry>
     <entry>
         <base>ROUTING_1</base>
-        <trans>Workstations on the internal LAN can access external POP and IMAP servers</trans>
+        <trans>Stațiile de lucru din LAN pot accesa servere POP și IMAP externe</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_ROUTINGSMTP_0</base>
-        <trans>Enable External SMTP server access</trans>
+        <trans>Activati accesul la serverul SMTP din exterior</trans>
     </entry>
     <entry>
         <base>ROUTINGSMTP_0</base>
-        <trans>Workstations on the internal LAN cannot access external SMTP servers</trans>
+        <trans>Stațiile de lucru din LAN nu pot accesa servere SMTP externe</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_ROUTINGSMTP_1</base>
-        <trans>Disable External SMTP server access</trans>
+        <trans>Dezactivati accesul la serverul SMTP din exterior</trans>
     </entry>
     <entry>
         <base>ROUTINGSMTP_1</base>
-        <trans>Workstations on the internal LAN can access external SMTP servers</trans>
+        <trans>Stațiile de lucru din LAN pot accesa servere SMTP externe</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_ROUTINGSMTPPROXY_0</base>
-        <trans>Force SMTP connections through the SME Proxy</trans>
+        <trans>Forțați conexiunile SMTP prin proxy-ul SME</trans>
     </entry>
     <entry>
         <base>ROUTINGSMTPPROXY_0</base>
-        <trans>Workstations on the internal LAN have direct access to external SMTP servers</trans>
+        <trans>Stațiile de lucru din LAN au acces direct la servere externe SMTP</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_ROUTINGSMTPPROXY_1</base>
-        <trans>Allow direct SMTP connections</trans>
+        <trans>Permiteți conexiuni directe SMTP</trans>
     </entry>
     <entry>
         <base>ROUTINGSMTPPROXY_1</base>
-        <trans>SMTP connections from LAN to Internet are proxyed by the SME server</trans>
+        <trans>Conexiunile SMTP din LAN sunt fortate prin SME Proxy de pe server</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_ROUTINGNNTP_0</base>
-        <trans>Enable external news server access</trans>
+        <trans>Activați accesul la servere de știri externe</trans>
     </entry>
     <entry>
         <base>ROUTINGNNTP_0</base>
-        <trans>Workstations on the internal LAN cannot access external News servers</trans>
+        <trans>Stațiile de lucru din LAN nu pot accesa servere de știri externe</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_ROUTINGNNTP_1</base>
-        <trans>Disable external news server access</trans>
+        <trans>Dezactivați accesul extern la serverul de știri</trans>
     </entry>
     <entry>
         <base>ROUTINGNNTP_1</base>
-        <trans>Workstations on the internal LAN can access external News servers</trans>
+        <trans>Stațiile de lucru din rețeaua internă pot accesa servere de știri externe</trans>
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_USERS</base>
-        <trans><![CDATA[ Below is a table summarizing the current users defined on this system with a summary of the fetchmail configuration for each user.<br> Here you can create, modify, and remove fetchmail rules for any user. ]]></trans>
+        <trans><![CDATA[ Mai jos este un tabel ce insumează utilizatorii curenți cu un sumar al setarilor de fetchmail pentru fiecare.<br> Aici puteți crea, modifica sau șterge regulile de fetchmail ale oricarui utilizator. ]]></trans>
     </entry>
     <entry>
         <base>NO_USER_ACCOUNTS</base>
-        <trans>There are currently no users defined on this system.</trans>
+        <trans>Deocamdată nu sunt definiți utilizatori în sistem.</trans>
     </entry>
     <entry>
         <base>SET_GENERAL_TITLE</base>
-        <trans>Set general mail retrieval rules</trans>
+        <trans>Setări generale de reguli de preluare mail</trans>
     </entry>
     <entry>
         <base>SET_GENERAL_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Select the general information for the fetchmail accounts.<br> The specific mailboxes to retrieve will be set on the next screens. </p> ]]></trans>
+        <trans><![CDATA[ <p> Setați informațiile generale pentru conturile de preluare mail extern.<br> Setările specifice se vor efectua în următoarea pagină. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERROR_NO_FINAL_RECIPIENT</base>
-        <trans><![CDATA[ Oups ! There is no final recipient for this rule.<br> Mails can be delivered to the local account. This mode is selected if you choose 'NO' for the 'Ghost Mode'.<br> Mails can be delivered to other local accounts. This mode is selected by checking one or more cases in the chart below.<br> Mails can be delivered to an external Mailbox. This mode is selected if an E-Mail is set in the 'Email address to forward mail' field.<br> You must set at least one kind of recipient. ]]></trans>
+        <trans><![CDATA[ Oups ! Nu există destinatar final pentru această regulă.<br> Mailurile pot fi livrate contului actual. Acest mod este selectat in cazul în care alegeți 'NU' pentru 'Ghost Mode'.<br> Mails pot fi livrate altor conturi locale. Acest mod este selectat când bifați una sau mai multe selecțiuni din opțiunile de mai jos.<br> Mailurile pot fi livrate unui cont extern. Acest mod este selectat dacă cîmpul "Adresă externă de retransmitere" este completat.<br> Trebuie setat cel puțin un destinatar. ]]></trans>
     </entry>
     <entry>
         <base>LABEL_USER_ACCOUNT</base>
-        <trans>User Account</trans>
+        <trans>Cont utilizator</trans>
     </entry>
     <entry>
         <base>LABEL_COPY_TO</base>
-        <trans>Mail copy to</trans>
+        <trans>Copiază mailul către</trans>
     </entry>
     <entry>
         <base>LABEL_GHOST</base>
-        <trans>Is it a 'ghost' account (only used to redistribute mails) ?</trans>
+        <trans>Este un cont 'fantomă' (doar pentu a redistribui mailurile) ?</trans>
     </entry>
     <entry>
         <base>LABEL_DEBUG</base>
-        <trans>Do you want to debug this account (fetchmail actions are logged in /var/log/maillog) ?</trans>
+        <trans>Vreți să faciți debug la acest cont (actiunile de fethcmail vor fi notate în /var/log/mailog) ?</trans>
     </entry>
     <entry>
         <base>LABEL_SPY</base>
-        <trans>Do you want this account be monitored by the 'admin' account ?</trans>
+        <trans>Doriți ca acest cont să fie monitorizat de contul de 'admin' ?</trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_RETRIEVE</base>
-        <trans>What do you want to do with E-Mails on external servers ?</trans>
+        <trans>Ce doriți să se înâmple cu E-Mailurile de pe serverele externe ?</trans>
     </entry>
     <entry>
         <base>KEEP_NO</base>
-        <trans>Retrieve all mails</trans>
+        <trans>Importă toate mailurile</trans>
     </entry>
     <entry>
         <base>KEEP_YES</base>
-        <trans>Read mails and leave them on the servers</trans>
+        <trans>Citeste mailurile și lasă-le pe servere</trans>
     </entry>
     <entry>
         <base>KEEP_NEW</base>
-        <trans>Retrieve new mails only</trans>
+        <trans>Importă numai mailurile noi</trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_FORWARD</base>
-        <trans>Do you want to forward theses mails ?</trans>
+        <trans>Vreți sa retransmiteți aceste mailuri?</trans>
     </entry>
     <entry>
         <base>FORWARD_GET</base>
-        <trans>Retrieve only for this account</trans>
+        <trans>Importă doar pentru contul acesta</trans>
     </entry>
     <entry>
         <base>FORWARD_COPY</base>
-        <trans>Retrieve for this account and forward to another mailbox</trans>
+        <trans>Importă pentru acest cont și retransmite la un alt cont de mail</trans>
     </entry>
     <entry>
         <base>FORWARD_FORWARD</base>
-        <trans>Forward all mails to another mailbox only</trans>
+        <trans>Retransmite toate mailurile la un alt cont de mail</trans>
     </entry>
     <entry>
         <base>LABEL_FORWARD_MAIL</base>
-        <trans>Email address(es) to forward mails to ( format : xxx@yyy.zz ) To set more than one external address, just separate them with a colon ':'</trans>
+        <trans>Adresa(e) de mail unde să retransmită ( format xxx@yyy.zz ) Pentru a seta mai multe adrese externe separați-le cu punct și virgulă (;) </trans>
     </entry>
     <entry>
         <base>SET_ACCOUNTS_TITLE</base>
-        <trans>Set external mail access informations</trans>
+        <trans>Setați informațiile de acces ale mailului extern</trans>
     </entry>
     <entry>
         <base>SET_ACCOUNTS_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Here you can set the information needed to access your external mailboxes : Name of the server storing the mailbox, type of mailbox server, account name, account password. </p> ]]></trans>
+        <trans><![CDATA[ <p> Aici puteți seta informațiile necesare de acces a contului de mail extern :Numele serverului, tipul servedrului, numele contului, parola contului. </p> ]]></trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_SERVER</base>
-        <trans>Name or IP Address of the external mail server</trans>
+        <trans>Numele sau IP-ul serverului extern</trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_TYPE</base>
-        <trans>Protocol to use when reading mails</trans>
+        <trans>Protocolul utilizat pentru citirea mailurilor</trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_ACCOUNT</base>
-        <trans>The user account name on the mail server</trans>
+        <trans>Numele contului utilizatorului pe serverul de mail</trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_PASSWORD</base>
-        <trans>The user account password on the mail server</trans>
+        <trans>Parola utilizatorului pe serverul de mail</trans>
     </entry>
     <entry>
         <base>POP3</base>
-        <trans>Pop</trans>
+        <trans>POP</trans>
     </entry>
     <entry>
         <base>IMAP</base>
-        <trans>Imap</trans>
+        <trans>IMAP</trans>
     </entry>
     <entry>
         <base>SPOP3</base>
-        <trans>SSL Pop (Experimental)</trans>
+        <trans>SSL POP (Experimental)</trans>
     </entry>
     <entry>
         <base>SIMAP</base>
-        <trans>SSL Imap (Experimental)</trans>
+        <trans>SSL IMAP (Experimental)</trans>
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_ACCOUNTS</base>
-        <trans><![CDATA[ <p> This is the list of external mailboxes already configured for this user. </p> ]]></trans>
+        <trans><![CDATA[ <p> Aceasta este lista casuțelor de mail deja configurate pentru acest utilizator. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADSERVER</base>
-        <trans><![CDATA[ This doesn't seems to be a valid server namei or IP address.<br> To be valid, this field must contain either a valid server name or a valid IP address.<br> A valid server name contains between two and 5 parts separated by dots '.'<br> For all parts but the last, characters allowed are letters, numbers and '-'. The parts can be of any size.<br> For the last part (also named tld), only letters are allowed, and the part must contain between two and seven characters.<br> A valid IP address is made with four decimal integers, each between 0 and 255. The four numbers are put together, separated by one dot. ]]></trans>
+        <trans><![CDATA[ Aceasta nu apre a fi un nume sau adresa de IP valide.<br> Pentru a fi valid, acest câmp trebuie să conțină fie un nume de server valid fie o adresa IP corectă.<br> Un nume de server conține într două și cinci părți alfanumerice separate prin puncte '.'<br> Pentru toate parțile mai puțin ultima, caracterele permise sunt litere, sumere și '-'. Părțile pot fi de orice dimensiune.<br> Pentru ultima parte (denumită tld), sunt eprmise numai litere, iar partea cuprinde între două și șapte caractere.<br> O adresă IPvalidă este constituită din patru numere intregi fiecare între 0 și 255. cele patru numere sunt unite la un loc, separate de un punct. ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADCHARS</base>
-        <trans><![CDATA[ Oops ! I'm affraid you just entered one of the special characters we cannot allow. In theses fields, you can use any characters EXCEPT pipe '|' and the two very special characters, 0x1E and 0x1F. ]]></trans>
+        <trans><![CDATA[ Oops ! Ați introdus caractere speciale ce nu sunt permise. în aceste câmpuri  puteți utiliza orice caracter EXCEPȚIE bară '|' și cele două caractere speciale, 0x1E and 0x1F. ]]></trans>
     </entry>
     <entry>
         <base>ERR_FIELD_EMPTY</base>
-        <trans><![CDATA[ You cannot leave any of the three fields 'server name', 'user name' or 'user passord' empty. ]]></trans>
+        <trans><![CDATA[ Nu puteți lăsa nici unul din câmpurile  'nume server', 'nume utilizator' sau 'user parola' gol. ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_VALIDATE_ACCOUNT</base>
-        <trans>Validate Account</trans>
+        <trans>Validați cont</trans>
     </entry>
     <entry>
         <base>MAIL_SERVER</base>
-        <trans>Mail Server</trans>
+        <trans>Server Mail</trans>
     </entry>
     <entry>
         <base>MAIL_TYPE</base>
-        <trans>Mail Access Type</trans>
+        <trans>Tip de acces mail</trans>
     </entry>
     <entry>
         <base>MAIL_ACCOUNT</base>
-        <trans>Server Mailbox Account</trans>
+        <trans>Cont de mail pe server</trans>
     </entry>
     <entry>
         <base>MAIL_PASSWORD</base>
-        <trans>Server Mailbox Password</trans>
+        <trans>Parolă căsuță poștală</trans>
     </entry>
     <entry>
         <base>fetchmail</base>
-        <trans>Mail retrieval</trans>
+        <trans>Inport mailuri</trans>
     </entry>
     <entry>
         <base>BLANK</base>
-        <trans><![CDATA[&nbsp;]]></trans>
+        <trans><![CDATA[ ]]></trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_CHANGED_CONF</base>
-        <trans>Your changes to the Fetchmail configuration have been saved successfully.</trans>
+        <trans>Modificările efectuate asupra Importului de mailuri au fost salvate cu succes.</trans>
     </entry>
     <entry>
         <base>ERROR_WHILE_CHANGING_CONF</base>
-        <trans>Unable to apply the Fetchmail configuration changes.</trans>
+        <trans>Imposibil de aplicat modificările pentru importuld e mailuri</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_MODIFIED_ROUTING</base>
-        <trans>Your change to the access of external POP3 and IMAP4 servers from the internal network has been saved successfully.</trans>
+        <trans>Modificările accesului la serverele POP3 și IMAP4 din rețeaua internă a fost salvate cu succes.</trans>
     </entry>
     <entry>
         <base>ERROR_WHILE_MODIFYING_ROUTING</base>
-        <trans>Unable to apply the changes to the configuration of IMAP and POP3 access.</trans>
+        <trans>Imposibil de aplicat modificările configurației de acces POP3 și IMAP4.</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_MODIFIED_ROUTINGSMTP</base>
-        <trans>Your change to the access of external SMTP servers from the internal network has been saved successfully.</trans>
+        <trans>Modificările accesului la serverul exterior SMTP din rețeaua internă s-au salvat cu succes.</trans>
     </entry>
     <entry>
         <base>ERROR_WHILE_MODIFYING_ROUTINGSMTP</base>
-        <trans>Unable to apply the changes to the configuration of SMTP access.</trans>
+        <trans>Imposibil de aplicat modificările confugurărilor de acces SMTP</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_MODIFIED_ROUTINGNNTP</base>
-        <trans>Your changes to the access to external News servers from the internal network has been saved successfully.</trans>
+        <trans>Modificările accesului la serverul exterior de stiri din rețeaua internă s-au salvat cu succes.</trans>
     </entry>
     <entry>
         <base>ERROR_WHILE_MODIFYING_ROUTINGNNTP</base>
-        <trans>Unable to apply the changes to the configuration of NNTP access.</trans>
+        <trans>Imposibil de aplicat modificările confugurărilor de acces NNTP</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_MODIFIED_SMTPPROXY</base>
-        <trans>Your changes to the SME SMTP Proxy configuration has been saved successfully.</trans>
+        <trans>Modificările Proxy-ului SME SMTP s-au salvat cu succes.</trans>
     </entry>
     <entry>
         <base>PREVIOUS</base>
@@ -289,46 +289,46 @@
     </entry>
     <entry>
         <base>VALIDATE</base>
-        <trans>Validate Changes !</trans>
+        <trans>Validați modificări!</trans>
     </entry>
     <entry>
         <base>ERR_NO_FETCHMAIL_RECORD</base>
-        <trans>Cannot retrieve fetchmail record from the configuration database.</trans>
+        <trans>Nu pot prelua setări de import mailuri din baza de date de configurări.</trans>
     </entry>
     <entry>
         <base>ERR_NO_SMTPFRONT-QMAIL_RECORD</base>
-        <trans>Cannot retrieve smtpfront-qmail record from the configuration database.</trans>
+        <trans>Nu pot prelua inregistrările smtpfront-qmail din baza de configurări.</trans>
     </entry>
     <entry>
         <base>ERR_BADMAIL</base>
-        <trans><![CDATA[ The E-Mail address you gave doesn't seems to be valid.<br> A valid E-Mail contains only letters, digits and undescores in the name part. There can also be '-' and '.' in the name, but not at begining or end. The domain part (to the right of the @ sign) should only contain upper- and lowercase letters, numbers and the '-' character. The domain name normally contains between 1 and 4 dot (.) characters. The last word (the tld) can only contains letters and it should have a least 2 characters, but not more than 7.<br> You can set more than one external mailbox. In this case, just separate each e-mail address with a colon ':' ]]></trans>
+        <trans><![CDATA[ Adresa E-Mail furnizată pare a nu fi validă.<br> O adresă E-Mail validă conține doar literenumere si sublinieri în zona de nume . Pot exista deasemenea  '-' și '.' în nume, dar nu la început sau sfârșit. Partea de domeniu (în dreapta semnului @ ) trebuie să conțină litere, numere, și cratimă '-' . Numele de domeniu conține de obicei între 1 și 4 puncte (.) . Ultimul cuvânt (tld-ul) poate conține doar litere și are intre 2 si 7 caractere.<br> Puteți seta mai mult de o adresă externa. În acest caz, separați-le cu punct și virgulă ':' ]]></trans>
     </entry>
     <entry>
         <base>STATUS_1</base>
-        <trans>ENABLED</trans>
+        <trans>ACTIV</trans>
     </entry>
     <entry>
         <base>STATUS_0</base>
-        <trans>DISABLED</trans>
+        <trans>DEZACTIVAT</trans>
     </entry>
        <entry>
            <base>NB_EXT_BOX</base>
-           <trans>External Mailbox</trans>
+           <trans>Adresa mail externă</trans>
        </entry>
        <entry>
            <base>GHOST_ACCOUNT</base>
-           <trans>Ghost account</trans>
+           <trans>Cont fantomă</trans>
        </entry>
        <entry>
            <base>DEBUG_MAILBOX</base>
-           <trans>Mailbox in 'debug' mode</trans>
+           <trans>Căsuță mail in mod 'debug'</trans>
        </entry>
        <entry>
            <base>SPIED_MAILBOX</base>
-           <trans>Mailbox under supervision</trans>
+           <trans>Căsuță mail sub supraveghere</trans>
        </entry>
     <entry>
         <base>SHOW_SCHEDULE_INFOS</base>
-        <trans><![CDATA[ <center><h4>Scheduling information</h4></center> E-mail retrieval is done at regular intervals. The scheduling rules are the same as the rules set in the 'E-Mails' panel.<br> If you want to change the schedule, simply change them in the E-Mail panel.<br> <b>NOTE!</b> : If you don't use ETRN or Multi-Drop, you cannot change the schedule !<br> To work around this limitation, do the following :<br> - Select ETRN and select your new schedule then 'Save'.<br> - Then select 'Standard (SMTP)' and 'Save' again. ]]></trans>
+        <trans><![CDATA[ <center><h4>Informații ale programarilor</h4></center> Importul de E-mailuri se face la intervale regulate. Regulile de programare sunt aceleași ca și regulile setate în panoul 'E-mails'.<br> Dacă doriți schimbarea programărilor, schimbați-le în panoul E-Mail.<br> <b>NOTĂ!</b> : Dacă nu folosiți ETRN sau Multi-Drop, nu puteți schimba programarea !<br> Ca să evitați acest neajuns, procedați astfel :<br> - Selectați ETRN și setați noua programare apoi 'Salvați'.<br> - Apoi setați 'Standard (SMTP)' și 'Salvați' din nou. ]]></trans>
     </entry>
 </lexicon>
--- smeserver-fetchmail-1.4/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/fetchmail      2012-06-03 14:27:58.000000000 -0600
+++ smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/fetchmail       2013-07-14 00:32:33.075392858 -0600
@@ -5,7 +5,7 @@
     </entry>
     <entry>
         <base>FIRST_PAGE_DESCRIPTION</base>
-           <trans><![CDATA[ <p> Denna panel tillåter konfiguration av hämtning av externa e-postmeddelanden av din SME Server. Vad betyder detta?<br> Några av dina användare kan ha externa e-postlådor. Normalt så måste e-postklienterna på varje arbetsstation konfigureras för att hämta e-postmeddelanden från dessa exerna e-postlådor men även för de normala e-postlådorna på SME servern. Genom att använda kontrollpanelen kan SME servern konfigureras för att hämta e-post från de externa e-postlådorna och därefter automatiskt vidarebefordra dessa e-postmeddelanden till de interna e-postlådorna. Detta gör att konfigurationen av e-postklienterna mycket enkelt.<br> Användande av denna metod för e-posthämtning (och under förutsättning att de individuella arbetsstationerna använder IMAP) betyder att backup tas av e-postmeddelanden som en normal del av backupprocessen.<br> Andra funktioner som är åtkomliga genom denna panel är:<br> - En e-postlåda kan distribueras till många e-postlådor<br> - Du kan skapa ett 'spökkonto' : E-postmeddelanden som skickas till detta konto distribueras endast till andra e-postlådor.<br> - Loggning av händelser för e-postlådor.<br> ]]></trans>
+           <trans><![CDATA[ <p> This panel allows configuration of external mailbox retrieval by your SME Server. What does this mean?<br> Some of your users may have external mailbox(es). Usually, the email clients on individual workstations have to be configured to fetch mail from these external mailboxes as well as from the normal mailboxes provided by the SME server. Using this control panel, the SME server can be configured to fetch mail from external mailboxes and then automatically forward these mails to internal mail boxes. This makes configuration of the email clients on individual workstations very easy.<br> Using this method of mail retrieval (and provided that the individual workstations are using IMAP) means that emails are backed up as part of the normal backup process.<br> Other functions available through this panel are:<br> - A mailbox can be distributed to many mailboxes<br> - You can create 'Ghost account' : Mails sent to this account are distributed to other(s) mailbox(es) only.<br> - logging of events for a mailboxes.<br> ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_SERVICE_0</base>
@@ -89,7 +89,7 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_USERS</base>
-        <trans><![CDATA[ Nedan finns en tabell över de nuvarande användarna som är definierade på detta system med en summering av fetchmailkonfigurationen för varje användare.<br> Du kan skapa, ändra eller ta bort fetchmailregler för valfri användare. ]]></trans>
+        <trans><![CDATA[ Below is a table summarizing the current users defined on this system with a summary of the fetchmail configuration for each user.<br> Here you can create, modify, and remove fetchmail rules for any user. ]]></trans>
     </entry>
     <entry>
         <base>NO_USER_ACCOUNTS</base>
@@ -101,11 +101,11 @@
     </entry>
     <entry>
         <base>SET_GENERAL_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Välj allmän information för fetchmailkonton.<br> De specifika e-postlådorna som skall hämtas anges på nästa formulär. </p> ]]></trans>
+        <trans><![CDATA[ <p> Select the general information for the fetchmail accounts.<br> The specific mailboxes to retrieve will be set on the next screens. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERROR_NO_FINAL_RECIPIENT</base>
-        <trans><![CDATA[ Oups ! Det finns ingen slutlig mottagare för denna regel.<br> Meddelanden kan levereras till det lokala kontot. Denna mod väljs om du anger NEJ i 'Spökmod'.<br> Meddelanden kan levereras till andra lokala konton. Denna mod väljs genom att välja en eller flera val i diagrammet nedan.<br> Meddelanden kan levereras till en externa e-postlådor. Denna mod väljs om e-post är valt i fältet för 'E-postadress för vidarebefordran'.<br> Du måste ange minst en typ av mottagare. ]]></trans>
+        <trans><![CDATA[ Oups ! There is no final recipient for this rule.<br> Mails can be delivered to the local account. This mode is selected if you choose 'NO' for the 'Ghost Mode'.<br> Mails can be delivered to other local accounts. This mode is selected by checking one or more cases in the chart below.<br> Mails can be delivered to an external Mailbox. This mode is selected if an E-Mail is set in the 'Email address to forward mail' field.<br> You must set at least one kind of recipient. ]]></trans>
     </entry>
     <entry>
         <base>LABEL_USER_ACCOUNT</base>
@@ -169,7 +169,7 @@
     </entry>
     <entry>
         <base>SET_ACCOUNTS_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Här kan du ange den information som krävs för åtkomst till dina externa e-postlådor : Namnet på e-postservern, typ av e-postserver, kontonamn, kontots lösenord. </p> ]]></trans>
+        <trans><![CDATA[ <p> Here you can set the information needed to access your external mailboxes : Name of the server storing the mailbox, type of mailbox server, account name, account password. </p> ]]></trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_SERVER</base>
@@ -205,19 +205,19 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_ACCOUNTS</base>
-        <trans><![CDATA[ <p> Detta är en lista över externa e-postlådor som redan är konfigurerad för denna användare. </p> ]]></trans>
+        <trans><![CDATA[ <p> This is the list of external mailboxes already configured for this user. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADSERVER</base>
-        <trans><![CDATA[ Detta verkar inte vara ett giltigt servernamn eller IP-adress.<br> För att vara giltig måste detta namn innehålla antingen ett giltigt servernamn eller en giltig IP-adress.<br> Ett giltigt servernamn innehåller två eller fem delar åtskilda med punkter '.'<br> För alla delar utom den sista, tillåtna tecken är bokstäver, siffror och '-'. Delarna kan vara av valfri storlek.<br> För den sista delen (som också benäms tld) är endast bokstäver tillåtna och delen får endast innehålla två till sju tecken.<br> En giltig IP-adress består av 4 tal, varje tal mellan 0 och 255. De fyra numren sätts ihop separerade med punkter. ]]></trans>
+        <trans><![CDATA[ This doesn't seems to be a valid server namei or IP address.<br> To be valid, this field must contain either a valid server name or a valid IP address.<br> A valid server name contains between two and 5 parts separated by dots '.'<br> For all parts but the last, characters allowed are letters, numbers and '-'. The parts can be of any size.<br> For the last part (also named tld), only letters are allowed, and the part must contain between two and seven characters.<br> A valid IP address is made with four decimal integers, each between 0 and 255. The four numbers are put together, separated by one dot. ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADCHARS</base>
-        <trans><![CDATA[ Oops ! Du har angivet ett av de specialtecken som vi inte kan godkänna. I dessa fält kan du använda vilket tecken som helst förutom pipe '|' och de två väldigt speciella tecknen, 0x1E och 0x1F. ]]></trans>
+        <trans><![CDATA[ Oops ! I'm affraid you just entered one of the special characters we cannot allow. In theses fields, you can use any characters EXCEPT pipe '|' and the two very special characters, 0x1E and 0x1F. ]]></trans>
     </entry>
     <entry>
         <base>ERR_FIELD_EMPTY</base>
-        <trans><![CDATA[ Du kan inte lämna något av dessa tre fält tomma 'servernamn', 'användarnamn' or 'användarlösenord' tomma. ]]></trans>
+        <trans><![CDATA[ You cannot leave any of the three fields 'server name', 'user name' or 'user passord' empty. ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_VALIDATE_ACCOUNT</base>
@@ -301,7 +301,7 @@
     </entry>
     <entry>
         <base>ERR_BADMAIL</base>
-        <trans><![CDATA[ E-postadressen du angav verkar inte vara giltig.<br> En giltig e-postadress innehåller endast bokstäver, siffror och understreck i namndelen, den kan också innehålla '-' och '.' i namnet men inte i början eller i slutet. Domändelen (till höger om @-tecknet) skall endast innehålla versaler och gemener, siffror och '-' tecknet. Domännamnet innehåller normalt mellan 1 och 4 punkter (.) . Det sista ordet (tld) kan endast innehålla bokstäver och skall ha minst 2 tecken, men inte mer än 7.<br> Du kan ange mer en extern e-postlåda. Om så är fallet, separera varje e-postadress med ett kolon ':' ]]></trans>
+        <trans><![CDATA[ The E-Mail address you gave doesn't seems to be valid.<br> A valid E-Mail contains only letters, digits and undescores in the name part. There can also be '-' and '.' in the name, but not at begining or end. The domain part (to the right of the @ sign) should only contain upper- and lowercase letters, numbers and the '-' character. The domain name normally contains between 1 and 4 dot (.) characters. The last word (the tld) can only contains letters and it should have a least 2 characters, but not more than 7.<br> You can set more than one external mailbox. In this case, just separate each e-mail address with a colon ':' ]]></trans>
     </entry>
     <entry>
         <base>STATUS_1</base>
@@ -329,6 +329,6 @@
        </entry>
     <entry>
         <base>SHOW_SCHEDULE_INFOS</base>
-        <trans><![CDATA[ <center><h4>Schemalagd information</h4></center> E-posthämtning genomförs med jämna intervall. Schemaläggningens regler är samma som reglerna som anges i E-postpanelen.<br> Om du önskar ändra schemat, ändra dem i e-postpanelen.<br> <b>OBS!</b> : om du inte använder ETRN eller Multi-Drop, så kan du inte ändra schemat !<br> För att gå runt denna begränsning, gör följande :<br> - Välj ETRN och välj ditt nya schema och därefter 'Spara'.<br> - Därefter välj 'Standard (SMTP)' och 'Spara' igen. ]]></trans>
+        <trans><![CDATA[ <center><h4>Scheduling information</h4></center> E-mail retrieval is done at regular intervals. The scheduling rules are the same as the rules set in the 'E-Mails' panel.<br> If you want to change the schedule, simply change them in the E-Mail panel.<br> <b>NOTE!</b> : If you don't use ETRN or Multi-Drop, you cannot change the schedule !<br> To work around this limitation, do the following :<br> - Select ETRN and select your new schedule then 'Save'.<br> - Then select 'Standard (SMTP)' and 'Save' again. ]]></trans>
     </entry>
 </lexicon>
--- smeserver-fetchmail-1.4/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/fetchmail   2012-06-03 14:27:58.000000000 -0600
+++ smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/fetchmail    2013-07-14 00:32:33.881381873 -0600
@@ -5,7 +5,7 @@
     </entry>
     <entry>
         <base>FIRST_PAGE_DESCRIPTION</base>
-           <trans><![CDATA[ <p> 这个面板用于设置外部邮箱。这意味着什么呢？<br> 用户通常都拥有自己的外部邮箱。通常情况下，用户不得不在工作站上分别配置邮件客户端来收取内部邮件和外部邮件。使用这个控制面板，SME server 可以设置为从外部邮箱收取邮件，然后自动转发到内部邮箱。这样就使得配置邮件客户端更加容易。<br> Using this method of mail retrieval (and provided that the individual workstations are using IMAP) means that emails are backed up as part of the normal backup process.<br> 面板的其它功能还有：<br> - 邮件可以从一个邮箱转发到多个邮箱。<br> - 可以创建Ghost账户 : 该账户收到的邮件实际上会发往其它邮箱。<br> - 记录邮箱的日志。<br> ]]></trans>
+           <trans><![CDATA[ <p> This panel allows configuration of external mailbox retrieval by your SME Server. What does this mean?<br> Some of your users may have external mailbox(es). Usually, the email clients on individual workstations have to be configured to fetch mail from these external mailboxes as well as from the normal mailboxes provided by the SME server. Using this control panel, the SME server can be configured to fetch mail from external mailboxes and then automatically forward these mails to internal mail boxes. This makes configuration of the email clients on individual workstations very easy.<br> Using this method of mail retrieval (and provided that the individual workstations are using IMAP) means that emails are backed up as part of the normal backup process.<br> Other functions available through this panel are:<br> - A mailbox can be distributed to many mailboxes<br> - You can create 'Ghost account' : Mails sent to this account are distributed to other(s) mailbox(es) only.<br> - logging of events for a mailboxes.<br> ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_SERVICE_0</base>
@@ -89,7 +89,7 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_USERS</base>
-        <trans><![CDATA[ 下面的表格用 fetchmail 的用户配置概括了系统当前用户的情况。<br> 您可以在这里创建、修改和删除用户的 fetchmail 规则。 ]]></trans>
+        <trans><![CDATA[ Below is a table summarizing the current users defined on this system with a summary of the fetchmail configuration for each user.<br> Here you can create, modify, and remove fetchmail rules for any user. ]]></trans>
     </entry>
     <entry>
         <base>NO_USER_ACCOUNTS</base>
@@ -101,11 +101,11 @@
     </entry>
     <entry>
         <base>SET_GENERAL_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> 选择 fetchmail 账户的大致信息。<br> 接下来将要设置指定的收件邮箱。 </p> ]]></trans>
+        <trans><![CDATA[ <p> Select the general information for the fetchmail accounts.<br> The specific mailboxes to retrieve will be set on the next screens. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERROR_NO_FINAL_RECIPIENT</base>
-        <trans><![CDATA[ 糟糕！这条规则没有设置收件人。<br> 邮件会被投递到本地用户。如果您没有选择'Ghost 模式'，就会选择这个模式。<br> 邮件可以被投递到本地其它账户。This mode is selected by checking one or more cases in the chart below.<br> 邮件可被投递到外部邮箱。这个模式适合于勾选了 'Email address to forward mail' 选项的情况下。<br> 您必须至少选择一种收件人。 ]]></trans>
+        <trans><![CDATA[ Oups ! There is no final recipient for this rule.<br> Mails can be delivered to the local account. This mode is selected if you choose 'NO' for the 'Ghost Mode'.<br> Mails can be delivered to other local accounts. This mode is selected by checking one or more cases in the chart below.<br> Mails can be delivered to an external Mailbox. This mode is selected if an E-Mail is set in the 'Email address to forward mail' field.<br> You must set at least one kind of recipient. ]]></trans>
     </entry>
     <entry>
         <base>LABEL_USER_ACCOUNT</base>
@@ -169,7 +169,7 @@
     </entry>
     <entry>
         <base>SET_ACCOUNTS_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> 您可以在此处设置进入外部邮箱的信息：邮箱所在的服务器，邮件服务器的类型，帐户名，账户密码。 </p> ]]></trans>
+        <trans><![CDATA[ <p> Here you can set the information needed to access your external mailboxes : Name of the server storing the mailbox, type of mailbox server, account name, account password. </p> ]]></trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_SERVER</base>
@@ -205,19 +205,19 @@
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_ACCOUNTS</base>
-        <trans><![CDATA[ <p> 这是用户已设置的外部邮箱列表。 </p> ]]></trans>
+        <trans><![CDATA[ <p> This is the list of external mailboxes already configured for this user. </p> ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADSERVER</base>
-        <trans><![CDATA[ 这看起来不是一个有效的服务器名或IP地址。<br> 这个地方必须包含有效的服务器名或IP地址。<br> 有效的服务器名通常包含2-5个由点号‘.’分隔的部分组成。<br> 除了结尾部分，其余部分的字符可以是字母、数字和分隔符 '-'，长度不受限。<br> 结尾部分 (也称为tld)，只可以使用字母，长度必须包含2至7个字符。<br> 有效的IP地址由0-255之间的正整数组成，并且由点号‘.’分隔。]]></trans>
+        <trans><![CDATA[ This doesn't seems to be a valid server namei or IP address.<br> To be valid, this field must contain either a valid server name or a valid IP address.<br> A valid server name contains between two and 5 parts separated by dots '.'<br> For all parts but the last, characters allowed are letters, numbers and '-'. The parts can be of any size.<br> For the last part (also named tld), only letters are allowed, and the part must contain between two and seven characters.<br> A valid IP address is made with four decimal integers, each between 0 and 255. The four numbers are put together, separated by one dot. ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADCHARS</base>
-        <trans><![CDATA[糟糕！恐怕您输入了不被允许的特殊字符。在这些地方，您可以使用任意字符，除了管道符'|' 和另两个极特殊的字符0x1E和0x1F。]]></trans>
+        <trans><![CDATA[ Oops ! I'm affraid you just entered one of the special characters we cannot allow. In theses fields, you can use any characters EXCEPT pipe '|' and the two very special characters, 0x1E and 0x1F. ]]></trans>
     </entry>
     <entry>
         <base>ERR_FIELD_EMPTY</base>
-        <trans><![CDATA[ 您可以在这三个地方任意留空 '服务器名', '用户名' 或 '用户密码' 。]]></trans>
+        <trans><![CDATA[ You cannot leave any of the three fields 'server name', 'user name' or 'user passord' empty. ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_VALIDATE_ACCOUNT</base>
@@ -245,7 +245,7 @@
     </entry>
     <entry>
         <base>BLANK</base>
-        <trans><![CDATA[ ]]></trans>
+        <trans><![CDATA[&nbsp;]]></trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_CHANGED_CONF</base>
@@ -301,7 +301,7 @@
     </entry>
     <entry>
         <base>ERR_BADMAIL</base>
-        <trans><![CDATA[ 邮件地址无效。<br> 一个有效的邮件地址，在名称部分，通常只包含字母、数字、下划线。也可以包含分隔符 '-' 和点号 '.' ，但不能以它们开头或结尾。在域名部分（@右边的部分），通常只包含大小写字母、数字和分割符'-' 。域名通常包含1-4个点号。最后一个单词只能包含2-7个字母。<br> 您可以设置多个外部邮箱，邮件地址之间用分号':'隔开。 ]]></trans>
+        <trans><![CDATA[ The E-Mail address you gave doesn't seems to be valid.<br> A valid E-Mail contains only letters, digits and undescores in the name part. There can also be '-' and '.' in the name, but not at begining or end. The domain part (to the right of the @ sign) should only contain upper- and lowercase letters, numbers and the '-' character. The domain name normally contains between 1 and 4 dot (.) characters. The last word (the tld) can only contains letters and it should have a least 2 characters, but not more than 7.<br> You can set more than one external mailbox. In this case, just separate each e-mail address with a colon ':' ]]></trans>
     </entry>
     <entry>
         <base>STATUS_1</base>
@@ -329,6 +329,6 @@
        </entry>
     <entry>
         <base>SHOW_SCHEDULE_INFOS</base>
-        <trans><![CDATA[ <center><h4>计划任务</h4></center> 在指定的间隔时间里收取邮件。计划任务的规则与“电子邮件”面板上的相同。<br> 如果想修改计划任务，只需在“电子邮件“面板修改即可。<br> <b>注意！</b> : 如果没有使用ETRN 或多播，则不能修改计划任务！<br> 详见下面的做法：<br> - 选择 ETRN 并选择新计划，然后保存。<br> - 然后选择“标准（SMTP）”并再次保存。 ]]></trans>
+        <trans><![CDATA[ <center><h4>Scheduling information</h4></center> E-mail retrieval is done at regular intervals. The scheduling rules are the same as the rules set in the 'E-Mails' panel.<br> If you want to change the schedule, simply change them in the E-Mail panel.<br> <b>NOTE!</b> : If you don't use ETRN or Multi-Drop, you cannot change the schedule !<br> To work around this limitation, do the following :<br> - Select ETRN and select your new schedule then 'Save'.<br> - Then select 'Standard (SMTP)' and 'Save' again. ]]></trans>
     </entry>
 </lexicon>
--- smeserver-fetchmail-1.4/root/etc/e-smith/locale/zh-tw/etc/e-smith/web/functions/fetchmail   2012-06-03 14:27:58.000000000 -0600
+++ smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/zh-tw/etc/e-smith/web/functions/fetchmail    2013-07-14 00:32:34.149378221 -0600
@@ -1,191 +1,191 @@
 <lexicon lang="zh-tw">
     <entry>
         <base>FORM_TITLE</base>
-        <trans>Configure External Mailbox Retrieval</trans>
+        <trans>設定外埠郵箱檢索</trans>
     </entry>
     <entry>
         <base>FIRST_PAGE_DESCRIPTION</base>
-           <trans><![CDATA[ <p> This panel allows configuration of external mailbox retrieval by your SME Server. What does this mean?<br> Some of your users may have external mailbox(es). Usually, the email clients on individual workstations have to be configured to fetch mail from these external mailboxes as well as from the normal mailboxes provided by the SME server. Using this control panel, the SME server can be configured to fetch mail from external mailboxes and then automatically forward these mails to internal mail boxes. This makes configuration of the email clients on individual workstations very easy.<br> Using this method of mail retrieval (and provided that the individual workstations are using IMAP) means that emails are backed up as part of the normal backup process.<br> Other functions available through this panel are:<br> - A mailbox can be distributed to many mailboxes<br> - You can create 'Ghost account' : Mails sent to this account are distributed to other(s) mailbox(es) only.<br> - logging of events for a mailboxes.<br> ]]></trans>
+           <trans><![CDATA[ <p>此控制台允許您透過SME伺服器設定外埠郵箱收件。什麼意思呢？<br> 您的有些使用者可能擁有外埠郵箱。通常，這些在個別工作站上的郵件端點必須設定成從外埠郵箱取得郵件，就像從SME伺服器所提供的一般郵箱一樣。使用此控制台，SME伺服器可被設定成從外埠郵箱取得郵件，然後自動轉送這些郵件到內部郵箱。這使得在個別工作站上的郵件端點之設定變得非常簡單。<br>使用此郵件接收的方式（只要個別工作站亦正使用IMAP）表示郵件被視為一般備份程序的一部份<br>透過此控制台可獲得的其他功能為：<br> - 單一郵箱可被配置成很多郵箱<br> - 您可建立虛無帳號'Ghost account'：郵件傳送到此帳號僅可分配到其他郵箱。<br> - 為郵箱記錄事件。<br> ]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_SERVICE_0</base>
-        <trans>Enable Fetchmail</trans>
+        <trans>啟用 Fetchmail</trans>
     </entry>
     <entry>
         <base>SERVICE_0</base>
-        <trans>Fetchmail is Disabled</trans>
+        <trans>Fetchmail 被禁用</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_SERVICE_1</base>
-        <trans>Disable Fetchmail</trans>
+        <trans>禁用Fetchmail</trans>
     </entry>
     <entry>
         <base>SERVICE_1</base>
-        <trans>Fetchmail is Enabled</trans>
+        <trans>允許Fetchmail</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_ROUTING_0</base>
-        <trans>Enable External POP and IMAP server access</trans>
+        <trans>允許外埠POP與IMAP伺服器存取</trans>
     </entry>
     <entry>
         <base>ROUTING_0</base>
-        <trans>Workstations on the internal LAN cannot access external POP and IMAP servers</trans>
+        <trans>內部區網工作站無法存取外埠POP與IMAP伺服器</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_ROUTING_1</base>
-        <trans>Disable External POP and IMAP server access</trans>
+        <trans>禁止外埠POP與IMAP伺服器存取</trans>
     </entry>
     <entry>
         <base>ROUTING_1</base>
-        <trans>Workstations on the internal LAN can access external POP and IMAP servers</trans>
+        <trans>內部區網工作站得以直接存取外埠POP與IMAP伺服器</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_ROUTINGSMTP_0</base>
-        <trans>Enable External SMTP server access</trans>
+        <trans>允許外埠SMTP伺服器存取</trans>
     </entry>
     <entry>
         <base>ROUTINGSMTP_0</base>
-        <trans>Workstations on the internal LAN cannot access external SMTP servers</trans>
+        <trans>內部區網工作站無法存取外埠SMTP伺服器</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_ROUTINGSMTP_1</base>
-        <trans>Disable External SMTP server access</trans>
+        <trans>禁止外埠SMTP伺服器存取</trans>
     </entry>
     <entry>
         <base>ROUTINGSMTP_1</base>
-        <trans>Workstations on the internal LAN can access external SMTP servers</trans>
+        <trans>內部區網工作站得以直接存取外埠SMTP伺服器</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_ROUTINGSMTPPROXY_0</base>
-        <trans>Force SMTP connections through the SME Proxy</trans>
+        <trans>強制SMTP連線透過SME Proxy代理伺服器</trans>
     </entry>
     <entry>
         <base>ROUTINGSMTPPROXY_0</base>
-        <trans>Workstations on the internal LAN have direct access to external SMTP servers</trans>
+        <trans>內部區網工作站已經直接存取外埠SMTP伺服器</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_ROUTINGSMTPPROXY_1</base>
-        <trans>Allow direct SMTP connections</trans>
+        <trans>允許直接SMTP連線</trans>
     </entry>
     <entry>
         <base>ROUTINGSMTPPROXY_1</base>
-        <trans>SMTP connections from LAN to Internet are proxyed by the SME server</trans>
+        <trans>由區網到網際網路的SMTP連線由SME server進行代理連線。</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_ROUTINGNNTP_0</base>
-        <trans>Enable external news server access</trans>
+        <trans>允許外埠news伺服器存取</trans>
     </entry>
     <entry>
         <base>ROUTINGNNTP_0</base>
-        <trans>Workstations on the internal LAN cannot access external News servers</trans>
+        <trans>內部區網工作站無法存取外埠news伺服器</trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_ROUTINGNNTP_1</base>
-        <trans>Disable external news server access</trans>
+        <trans>禁止外部新聞服務器存取</trans>
     </entry>
     <entry>
         <base>ROUTINGNNTP_1</base>
-        <trans>Workstations on the internal LAN can access external News servers</trans>
+        <trans>區網內部工作站可以存取新聞服務器</trans>
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_USERS</base>
-        <trans><![CDATA[ Below is a table summarizing the current users defined on this system with a summary of the fetchmail configuration for each user.<br> Here you can create, modify, and remove fetchmail rules for any user. ]]></trans>
+        <trans><![CDATA[下表是系統當下定義的使用者摘要 ，亦摘要每位使用者fetchmail的設定值。<br>此處您可以位每位使用者建立，修正，與移除fetchmail的規則。]]></trans>
     </entry>
     <entry>
         <base>NO_USER_ACCOUNTS</base>
-        <trans>There are currently no users defined on this system.</trans>
+        <trans>此系統當下並未定義使用者。</trans>
     </entry>
     <entry>
         <base>SET_GENERAL_TITLE</base>
-        <trans>Set general mail retrieval rules</trans>
+        <trans>設定通用郵件恢復規則</trans>
     </entry>
     <entry>
         <base>SET_GENERAL_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Select the general information for the fetchmail accounts.<br> The specific mailboxes to retrieve will be set on the next screens. </p> ]]></trans>
+        <trans><![CDATA[ <p>為fetchmail帳號選擇通用資訊<br>恢復用的指定mailboxes將於下個畫面設定。</p> ]]></trans>
     </entry>
     <entry>
         <base>ERROR_NO_FINAL_RECIPIENT</base>
-        <trans><![CDATA[ Oups ! There is no final recipient for this rule.<br> Mails can be delivered to the local account. This mode is selected if you choose 'NO' for the 'Ghost Mode'.<br> Mails can be delivered to other local accounts. This mode is selected by checking one or more cases in the chart below.<br> Mails can be delivered to an external Mailbox. This mode is selected if an E-Mail is set in the 'Email address to forward mail' field.<br> You must set at least one kind of recipient. ]]></trans>
+        <trans><![CDATA[慘了！此規則沒有最終收件者。<br>郵件可被傳送到本地端帳戶。倘若您對'Ghost Mode'選擇'NO'，此模式就被選定。<br>郵件可被傳送到其他本地端帳戶。此模式可透過檢視下方其一或更多圖表中案例而選定。<br>郵件可被傳送到外埠郵箱。倘若E-Mail被設定於'Email address to forward mail'欄位中，此模式就被選定。<br>您必須至少選擇一種收件者。]]></trans>
     </entry>
     <entry>
         <base>LABEL_USER_ACCOUNT</base>
-        <trans>User Account</trans>
+        <trans>使用者帳號</trans>
     </entry>
     <entry>
         <base>LABEL_COPY_TO</base>
-        <trans>Mail copy to</trans>
+        <trans>郵件複製到</trans>
     </entry>
     <entry>
         <base>LABEL_GHOST</base>
-        <trans>Is it a 'ghost' account (only used to redistribute mails) ?</trans>
+        <trans>它是一個虛假（ghost）帳號嗎（僅用於重置郵件）？</trans>
     </entry>
     <entry>
         <base>LABEL_DEBUG</base>
-        <trans>Do you want to debug this account (fetchmail actions are logged in /var/log/maillog) ?</trans>
+        <trans>您欲除錯此帳號嗎（fetchmail 的行為被記錄在 /var/log/maillog）？</trans>
     </entry>
     <entry>
         <base>LABEL_SPY</base>
-        <trans>Do you want this account be monitored by the 'admin' account ?</trans>
+        <trans>您欲讓管理者監控此帳號嗎？</trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_RETRIEVE</base>
-        <trans>What do you want to do with E-Mails on external servers ?</trans>
+        <trans>您欲如何處理外部郵件？</trans>
     </entry>
     <entry>
         <base>KEEP_NO</base>
-        <trans>Retrieve all mails</trans>
+        <trans>檢索所有郵件</trans>
     </entry>
     <entry>
         <base>KEEP_YES</base>
-        <trans>Read mails and leave them on the servers</trans>
+        <trans>讀取郵件並將其留置於伺服器上</trans>
     </entry>
     <entry>
         <base>KEEP_NEW</base>
-        <trans>Retrieve new mails only</trans>
+        <trans>只檢索新郵件</trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_FORWARD</base>
-        <trans>Do you want to forward theses mails ?</trans>
+        <trans>是否轉送這些郵件？</trans>
     </entry>
     <entry>
         <base>FORWARD_GET</base>
-        <trans>Retrieve only for this account</trans>
+        <trans>只檢索此帳號</trans>
     </entry>
     <entry>
         <base>FORWARD_COPY</base>
-        <trans>Retrieve for this account and forward to another mailbox</trans>
+        <trans>檢索此帳號並轉送到另一郵箱</trans>
     </entry>
     <entry>
         <base>FORWARD_FORWARD</base>
-        <trans>Forward all mails to another mailbox only</trans>
+        <trans>轉送所有郵件到另一郵箱</trans>
     </entry>
     <entry>
         <base>LABEL_FORWARD_MAIL</base>
-        <trans>Email address(es) to forward mails to ( format : xxx@yyy.zz ) To set more than one external address, just separate them with a colon ':'</trans>
+        <trans>郵件轉送地址（格式: xxx@yyy.zz）。要設置多個地址，請用冒號「：」分隔。</trans>
     </entry>
     <entry>
         <base>SET_ACCOUNTS_TITLE</base>
-        <trans>Set external mail access informations</trans>
+        <trans>設置外部郵件存取資訊</trans>
     </entry>
     <entry>
         <base>SET_ACCOUNTS_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> Here you can set the information needed to access your external mailboxes : Name of the server storing the mailbox, type of mailbox server, account name, account password. </p> ]]></trans>
+        <trans><![CDATA[ <p>此處您可設定所需的資訊來存取您的外埠郵箱：儲存郵箱的伺服器名稱，郵件伺服器類型，帳號名稱，帳號密碼。</p> ]]></trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_SERVER</base>
-        <trans>Name or IP Address of the external mail server</trans>
+        <trans>外部郵件伺服器的名稱或IP位址</trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_TYPE</base>
-        <trans>Protocol to use when reading mails</trans>
+        <trans>讀取郵件時所使用的協定</trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_ACCOUNT</base>
-        <trans>The user account name on the mail server</trans>
+        <trans>郵件伺服器上的使用者帳號</trans>
     </entry>
     <entry>
         <base>LABEL_MAIL_PASSWORD</base>
-        <trans>The user account password on the mail server</trans>
+        <trans>郵件伺服器上的使用者密碼</trans>
     </entry>
     <entry>
         <base>POP3</base>
@@ -197,91 +197,91 @@
     </entry>
     <entry>
         <base>SPOP3</base>
-        <trans>SSL Pop (Experimental)</trans>
+        <trans>加密 Pop（實驗性）</trans>
     </entry>
     <entry>
         <base>SIMAP</base>
-        <trans>SSL Imap (Experimental)</trans>
+        <trans>加密 Pop Imap （實驗性）</trans>
     </entry>
     <entry>
         <base>SHOW_FETCHMAIL_ACCOUNTS</base>
-        <trans><![CDATA[ <p> This is the list of external mailboxes already configured for this user. </p> ]]></trans>
+        <trans><![CDATA[ <p> 這是使用者已設置的外部郵箱列表。 </p> ]]></trans>
     </entry>
     <entry>
         <base>ERR_BADSERVER</base>
-        <trans><![CDATA[ This doesn't seems to be a valid server namei or IP address.<br> To be valid, this field must contain either a valid server name or a valid IP address.<br> A valid server name contains between two and 5 parts separated by dots '.'<br> For all parts but the last, characters allowed are letters, numbers and '-'. The parts can be of any size.<br> For the last part (also named tld), only letters are allowed, and the part must contain between two and seven characters.<br> A valid IP address is made with four decimal integers, each between 0 and 255. The four numbers are put together, separated by one dot. ]]></trans>
+        <trans><![CDATA[這似乎並非是有效伺服器名稱或IP位址。<br>此區塊必須包含有效伺服器名稱或有效IP位址。<br> 一個有效的伺服器名稱涵蓋介於由2-5個逗點'.'所區分的部份。<br>除了最後以外的其他部份，字元可以是字母、數字與'-'。各部位可任意長度。<br>最後部份（也稱為tld），僅允許字母，而且此部位必須僅涵蓋2-7字元。<br>一個有效IP位址由四個十進位的整數所組成，每個整數介於0-255。四個數字被放置於一起但由逗點隔開。]]></trans>
     </entry>
     <entry>
         <base>ERR_BADCHARS</base>
-        <trans><![CDATA[ Oops ! I'm affraid you just entered one of the special characters we cannot allow. In theses fields, you can use any characters EXCEPT pipe '|' and the two very special characters, 0x1E and 0x1F. ]]></trans>
+        <trans><![CDATA[慘了！恐怕您剛輸入了我們不允許的特定字元。在這些區塊中，除了導向符號'|'與0x1E和0x1F這兩個特定字元，您可以使用任何字元。]]></trans>
     </entry>
     <entry>
         <base>ERR_FIELD_EMPTY</base>
-        <trans><![CDATA[ You cannot leave any of the three fields 'server name', 'user name' or 'user passord' empty. ]]></trans>
+        <trans><![CDATA[ 您不可留白此三區塊'伺服器名稱'、'使用者名稱'或'使用者密碼' 。]]></trans>
     </entry>
     <entry>
         <base>BUTTON_LABEL_VALIDATE_ACCOUNT</base>
-        <trans>Validate Account</trans>
+        <trans>驗證賬號</trans>
     </entry>
     <entry>
         <base>MAIL_SERVER</base>
-        <trans>Mail Server</trans>
+        <trans>郵件伺服器</trans>
     </entry>
     <entry>
         <base>MAIL_TYPE</base>
-        <trans>Mail Access Type</trans>
+        <trans>郵件存取類型</trans>
     </entry>
     <entry>
         <base>MAIL_ACCOUNT</base>
-        <trans>Server Mailbox Account</trans>
+        <trans>伺服器郵箱賬號</trans>
     </entry>
     <entry>
         <base>MAIL_PASSWORD</base>
-        <trans>Server Mailbox Password</trans>
+        <trans>伺服器郵箱密碼</trans>
     </entry>
     <entry>
         <base>fetchmail</base>
-        <trans>Mail retrieval</trans>
+        <trans>郵件檢索</trans>
     </entry>
     <entry>
         <base>BLANK</base>
-        <trans><![CDATA[&nbsp;]]></trans>
+        <trans><![CDATA[ ]]></trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_CHANGED_CONF</base>
-        <trans>Your changes to the Fetchmail configuration have been saved successfully.</trans>
+        <trans>Fetchmail 設定已成功儲存。</trans>
     </entry>
     <entry>
         <base>ERROR_WHILE_CHANGING_CONF</base>
-        <trans>Unable to apply the Fetchmail configuration changes.</trans>
+        <trans>無法使用Fetchmail修正後的設定</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_MODIFIED_ROUTING</base>
-        <trans>Your change to the access of external POP3 and IMAP4 servers from the internal network has been saved successfully.</trans>
+        <trans>對於您從內部網路存取外部POP3與IMAP4伺服器的變更已經成功的儲存。</trans>
     </entry>
     <entry>
         <base>ERROR_WHILE_MODIFYING_ROUTING</base>
-        <trans>Unable to apply the changes to the configuration of IMAP and POP3 access.</trans>
+        <trans>無法使用關於存取POP3與IMAP4設定的變更。</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_MODIFIED_ROUTINGSMTP</base>
-        <trans>Your change to the access of external SMTP servers from the internal network has been saved successfully.</trans>
+        <trans>對於您從內部網路存取外部SMTP伺服器的變更已經成功的儲存。</trans>
     </entry>
     <entry>
         <base>ERROR_WHILE_MODIFYING_ROUTINGSMTP</base>
-        <trans>Unable to apply the changes to the configuration of SMTP access.</trans>
+        <trans>無法使用關於存取SMTP設定的變更。</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_MODIFIED_ROUTINGNNTP</base>
-        <trans>Your changes to the access to external News servers from the internal network has been saved successfully.</trans>
+        <trans>對於您從內部網路存取外部News伺服器的變更已經成功的儲存。</trans>
     </entry>
     <entry>
         <base>ERROR_WHILE_MODIFYING_ROUTINGNNTP</base>
-        <trans>Unable to apply the changes to the configuration of NNTP access.</trans>
+        <trans>無法使用關於存取NNTP設定的變更。</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_MODIFIED_SMTPPROXY</base>
-        <trans>Your changes to the SME SMTP Proxy configuration has been saved successfully.</trans>
+        <trans>對於您的SME SMTP Proxy代理伺服器之變更已經成功的儲存。</trans>
     </entry>
     <entry>
         <base>PREVIOUS</base>
@@ -289,46 +289,46 @@
     </entry>
     <entry>
         <base>VALIDATE</base>
-        <trans>Validate Changes !</trans>
+        <trans>有效變更！</trans>
     </entry>
     <entry>
         <base>ERR_NO_FETCHMAIL_RECORD</base>
-        <trans>Cannot retrieve fetchmail record from the configuration database.</trans>
+        <trans>從設定資料庫中無法檢索fetchmail紀錄。</trans>
     </entry>
     <entry>
         <base>ERR_NO_SMTPFRONT-QMAIL_RECORD</base>
-        <trans>Cannot retrieve smtpfront-qmail record from the configuration database.</trans>
+        <trans>從設定資料庫中無法檢索smtpfront-qmail紀錄。</trans>
     </entry>
     <entry>
         <base>ERR_BADMAIL</base>
-        <trans><![CDATA[ The E-Mail address you gave doesn't seems to be valid.<br> A valid E-Mail contains only letters, digits and undescores in the name part. There can also be '-' and '.' in the name, but not at begining or end. The domain part (to the right of the @ sign) should only contain upper- and lowercase letters, numbers and the '-' character. The domain name normally contains between 1 and 4 dot (.) characters. The last word (the tld) can only contains letters and it should have a least 2 characters, but not more than 7.<br> You can set more than one external mailbox. In this case, just separate each e-mail address with a colon ':' ]]></trans>
+        <trans><![CDATA[您似乎給了無效的電郵位址。<br>有效的電郵在名稱部份僅包含字母、數字與底線。名稱中可以是'-'與'.'，但是不可在開頭或結尾。在網域部份（符號@的右側）應當僅包含大小寫字母、數字與'-'字元。網域名稱通常涵蓋1-4個逗點（.）的字元。最後一個字（the tld）僅能包含字元，並且應當至少擁有2個字元，但不應超過7個。<br>您可以設定多個外埠郵箱。在這個例子中，只要用冒號':'分隔每一個電郵位址。]]></trans>
     </entry>
     <entry>
         <base>STATUS_1</base>
-        <trans>ENABLED</trans>
+        <trans>允許</trans>
     </entry>
     <entry>
         <base>STATUS_0</base>
-        <trans>DISABLED</trans>
+        <trans>禁止</trans>
     </entry>
        <entry>
            <base>NB_EXT_BOX</base>
-           <trans>External Mailbox</trans>
+           <trans>外埠郵箱</trans>
        </entry>
        <entry>
            <base>GHOST_ACCOUNT</base>
-           <trans>Ghost account</trans>
+           <trans>虛無帳號</trans>
        </entry>
        <entry>
            <base>DEBUG_MAILBOX</base>
-           <trans>Mailbox in 'debug' mode</trans>
+           <trans>郵箱正在除錯模式</trans>
        </entry>
        <entry>
            <base>SPIED_MAILBOX</base>
-           <trans>Mailbox under supervision</trans>
+           <trans>郵箱正在監控中</trans>
        </entry>
     <entry>
         <base>SHOW_SCHEDULE_INFOS</base>
-        <trans><![CDATA[ <center><h4>Scheduling information</h4></center> E-mail retrieval is done at regular intervals. The scheduling rules are the same as the rules set in the 'E-Mails' panel.<br> If you want to change the schedule, simply change them in the E-Mail panel.<br> <b>NOTE!</b> : If you don't use ETRN or Multi-Drop, you cannot change the schedule !<br> To work around this limitation, do the following :<br> - Select ETRN and select your new schedule then 'Save'.<br> - Then select 'Standard (SMTP)' and 'Save' again. ]]></trans>
+        <trans><![CDATA[ <center><h4>行事曆訊息</h4></center>郵件接收在規律的時間執行。行事曆規則如同'E-Mails'控制台設定的規則一樣。<br>倘若您欲變更行事曆，只需在電郵控制台變更。<br> <b>注意！</b>：倘若您不使用ETRN或Multi-Drop，您無法變更行事曆！<br>要解決此限制，請依下列執行：<br> - 選擇ETRN並選擇您的新行事曆然後'Save'。<br> - 然後選擇'Standard (SMTP)'與再次'Save'。]]></trans>
     </entry>
 </lexicon>