smeserver-locale/sme8/smeserver-locale-2.2.0-locale-2010-04-29.patch

--- smeserver-locale-2.2.0/root/etc/e-smith/locale/bg/etc/e-smith/web/functions/proxy   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/bg/etc/e-smith/web/functions/proxy    2010-04-29 07:58:46.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>Новите настройки на прокси бяха приложени успешно.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Blocked</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/da/etc/e-smith/web/functions/backup  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/da/etc/e-smith/web/functions/backup   2010-04-29 07:54:38.000000000 -0600
@@ -9,7 +9,7 @@
   </entry>
   <entry>
    <base>BACKUP_DESC_DAR</base>
-   <trans><![CDATA[ <P>Serveren tilbyder tre forskellige muligheder for sikkerhedskopi og gendannelse: Sikkerhedskopi til arbejdsstation, sikkerhedskopi til bånd og sikkerhedskopi til lokalnet.</P> <P>Den første mulighed opretter en kopi af serveropsætning og brugerdata og henter dem til din arbejdsstation via din web-browser. Denne fil kan bruges til gendannelse af serveren fra konsollen, hvis du kopierer filen til en USB-disk. Aktuelt fylder opsætning og data i alt ca. <b>$tarsize</b>. Sikkerhedskopien vil være lidt mindre afhængig af hvor meget data kan komprimeres. Muligheden \"Undersøg sikkerhedskopi til arbejdsstation\" kan bruges til at kontrollere hvorvidt sikkerhedskopien er fuldstændig.</P> <P>Sikkerhedskopi til bånd bruger en programpakke ved navn <I>$module</I> til at sikkerhedskopiere hele din disk til bånd hver nat. Det forudsætter en understøttet båndstation og et bånd der ikke er skrivebeskyttet. Sikkerhedskopien udføres automatisk på et fastlagt tidspunkt hver nat (og der sendes automatisk en påmindelse til administrator i løbet af dagen). Aktuelt indeholder din disk <b>$dumpsize</b> af data.</P> <P>Sikkerhedskopi til lokalnet bruger en programpakke ved navn <I>dar</I> til at sikkerhedskopiere serveropsætning og data til lokalnet (eller en lokal USB disk). Dette forudsætter at du opretter et skrivbart delt drev (smbfs, cifs, eller nfs) på lokalnettet eller en lokal USB disk. Du kan indstille antallet af roterende sikkerhedskopier du ønsker at bevare på det delte drev, og du kan også indstille hvert sæt til dagligt at tilføje ændrede og tilføjede data. Sikkerhedskopien udføres dagligt på det fastsatte tidspunkt. Aktuelt fylder serveropsætning og data <b>$tarsize</b> ukomprimeret. Der skal være plads til det dobbelte af den komprimerede datamængde på det delte drev.</P> <P>Alle former for sikkerhedskopi vil kunne gendanne serveropsætning og data på serveren. Yderligere vil der kunne gendannes individuelle filer fra en sikkerhedskopi til lokalnet. <b>En fuld gendannelse bør udføres på en nyinstalleret server.</b>.</P> ]]></trans>
+   <trans><![CDATA[ <P>Serveren tilbyder tre forskellige muligheder for sikkerhedskopi og gendannelse: Sikkerhedskopi til arbejdsstation, sikkerhedskopi til bånd og sikkerhedskopi til lokalnet.</P> <P>Den første mulighed opretter en kopi af serveropsætning og brugerdata og henter dem til din arbejdsstation via din web-browser.  Aktuelt fylder opsætning og data i alt ca. <b>$tarsize</b>. Sikkerhedskopien vil være lidt mindre afhængig af hvor meget data kan komprimeres. Muligheden \"Undersøg sikkerhedskopi til arbejdsstation\" kan bruges til at kontrollere hvorvidt sikkerhedskopien er fuldstændig.</P> <P>Sikkerhedskopi til bånd bruger en programpakke ved navn <I>$module</I> til at sikkerhedskopiere hele din disk til bånd hver nat. Det forudsætter en understøttet båndstation og et bånd der ikke er skrivebeskyttet. Sikkerhedskopien udføres automatisk på det fastlagte tidspunkt hver nat (og der sendes automatisk en påmindelse til administrator i løbet af dagen). Aktuelt indeholder din disk <b>$dumpsize</b> af data.</P> <P>Sikkerhedskopi til lokalnet bruger en programpakke ved navn <I>dar</I> til at sikkerhedskopiere serveropsætning og data til lokalnet (eller en lokal USB disk). Dette forudsætter at du opretter et skrivbart delt drev (cifs, eller nfs) på lokalnettet eller en lokal USB disk. Du kan indstille antallet af roterende sikkerhedskopier du ønsker at bevare på det delte drev, og du kan også indstille hvert sæt til dagligt at tilføje ændrede og tilføjede data. Sikkerhedskopien udføres dagligt på det fastsatte tidspunkt. Aktuelt fylder serveropsætning og data <b>$tarsize</b> ukomprimeret. Der skal være plads til det dobbelte af den komprimerede datamængde på det delte drev.</P> <P>Alle former for sikkerhedskopi vil kunne gendanne serveropsætning og data på serveren. Yderligere vil der kunne gendannes individuelle filer fra en sikkerhedskopi til lokalnet. <b>En fuld gendannelse bør udføres på en nyinstalleret server.</b>.</P> ]]></trans>
   </entry>
   <entry>
    <base>BACKUP_CONFIG_STATUS</base>
@@ -125,7 +125,7 @@
   </entry>
   <entry>
    <base>VERIFY_BACKUP_DESC</base>
-   <trans><![CDATA[ <p>Denne mulighed vil vise alle filnavne i den netop lavede sikkerhedskopi til arbejdsstation. Du kan bruge denne mulighed til at kontrollere indholdet i sikkerhedskopien.</p> <p>Den sidste fil i sikkerhedskopien skal hedde "smbpasswd".</p> ]]></trans>
+   <trans><![CDATA[ <p>Denne mulighed vil vise alle filnavne i den tidligere dannede sikkerhedskopi. Du kan bruge denne mulighed til at kontrollere indholdet i sikkerhedskopien.</p> ]]></trans>
   </entry>
   <entry>
    <base>SELECT_BACKUP_FILE</base>
@@ -149,7 +149,7 @@
   </entry>
   <entry>
    <base>RESTORE_IN_PROGRESS_DESC</base>
-   <trans>Efter at gendannelsen er udført skal du genstarte serveren. Gendannelsen er gennemført når /etc/smbpasswd er gendannet og ordene "Gendannelse gennemført" dukker op i bunden af skærmen.</trans>
+   <trans>Efter at gendannelsen er udført skal du genstarte serveren. Gendannelsen er gennemført når ordene "Gendannelse gennemført" dukker op i bunden af skærmen.</trans>
   </entry>
   <entry>
    <base>FILES_HAVE_BEEN_RESTORED</base>
@@ -590,7 +590,7 @@
   </entry>
   <entry>
    <base>WORKSTN_BACKUP_DESC</base>
-   <trans><![CDATA[ <p>Dette panel viser opsætning for den aktuelle sikkerhedskopi til lokalnet.</p><p/> ]]></trans>
+   <trans><![CDATA[ <p>Dette panel viser opsætning for den aktuelle sikkerhedskopi til lokalnet. Du kan ændre opsætningen i dette og næste panel.</p><p/> ]]></trans>
   </entry>
   <entry>
    <base>WORKSTN_BACKUP_NOT_CONFIGURED</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/da/etc/e-smith/web/functions/emailsettings   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/da/etc/e-smith/web/functions/emailsettings    2010-04-29 07:56:07.000000000 -0600
@@ -306,12 +306,12 @@
 
     <entry>
        <base>LABEL_SPAM_SUBJECT</base>
-       <trans>SPAM subject prefix</trans>
+       <trans>SPAM emne tekst</trans>
     </entry>
 
     <entry>
        <base>DESC_SPAM_SUBJECT</base>
-       <trans>You can enable to add a tag to the subject of each message that is classified as SPAM. The value for this tag can be defined below.</trans>
+       <trans>Du kan aktivere for at tilføje et en tekst forrest i emnefeltet på alle beskeder, som er klassecificeret som SPAM. Gærnseværdien for denne tilføjelse angives nedenfor</trans>
     </entry>
 
    <entry>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/da/etc/e-smith/web/functions/portforwarding  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/da/etc/e-smith/web/functions/portforwarding   2010-04-29 07:58:25.000000000 -0600
@@ -109,6 +109,6 @@
     </entry>
     <entry>
         <base>IN_SERVERONLY</base>
-        <trans>Denne server er sat op som Kun server hvorfor porte ikke kan viderestilles.</trans>
+        <trans>Denne server er sat op som kun server, hvorfor portviderestilling kun er muligt til lokalhost.</trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/da/etc/e-smith/web/functions/proxy   2008-10-07 09:28:32.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/da/etc/e-smith/web/functions/proxy    2010-04-29 07:58:46.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>De nye proxy-indstillinger er gemt.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Blokeret</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/de/etc/e-smith/web/functions/backup  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/de/etc/e-smith/web/functions/backup   2010-04-29 07:54:39.000000000 -0600
@@ -9,7 +9,7 @@
   </entry>
   <entry>
    <base>BACKUP_DESC_DAR</base>
-   <trans><![CDATA[ <p>Der Server stellt 3 Möglichkeiten für Datensicherung und Wiederherstellung bereit: Lokaler Arbeitsplatz, Bandlaufwerk und ein Arbeitsplatz im lokalen Netz bzw. lokale USB-Festplatte.</P> <P>Mit der ersten Methode erzeugen Sie eine Kopie der Serverkonfiguration und der Benutzerdateien und laden diese über den Webbrowser auf den lokalen Arbeitsplatz. Momentan verwenden ihre Serverkonfiguration und Benutzerdateien ungefähr <b>$tarsize</b> Speicher. Die Datensicherungsdatei wird etwas weniger an Speicher benötigen, abhängig vom Kompressionsgrad. Mit der Option \"Datensicherung überprüfen\" können Sie die Integrität der Datensicherungsdatei prüfen.</P> <P>Die Bandsicherungs-Methode verwendet die Software <I>$module</I>, um jede Nacht den Inhalt der Festpatte auf Band zu sichern. Dazu benötigen Sie ein unterstütztes Bandlaufwerk und ein nicht schreibgeschütztes Band. Die Sicherung wird automatisch jede Nacht zur gewählten Zeit durchgeführt (der Administrator erhält täglich eine Erinnerungsmail). Momentan befinden sich auf der Festplatte <b>$dumpsize</b> an Daten.</P> <P>Mit der Methode \"Arbeitsplatz im lokalen Netz/USB-Festplatte\" wird die Software <I>dar</I> eingesetzt, mit der die Serverkonfiguration und Benutzerdateien auf einen Arbeitsplatz im lokalen Netz bzw. eine lokale USB-Platte gesichert werden können. Dazu benötigen Sie einen freigegebenen Ordner im Netz (smbfs, cifs oder nfs) oder auf der lokalen USB-Festplatte. Sie können die Zahl der rotierenden Sicherungssets und Inkremente über verschiedene Tage festlegen. Die Sicherung wird zur gewählten Zeit jede Nacht automatisch durchgeführt. Momentan befinden sich ungefähr <b>$tarsize</b> an unkomprimierten Daten auf der Festplatte.</p> <p>Bei allen Methoden zur Wiederherstellung können Sie die gesicherten Benutzerdateien und die Serverkonfiguration zurückspielen. Zusätzlich besteht bei der Methode lokaler Arbeitsplatz die Möglichkeit, Dateien individuell wiederherzustellen. <b>Idealerweise sollte die Wiederherstellung auf einem frisch installierten Server durchgeführt werden</b>.</P> ]]></trans>
+   <trans><![CDATA[ <p>Der Server stellt drei Möglichkeiten für die Datensicherung und Wiederherstellung bereit: Lokaler Arbeitsplatz, Bandlaufwerk oder Arbeitsplatz im lokalen Netz.</P> <P>Die erste Methode erzeugt eine Kopie der Serverkonfiguration und der Daten und lädt diese über den Webbrowser auf den lokalen Arbeitsplatz. Momentan benötigen ihre Serverkonfiguration und Daten ungefähr <b>$tarsize</b> Speicher. Die Datensicherungsdatei wird etwas weniger Speicher benötigen, abhängig vom Kompressionsgrad. Mit der Option \"Datensicherung überprüfen\" können Sie die Integrität der Datensicherungsdatei prüfen.</P> <P>Die Methode zur Bandsicherung verwendet die Software <I>$module</I>, um jede Nacht den ganzen Inhalt der Festpatte auf Band zu sichern. Dazu wird ein unterstütztes Bandlaufwerk und ein nicht schreibgeschütztes Band benötigt. Die Sicherung wird jede Nacht automatisch zur gewählten Zeit durchgeführt (der Administrator erhält täglich eine Erinnerungsmail). Momentan befinden sich auf der Festplatte <b>$dumpsize</b> an Daten.</P> <P>Mit der Methode \"Arbeitsplatz im lokalen Netz/USB-Festplatte\" wird die Software <I>dar</I> eingesetzt, mit der die Serverkonfiguration und Daten auf einen Arbeitsplatz im lokalen Netz bzw. eine lokale USB-Platte gesichert werden können. Dazu benötigen Sie einen freigegebenen Ordner im Netz (cifs oder nfs) oder auf der lokalen USB-Festplatte. Sie können die Zahl der rotierenden und inkrementalen Sicherungssets über verschiedene Tage festlegen. Die Sicherung wird zur gewählten Zeit jede Nacht automatisch durchgeführt. Momentan befinden sich ungefähr <b>$tarsize</b> an unkomprimierten Daten auf der Festplatte. Auf dem Backupmedium muss das Doppelte der komprimierten Datenmenge zur Verfügung stehen.</p> <p>Bei allen Methoden zur Wiederherstellung können die gesicherten Daten und die Serverkonfiguration zurück gespielt werden. Zusätzlich besteht bei der Methode lokaler Arbeitsplatz die Möglichkeit, Dateien individuell wiederherzustellen. <b>Idealerweise sollte die Wiederherstellung auf einem frisch installierten Server durchgeführt werden</b>.</P> ]]></trans>
   </entry>
   <entry>
    <base>BACKUP_CONFIG_STATUS</base>
@@ -25,7 +25,7 @@
   </entry>
   <entry>
    <base>REMINDER_MESSAGE_AT</base>
-   <trans>Erinnerungmitteilung wird gesendet um:</trans>
+   <trans>Erinnerungsmitteilung wird gesendet um:</trans>
   </entry>
   <entry>
    <base>TAPE_BACKUPS_DISABLED</base>
@@ -125,7 +125,7 @@
   </entry>
   <entry>
    <base>VERIFY_BACKUP_DESC</base>
-   <trans><![CDATA[ <p> Diese Option zeigt Ihnen die Namen aller erzeugten lokalen Sicherungsdateien an.<br> Sie können diese Option dazu verwenden, den Inhalt Ihrer Sicherungsdateien zu überprüfen. </p> <p> Die letzte Datei in diesem Sicherungsverzeichnis sollte die Datei "smbpasswd" sein. </p> ]]></trans>
+   <trans><![CDATA[ <p>Diese Option zeigt Ihnen die Namen aller erzeugten lokalen Sicherungsdateien an. Sie können diese Option dazu verwenden, den Inhalt Ihrer Sicherungsdateien zu überprüfen.</p> ]]></trans>
   </entry>
   <entry>
    <base>SELECT_BACKUP_FILE</base>
@@ -149,7 +149,7 @@
   </entry>
   <entry>
    <base>RESTORE_IN_PROGRESS_DESC</base>
-   <trans>Nach dem Wiederherstellen muß der Server neu gestartet werden. Ihre Wiederherstellung ist komplett wenn /etc/smbpasswd wiederhergestellt wurde und "Wiederherstellung durchgeführt" unten auf der Seite angezeigt wird.</trans>
+   <trans>Nach dem Wiederherstellen muss der Server neu gestartet werden. Ihre Wiederherstellung ist komplett, wenn "Wiederherstellung durchgeführt" unten auf der Seite angezeigt wird.</trans>
   </entry>
   <entry>
    <base>FILES_HAVE_BEEN_RESTORED</base>
@@ -161,11 +161,11 @@
   </entry>
   <entry>
    <base>RESTORE_COMPLETE</base>
-   <trans>Wiederherstellung durchgeführt.</trans>
+   <trans>Wiederherstellung durchgeführt</trans>
   </entry>
   <entry>
    <base>ERR_RESTORING_GID</base>
-   <trans>Es ist ein Fehler bei der Wiederherstellung der gid (Gruppen ID) von 'www' aufgetreten.</trans>
+   <trans>Es ist ein Fehler bei der Wiederherstellung der gid (Gruppen ID) von 'www' aufgetreten</trans>
   </entry>
   <entry>
    <base>ERR_RESTORING_INITIAL_GRP</base>
@@ -185,7 +185,7 @@
   </entry>
   <entry>
    <base>FILES_IN_BACKUP</base>
-   <trans>Die folgenden Dateien sind in der Sicherungsdatei enthalten:</trans>
+   <trans>Die folgenden Dateien werden in der Sicherung berücksichtigt:</trans>
   </entry>
   <entry>
    <base>VERIFY_COMPLETE</base>
@@ -402,7 +402,7 @@
   </entry>
   <entry>
    <base>VERIFY_WORKSTN_BACKUP_DESC</base>
-   <trans><![CDATA[ <p>Mit dieser Option werden Ihnen alle Datenamen der bisher durchgeführter Sicherungen angezeigt. Sie können jetzt die Inhalte der Sicherungen überprüfen lassen. <b>Wählen Sie die Sicherung aus, die Sie prüfen lassen möchten.</b></p> <p>Sie können alle Dateien der ausgewählten Sicherung sehen.</p> Sicherungsdateien aus folgendem Verzeichnis werden geprüft: ]]></trans>
+   <trans><![CDATA[ <p>Mit dieser Option werden Ihnen alle Dateinamen in einer erstellten Sicherungen angezeigt. Sie können damit den Inhalt der Sicherung überprüfen. <b>Wählen Sie die Sicherung aus, die Sie prüfen möchten.</b></p> <p>Nur Dateien gekennzeichnet mit [Saved] sind in der Sicherung enthalten.</p> Sicherungsdateien aus folgendem Verzeichnis werden geprüft: ]]></trans>
   </entry>
   <entry>
    <base>RESTORE_CONF_FROM_WORKSTN</base>
@@ -674,30 +674,30 @@
   </entry>
   <entry>
    <base>ERR_NO_FULL_BACKUP</base>
-   <trans>Aborting restore because needed full backup is missing or unreadable.</trans>
+   <trans>Wiederherstellung fehlgeschlagen, da das benötigte Voll-Backup fehlt oder nicht lesbar ist.</trans>
   </entry>
   <entry>
    <base>ERR_NO_INC_BACKUP</base>
-   <trans>Aborting restore because the set has missing or unreadable incremental backup number</trans>
+   <trans>Abbruch der Wiederherstellung, da das Sicherungsset fehlt oder die Nummer der inkrementellen Sicherung nicht lesbar ist</trans>
   </entry>
   <entry>
    <base>CHECK_TO_VERIFY_FULL_RESTORE</base>
-   <trans>Check here to test integrity of all backups needed for a full restore with the selected backup</trans>
+   <trans>Hier ankreuzen, falls die Prüfung der Integrität aller Sicherungen für eine vollständige Wiederherstellung mit der gewählten Sicherung erforderlich ist.</trans>
   </entry>
   <entry>
    <base>TESTING_NEEDED_BACKUPS_FOR_RESTORE</base>
-   <trans>Testing all backups needed for a full restore with selected backup</trans>
+   <trans>Eine vollständige Wiederherstellung der ausgewählten Sicherung erfordert eine Überprüfung aller Sicherungen</trans>
   </entry>
   <entry>
    <base>TESTED_BACKUP</base>
-   <trans>Testing integrity of backup</trans>
+   <trans>Überprüfe die Integrität des Backups</trans>
   </entry>
   <entry>
    <base>RESTORE_VERIFY_FAILED</base>
-   <trans>Überprüfung des Datums und der Uhrzeit</trans>
+   <trans>Prüfung der Integrität ist fehlgeschlagen</trans>
   </entry>
   <entry>
    <base>CHECK_INTEGRITY_WARNING</base>
-   <trans>Warning : For large backups, checking integrity may be a long task and should be made with daily workstation backup disabled.</trans>
+   <trans>Warnung: Bei großen Backups kann die Überprüfung der Integrität eine langwierige Sache werden und sollte bei täglicher Arbeitsplatzsicherung deaktiviert werden.</trans>
   </entry>
  </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/de/etc/e-smith/web/functions/emailsettings   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/de/etc/e-smith/web/functions/emailsettings    2010-04-29 07:56:07.000000000 -0600
@@ -63,7 +63,7 @@
     </entry>
     <entry>
         <base>DESC_MODE</base>
-        <trans><![CDATA[ <h2>Grundeinstellungen</h2> Der E-Mail Empfangsmodus kann auf Standard (für kontinuierliche Internetverbindung), ETRN (empfohlen für Einwahlverbindungen) oder Multidrop (für Einwahlverbindungen wenn ETRN von Ihrem Internet Provider nicht unterstützt wird) eingestellt werden. Beachten Sie, daß der Multidrop Mode nur zur Verfügung steht wenn Ihr Server im Modus "Privater Server und Gateway" läuft. ]]></trans>
+        <trans>Der E-Mail Empfangsmodus kann auf Standard (für kontinuierliche Internetverbindung), ETRN (empfohlen für Einwahlverbindungen) oder Multidrop (für Einwahlverbindungen wenn ETRN von Ihrem Internet Provider nicht unterstützt wird) eingestellt werden. Beachten Sie, dass der Multidrop Mode nur zur Verfügung steht wenn Ihr Server im Modus "Privater Server und Gateway" läuft.</trans>
     </entry>
     <entry>
         <base>LABEL_DELEGATE</base>
@@ -306,12 +306,12 @@
 
     <entry>
        <base>LABEL_SPAM_SUBJECT</base>
-       <trans>SPAM subject prefix</trans>
+       <trans>SPAM-Kennzeichen in der Betreffzeile</trans>
     </entry>
 
     <entry>
        <base>DESC_SPAM_SUBJECT</base>
-       <trans>You can enable to add a tag to the subject of each message that is classified as SPAM. The value for this tag can be defined below.</trans>
+       <trans>Es kann ein Kennzeichen zur Betreffzeile jeder Nachricht hinzugefügt werden, die als SPAM eingestuft wurde. Die Eingabe dieses Kennzeichens erfolgt unten.</trans>
     </entry>
 
    <entry>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/de/etc/e-smith/web/functions/proxy   2008-10-07 09:28:31.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/de/etc/e-smith/web/functions/proxy    2010-04-29 07:58:46.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>Die neuen Proxy-Einstellungen wurden erfolgreich aktualisiert.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Blocked</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/el/etc/e-smith/web/functions/proxy   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/el/etc/e-smith/web/functions/proxy    2010-04-29 07:58:46.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>Οι νέες ρυθμίσεις του proxy εφαρμόσθηκαν επιτυχώς.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Blocked</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/es/etc/e-smith/web/functions/backup  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/es/etc/e-smith/web/functions/backup   2010-04-29 07:54:40.000000000 -0600
@@ -113,7 +113,7 @@
   </entry>
   <entry>
    <base>FREE_SPACE</base>
-   <trans><![CDATA[ You have approximately $tmpfree free space on the server. Check that desktop backup file is less than $halffree before commencing the restore. ]]></trans>
+   <trans><![CDATA[ Usted tiene aproximadamente $tmpfree de espacio libre en el servidor. Verifique que el archivo de respaldo de escritorio sea menor a $halffree antes de comenzar con la restauración. ]]></trans>
   </entry>
   <entry>
    <base>MUST_REBOOT_AFTER_RESTORE</base>
@@ -125,7 +125,7 @@
   </entry>
   <entry>
    <base>VERIFY_BACKUP_DESC</base>
-   <trans><![CDATA[ <p>Esta opción mostrará los nombres de todos los archivos del archivo de respaldo de escritorio previamente creado. Puede utilizar esta opción para verificar el contenido del archivo de respaldo.</p> <p>El último archivo contenido en el archivo de respaldo debería ser el archivo llamado "smbpasswd".</p> ]]></trans>
+   <trans><![CDATA[ <p>Esta opción mostrará los nombres de todos los archivos  contenidos en archivo de respaldo de escritorio creado previamente. Puede utilizar esta opción para verificar el contenido del archivo de respaldo.</p> ]]></trans>
   </entry>
   <entry>
    <base>SELECT_BACKUP_FILE</base>
@@ -149,7 +149,7 @@
   </entry>
   <entry>
    <base>RESTORE_IN_PROGRESS_DESC</base>
-   <trans>Luego de que finalice la restauración, debe reiniciar el servidor. La restauración está completa cuando se ha restaurado /etc/smbpasswd y las palabras "Restauración completa" aparecen en la parte inferior de la pantalla.</trans>
+   <trans>Luego de que finalice la restauración, debe reiniciar el servidor. La restauración estará completa cuando las palabras "Restauración completa" aparezcan en la parte inferior de su pantalla.</trans>
   </entry>
   <entry>
    <base>FILES_HAVE_BEEN_RESTORED</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/es/etc/e-smith/web/functions/emailsettings   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/es/etc/e-smith/web/functions/emailsettings    2010-04-29 07:56:08.000000000 -0600
@@ -306,12 +306,12 @@
 
     <entry>
        <base>LABEL_SPAM_SUBJECT</base>
-       <trans>SPAM subject prefix</trans>
+       <trans>Prefijo en el Asunto de SPAM</trans>
     </entry>
 
     <entry>
        <base>DESC_SPAM_SUBJECT</base>
-       <trans>You can enable to add a tag to the subject of each message that is classified as SPAM. The value for this tag can be defined below.</trans>
+       <trans>Puede habilitarlo para añadir una etiqueta en el asunto de cada mensaje que sea clasificado como SPAM. El valor para esta etiqueta puede ser definido debajo.</trans>
     </entry>
 
    <entry>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/es/etc/e-smith/web/functions/groups  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/es/etc/e-smith/web/functions/groups   2010-04-29 07:56:57.000000000 -0600
@@ -45,7 +45,7 @@
     </entry>   
     <entry>
         <base>GROUP_NAMING</base>
-        <trans><![CDATA[ El nombre del repositorio debe contener sólo letras minúsculas números, puntos, guiones y subguiones, y debe comenzar con una letra minúscula. Por ejemplo, "juan", "intra", y "cust3.prj12" son todos nombres válidos, pero "3asociados", "Juan Smith" y "Bus!Partner" no lo son. El nombre esta limitado a {$maxLength} caracteres. ]]></trans>
+        <trans><![CDATA[ El nombre del grupo debe contener sólo letras minúsculas números, puntos, guiones y subguiones, y debe comenzar con una letra minúscula. Por ejemplo, "ventas", "beta5", y "clientes_vip" son todos nombres de grupo válidos, pero "3asociados", "Juan Smith" y "Equipo de Marketing" no lo son. ]]></trans>
     </entry>
     <entry>
         <base>GROUP_HAS_MEMBERS</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/es/etc/e-smith/web/functions/portforwarding  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/es/etc/e-smith/web/functions/portforwarding   2010-04-29 07:58:26.000000000 -0600
@@ -109,6 +109,6 @@
     </entry>
     <entry>
         <base>IN_SERVERONLY</base>
-        <trans>Este servidor está actualmente en el modo solo-servidor y el reenvío de puerto no es posible.</trans>
+        <trans>Este servidor está actualmente en el modo solo-servidor y el reenvío de puerto sólo es posible al localhost.</trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/es/etc/e-smith/web/functions/printers        2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/es/etc/e-smith/web/functions/printers 2010-04-29 07:58:37.000000000 -0600
@@ -105,7 +105,7 @@
     </entry>
     <entry>
       <base>REMOTE_NAME_DESC</base>
-      <trans><![CDATA[ Network printer name (enter raw if not sure) ]]></trans>
+      <trans><![CDATA[ Nombre de impresora de red (si no esta seguro introduzca el nombre como aparece) ]]></trans>
     </entry>
     <entry>
       <base>REMOVE_PRINTER</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/es/etc/e-smith/web/functions/proxy   2008-10-07 09:28:33.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/es/etc/e-smith/web/functions/proxy    2010-04-29 07:58:46.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>La nueva configuración de proxy ha sido aplicada correctamente.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Bloqueado</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/es/etc/e-smith/web/functions/useraccounts    2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/es/etc/e-smith/web/functions/useraccounts     2010-04-29 08:00:49.000000000 -0600
@@ -205,7 +205,7 @@
     </entry>    
     <entry> 
         <base>SYSTEM_PASSWORD_DESCRIPTION</base>
-        <trans><![CDATA[ Certain services on this server installation require a username and password (for example this web page for the server manager application). The username is always admin. You can change the system password using the fields below. ]]></trans>        
+        <trans><![CDATA[ Ciertos servicios en esta instalación del servidor requieren un nombre de usuario y contraseña (por ejemplo, esta página web para la aplicación del server manager). El nombre de usuario siempre es admin. Puede cambiar la contraseña del sistema utilizando el siguiente formulario. ]]></trans>        
     </entry>
     <entry>
         <base>SYSTEM_PASSWORD_UNPRINTABLES_IN_PASS</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/es/etc/e-smith/web/functions/viewlogfiles    2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/es/etc/e-smith/web/functions/viewlogfiles     2010-04-29 08:01:35.000000000 -0600
@@ -6,7 +6,7 @@
 
     <entry>
         <base>FIRSTPAGE_DESC</base>
-        <trans><![CDATA[ This panel allows you to view or download the log files generated by the services running on your server. ]]></trans>
+        <trans><![CDATA[ Este panel le permite ver o descargar los archivos de registro generados por los servicios que se ejecutan en el servidor. ]]></trans>
     </entry>
     <entry>
         <base>LOG_FILE_SELECT_DESC</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/es/etc/e-smith/web/functions/workgroup       2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/es/etc/e-smith/web/functions/workgroup        2010-04-29 08:01:49.000000000 -0600
@@ -5,7 +5,7 @@
     </entry>   
     <entry> 
         <base>DESC_WORKGROUP</base>
-        <trans><![CDATA[ Enter the name of the Windows workgroup that this server should appear in. ]]></trans>        
+        <trans><![CDATA[ Introduzca el nombre del grupo de trabajo Windows en el que este servidor debe aparecer. ]]></trans>  
     </entry>
     <entry>
         <base>LABEL_WORKGROUP</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/et/etc/e-smith/web/functions/emailsettings   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/et/etc/e-smith/web/functions/emailsettings    2010-04-29 07:56:08.000000000 -0600
@@ -71,7 +71,7 @@
     </entry>
     <entry>
         <base>DESC_DELEGATE</base>
-        <trans><![CDATA[ <hr class="sectionbar" /><h2>Delegate mail servers</h2> Your server includes a complete, full-featured e-mail server. However, if for some reason you wish to delegate e-mail processing to another system, specify the IP address of the delegate system here. For normal operation, leave this field blank. ]]></trans>
+        <trans><![CDATA[ <hr class="sectionbar" /><h2>Delegeeri e-posti server</h2>  Sinu server sisaldab täis e-posti serverit. Kui mingil põhjusel soovid e-posti teenust delegrreida mõnele teisel süsteemile, siis sisesta selle süsteemi IP aadress siia. Vaikimis jäta see väli tühjaks. ]]></trans>
     </entry>
     <entry>
         <base>LABEL_SECONDARY</base>
@@ -79,7 +79,7 @@
     </entry>
     <entry>
         <base>DESC_SECONDARY</base>
-        <trans><![CDATA[ <hr class="sectionbar" /><h2>ETRN or multi-drop settings</h2> For ETRN or multi-drop, specify the hostname or IP address of your secondary mail server. (If using the standard e-mail setup, this field can be left blank.) ]]></trans>
+        <trans><![CDATA[ <hr class="sectionbar" /><h2>ETRN or multi-drop settings</h2>  For ETRN or multi-drop, specify the hostname or IP address of your secondary mail server. (If using the standard e-mail setup, this field can be left blank.) ]]></trans>
     </entry>
     <entry>
         <base>DESC_FETCH_PERIOD</base>
@@ -227,7 +227,7 @@
     </entry>
     <entry>
         <base>DESC_WEBMAIL</base>
-        <trans>You can enable or disable webmail on this system. Webmail allows users to access their mail through a regular web browser by pointing the browser to https://{$FQDN}/webmail, and logging in to their account.</trans>
+        <trans>Sa võid keelata või lubada webmaili serveris. Webmail lubab kasutajatel juurdepääsu oma e-mailidele ükskõik millise brauseriga sisestades aadressi https://{$FQDN}/webmail, ning kasutades autentimiseks oma konto andmeid.</trans>
     </entry>
     <entry>
         <base>LABEL_WEBMAIL</base>
@@ -235,15 +235,15 @@
     </entry>
      <entry>
         <base>LABEL_BLOCK_EXECUTABLE_CONTENT</base>
-        <trans>Executable content blocking</trans>
+        <trans>Käivitatava sisu blokeerimine</trans>
      </entry>
      <entry>
         <base>LABEL_CONTENT_TO_BLOCK</base>
-        <trans>Content to block</trans>
+        <trans>Sisu mida blokeerida</trans>
      </entry>
      <entry>
         <base>DESC_BLOCK_EXECUTABLE_CONTENT</base>
-        <trans>You can block executable content in e-mail attachments by highlighting the executable attachment types you wish to block. E-mail containing these attachment types will be automatically returned to the sender.</trans>
+        <trans>Sa võid käivitatva sisu e-maili manustes blokeerida, märkides käivitatavate failide tüübid. E-mail mis sisaldab selliseid manuseid tagastatakse automaatselt saatjale.</trans>
     </entry>
     <entry>
         <base>UNACCEPTABLE_CHARS</base>
@@ -267,7 +267,7 @@
 
     <entry>
         <base>DESC_STATE_RECEPTION_BUTTON</base>
-        <trans><![CDATA[ <a class="button-like" href="emailsettings?page=0&page_stack=&Next=Next&wherenext=EMAIL_PAGE_RECEPTION">Change e-mail reception settings</a> ]]></trans>
+        <trans><![CDATA[ <a class="button-like" href="emailsettings?page=0&page_stack=&Next=Next&wherenext=EMAIL_PAGE_RECEPTION">Change e-mail reception settings</a>  ]]></trans>
     </entry>
 
     <entry>
@@ -277,12 +277,12 @@
 
     <entry>
         <base>DESC_STATE_DELIVERY_BUTTON</base>
-        <trans><![CDATA[ <a class="button-like" href="emailsettings?page=0&page_stack=&Next=Next&wherenext=EMAIL_PAGE_DELIVERY">Change e-mail delivery settings</a> ]]></trans>
+        <trans><![CDATA[ <a class="button-like" href="emailsettings?page=0&page_stack=&Next=Next&wherenext=EMAIL_PAGE_DELIVERY">Change e-mail delivery settings</a>  ]]></trans>
     </entry>
 
     <entry>
         <base>DESC_STATE_FILTERING_BUTTON</base>
-        <trans><![CDATA[ <a class="button-like" href="emailsettings?page=0&page_stack=&Next=Next&wherenext=EMAIL_PAGE_FILTERING">Change e-mail filtering settings</a> ]]></trans>
+        <trans><![CDATA[ <a class="button-like" href="emailsettings?page=0&page_stack=&Next=Next&wherenext=EMAIL_PAGE_FILTERING">Muuda e-mailide filtreerimise seadeid</a>  ]]></trans>
     </entry>
     <entry>
        <base>LABEL_VIRUS_SCAN</base>
@@ -291,7 +291,7 @@
 
     <entry>
        <base>DESC_VIRUS_SCAN</base>
-       <trans>You can scan incoming and outgoing e-mail for viruses. If scanning is enabled and a virus is detected, the e-mail will be rejected and returned to the sender.</trans>
+       <trans>Sa võid kontrollida sisse- ja väljaminevaid kirju kontrollida viiruste suhtes. Kui kontroll on lubatud ja viirus leitakse, siis saadetakse kiri tagasi saatjale.</trans>
     </entry>
 
     <entry>
@@ -301,7 +301,7 @@
 
     <entry>
        <base>DESC_SPAM_SCAN</base>
-       <trans>You can scan e-mail for spam. If Spam filtering is enabled, an X-Spam-Status: header is added to each message, which can be used for filtering spam. You can adjust the sensitivity of the Spam detection process from the default of medium. For fine-grained control, you can set the Spam sensitivity to Custom and then choose a custom tagging level, and optionally a level at which to reject the message.</trans>
+       <trans>Sa võid kontrollida e-kirju spämmi suhtes. Kui spämmi filter on lubatud, siis lisatakse X-Spam_status: iga kirja päisesse, mida kasutatakse spämmi filtreerimiseks. Sa võid spämmi tundlikust muuta, vaikimisi on see keskmine. For fine-grained control, you can set the Spam sensitivity to Custom and then choose a custom tagging level, and optionally a level at which to reject the message.</trans>
     </entry>
 
     <entry>
@@ -320,11 +320,11 @@
     </entry>
    <entry>
         <base>LABEL_SPAM_TAGLEVEL</base>
-        <trans>Custom spam tagging level</trans>
+        <trans>Kohandatud spam tagging level</trans>
     </entry>
     <entry>
         <base>LABEL_SPAM_REJECTLEVEL</base>
-        <trans>Custom spam rejection level</trans>
+        <trans>Kohandatud spam rejection level</trans>
     </entry>
     <entry>
         <base>LABEL_SPAM_SUBJECTTAG</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/et/etc/e-smith/web/functions/groups  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/et/etc/e-smith/web/functions/groups   2010-04-29 07:56:57.000000000 -0600
@@ -45,7 +45,7 @@
     </entry>   
     <entry>
         <base>GROUP_NAMING</base>
-        <trans><![CDATA[ The group name should contain only lower-case letters, numbers, hyphens, periods, and underscores, and should start with a lower-case letter. For example "sales", "beta5", and "reseller_partners" are all valid group names, but "3rd-event", "Marketing Team" and "lost&found" are not. ]]></trans>
+        <trans><![CDATA[ Grupi nimi võib sisaldada ainult väikseid tähti, numbreid, hyphens, periods, and underscores, ja peab algama väikse täehega. Näiteks "müük", "beta5", ja  "reseller_partners" sobivad grupi nimeks aga "3rd-event", "Müügi Grupp" ja "lost&found" ei sobi. ]]></trans>
     </entry>
     <entry>
         <base>GROUP_HAS_MEMBERS</base>
@@ -53,7 +53,7 @@
     </entry>
     <entry>
         <base>NOT_A_GROUP</base>
-        <trans>Error: That is not an existing group account.</trans>
+        <trans>Viga: That is not an existing group account.</trans>
     </entry>
     <entry>
         <base>GROUP_DESC</base>
@@ -75,10 +75,10 @@
     </entry>
     <entry>
         <base>CURRENT_LIST</base>
-        <trans><![CDATA[<p>Current list of User Groups</p>]]></trans>
+        <trans><![CDATA[<p>Nimekiri olemasolevatest gruppidest</p>]]></trans>
     </entry>
     <entry>
                <base>DELETE_DESCRIPTION</base>
-               <trans><![CDATA[ You are about to remove the user group "<b>{$group}</b>." ]]></trans>
+               <trans><![CDATA[ Oled kindel, et tahad gruppi "<b>{$group}</b>." ]]> kustutada </trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/et/etc/e-smith/web/functions/localnetworks   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/et/etc/e-smith/web/functions/localnetworks    2010-04-29 07:57:51.000000000 -0600
@@ -7,7 +7,7 @@
     </entry>
     <entry>
         <base>FIRSTPAGE_DESC</base>
-        <trans><![CDATA[ For security reasons, several services on your server are available only to your local network. However you can grant these local access privileges to additional networks by listing them below. Most installations should leave this list empty.</P><P> <a class="button-like" href="localnetworks?page=0&page_stack=&Next=Next&wherenext=Add">Add network</a> ]]></trans>
+        <trans><![CDATA[ Turvalisuse tagamiseks on mõned teenused kättesaadvad ainult kohtvõrgus. Kui soovid teenuseid ja juurdepääsu teha kättesaadvaks ka mõnes teises võrgus, siis lisa need siia. Tavaliselt jäetakse see täiendamata.</P><P> <a class="button-like" href="localnetworks?page=0&page_stack=&Next=Next&wherenext=Add">Lisa võrk</a> ]]></trans>
     </entry>
     <entry>
         <base>ADD_TITLE</base>
@@ -39,7 +39,7 @@
     </entry>
     <entry>
         <base>REMOVE_DESC</base>
-        <trans>You are about to remove the following local network.</trans>
+        <trans>Oled kindel, et tahad seda võrku kustutada.</trans>
     </entry>
     <entry>
         <base>REMOVE_CONFIRM</base>
@@ -55,7 +55,7 @@
     </entry>
     <entry>
         <base>NOT_ACCESSIBLE_FROM_LOCAL_NETWORK</base>
-        <trans>Error: router address {$networkRouter} is not accessible from local network. Did not add network.</trans>
+        <trans>Viga: ruuteri aadress {$networkRouter} pole kohtvõrgust kättesaadav. Võrku ei lisatud.</trans>
     </entry>
     <entry>
         <base>NETWORK_ALREADY_LOCAL</base>
@@ -71,11 +71,11 @@
     </entry>
     <entry>
         <base>SUCCESS</base>
-        <trans>Successfully added network {$network}/{$networkMask} via router {$networkRouter}.</trans>
+        <trans>Lisati järgmine  võrk {$network}/{$networkMask} via router {$networkRouter}.</trans>
     </entry>
     <entry>
         <base>SUCCESS_SINGLE_ADDRESS</base>
-        <trans>Successfully added network {$network}/{$networkMask} via router {$networkRouter}. Your server will grant local access privileges to the single IP address {$network}.</trans>
+        <trans>Lisati järgmine võrk {$network}/{$networkMask} via router {$networkRouter}. Your server will grant local access privileges to the single IP address {$network}.</trans>
     </entry>
     <entry>
         <base>SUCCESS_NETWORK_RANGE</base>
@@ -83,15 +83,15 @@
     </entry>
     <entry>
         <base>SUCCESS_NONSTANDARD_RANGE</base>
-        <trans><![CDATA[ <p> Successfully added network {$network}/{$networkMask} via router {$networkRouter}. </p> <p> Your server will grant local access privileges to {$totalHosts} IP addresses in the range {$firstAddr} to {$lastAddr}. </p> <p> Warning: the ProFTPd FTP server cannot handle this nonstandard subnet mask. The simpler specification <b>{$simpleMask}</b> will be used instead. </p> ]]></trans>
+        <trans><![CDATA[ <p> Successfully added network {$network}/{$networkMask} via router {$networkRouter}. </p>  <p> Your server will grant local access privileges to {$totalHosts} IP addresses in the range {$firstAddr} to {$lastAddr}. </p> <p> Warning: the ProFTPd FTP server cannot handle this nonstandard subnet mask. The simpler specification <b>{$simpleMask}</b> will be used instead. </p> ]]></trans>
     </entry>
     <entry>
         <base>SUCCESS_REMOVED_NETWORK</base>
-        <trans>Successfully removed network {$network}/{$networkMask} via router {$networkRouter}.</trans>
+        <trans>Kustutati järgmine võrk {$network}/{$networkMask} via router {$networkRouter}.</trans>
     </entry>
     <entry>
         <base>ERROR_DELETING_NETWORK</base>
-        <trans>Error occurred while deleting network.</trans>
+        <trans>Võrgu kustutamisel ilmnes viga.</trans>
     </entry>
     <entry>
         <base>NO_ADDITIONAL_NETWORKS</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/et/etc/e-smith/web/functions/proxy   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/et/etc/e-smith/web/functions/proxy    2010-04-29 07:58:47.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>Uued proxy seaded on edukalt muudetud.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Blocked</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/et/etc/e-smith/web/functions/useraccounts    2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/et/etc/e-smith/web/functions/useraccounts     2010-04-29 08:00:49.000000000 -0600
@@ -13,7 +13,7 @@
     </entry>
     <entry>
         <base>CREATE_MODIFY_DESC</base>
-        <trans><![CDATA[ <p> The account name should contain only lower-case letters, numbers, hyphens, periods, underscores and should start with a lower-case letter. For example "betty", "hjohnson", and "mary-jane" are all valid account names, but "3friends", "John Smith", and "henry:miller" are not. </p> <p> Note that two special pseudonyms will be created for each new account. These pseudonyms provide the ability to have alternative mail accounts for that user which include their first name and last name separated with a period (.) and underscore (_). So, for the account "betty" with first name "Betty" and last name "Rubble" two pseudonyms are created as betty.rubble and betty_rubble. </p> <p> The directory information (department, company, etc.) can be changed from the defaults shown below. The changes will apply only to this user. </p> ]]></trans>
+        <trans><![CDATA[ <p> The account name should contain only lower-case letters, numbers, hyphens, periods, underscores and should start with a lower-case letter. For example "betty", "hjohnson", and "mary-jane" are all valid account names, but "3friends", "John Smith", and "henry:miller" are not. </p> <p> Note that two special pseudonyms will be created for each new account. These pseudonyms provide the ability to have alternative mail accounts for that user which include their first name and last name separated with a period (.) and underscore (_). So, for the account "betty" with first name "Betty" and last name "Rubble" two pseudonyms are created as betty.rubble and betty_rubble. </p>  <p> The directory information (department, company, etc.) can be changed from the defaults shown below. The changes will apply only to this user. </p> ]]></trans>
     </entry>
     <entry>
         <base>MODIFY_ADMIN_TITLE</base>
@@ -33,7 +33,7 @@
     </entry>
     <entry>
         <base>CANNOT_MODIFY_USER</base>
-        <trans>Error: an internal error occurred while attempting to modify the user "{$acctName}".</trans> 
+        <trans>Viga: süsteemi viga konto "{$acctName}" muutmisel</trans> 
     </entry>
     <entry>
         <base>CANNOT_MODIFY_USER_GROUPS</base> 
@@ -77,7 +77,7 @@
     </entry>
     <entry>
         <base>EMAIL_DELIVERY</base>
-        <trans>Email delivery</trans>
+        <trans>E-posti saatmine</trans>
     </entry>
     <entry>
         <base>DELIVER_EMAIL_LOCALLY</base>
@@ -101,7 +101,7 @@
     </entry>
     <entry>
         <base>RESET_DESC</base>
-        <trans>You are about to change the password for the user account</trans>
+        <trans>Oled kindel, et tahad kasutaja parooli muuta</trans>
     </entry>
     <entry>
         <base>RESET_DESC2</base>
@@ -117,7 +117,7 @@
     </entry>
     <entry>
         <base>LOCK_DESC</base>
-        <trans>You are about to lock the user account</trans>
+        <trans>Oled kindel, et tahad kasutajakonto lukustada</trans>
     </entry>
     <entry>
         <base>LOCKED_ACCOUNT</base>
@@ -129,7 +129,7 @@
     </entry>
     <entry>
         <base>PSEUDONYM_CLASH</base>
-        <trans>Error: the pseudonym "{$pseudonym}" is already taken by the existing user account "{$clashName}". To differentiate, add initials to this field.</trans>
+        <trans>Viga:  pseudonym "{$pseudonym}" is already taken by the existing user account "{$clashName}". To differentiate, add initials to this field.</trans>
     </entry>
     <entry>
         <base>LOCK_ACCOUNT</base>
@@ -149,7 +149,7 @@
     </entry>
     <entry>
         <base>REMOVE_DESC</base>
-        <trans>You are about to remove the user account</trans>
+        <trans>Oled kindel, et tahad kasutajakonto kustutada</trans>
     </entry>
     <entry>
         <base>REMOVE_DESC2</base>
@@ -177,7 +177,7 @@
     </entry>
     <entry>
         <base>ACCOUNT_CONFLICT</base>
-        <trans>Error: the account "{$account}" can't be created because there is already a {$type} account of that name.</trans>
+        <trans>Viga: Kasutajat "{$account}" ei saanud luua kuna on juba {$type} sellise nimega.</trans>
     </entry>    
     <entry>
         <base>ERR_OCCURRED_CREATING</base>
@@ -249,6 +249,6 @@
     </entry>
     <entry>
         <base>FREEBUSY_DESCRIPTION</base>
-        <trans><![CDATA[ The Calendar Free/Busy URL needs to be in the following format:<br> https://www.<b>domain.com</b>/horde/kronolith/fb.php?u=<b>user%40domain.com.&nbsp;&nbsp;Note:</b> %40 translates to the @ character.<br> </p> ]]></trans>
+        <trans><![CDATA[ The Calendar Free/Busy URL needs to be in the following format:<br> https://www.<b>domain.com</b>/horde/kronolith/fb.php?u=<b>user%40domain.com.&nbsp;&nbsp;Note:</b> %40 translates to the @ character.<br>  </p> ]]></trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/et/etc/e-smith/web/functions/workgroup       2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/et/etc/e-smith/web/functions/workgroup        2010-04-29 08:01:49.000000000 -0600
@@ -13,7 +13,7 @@
     </entry>
     <entry>
         <base>DESC_SERVERNAME</base>
-        <trans>Enter the name that this server should use for Windows and Macintosh file sharing.</trans>
+        <trans>Sisesta serverile nimi mida kasutatakse failide jagamisel Windowsi ja MAC-ga.</trans>
     </entry>
     <entry>
         <base>LABEL_SERVERNAME</base>
@@ -21,7 +21,7 @@
     </entry>
     <entry>
         <base>DESC_PDC</base>
-        <trans><![CDATA[Should this server act as the workgroup and domain controller on your Windows network? You should leave this set to <b>No</b> if another server is already performing this role on your network.]]></trans>
+        <trans><![CDATA[Kas see server kontrollib windowsi töörühma ja domeeni? Jäta see nii nagu on <b>Ei</b> kui mõni teine server seda juba teeb.]]></trans>
     </entry>
     <entry>
         <base>LABEL_PDC</base>
@@ -29,7 +29,7 @@
     </entry>
     <entry>
         <base>DESC_ROAM</base>
-        <trans><![CDATA[ Should this server support roaming profiles? You should leave this set to the default of <b>No</b> unless you have experience administering server-based Windows roaming profiles and know that this feature is required. ]]></trans>
+        <trans><![CDATA[ Kas see server toetab rändprofiile? Jäta see nii nagu on<b>Ei</b>  Kui sul puudub kogemus rändprofiilide administreerimisel windowsis või sa pole kindel mida sa teed. ]]></trans>
     </entry>
     <entry>
         <base>LABEL_ROAM</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/backup  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/backup   2010-04-29 07:54:41.000000000 -0600
@@ -125,7 +125,7 @@
   </entry>
   <entry>
    <base>VERIFY_BACKUP_DESC</base>
-   <trans><![CDATA[ <p>Cette option va afficher le nom de tous les fichiers contenus dans un fichier de sauvegarde déjà stocké sur l'ordinateur local. Vous pouvez utiliser cette option pour vérifier le contenu du fichier de sauvegarde.</p> <p>Le dernier fichier contenu dans la sauvegarde devrait être le fichier nommé "etc/samba/smbpasswd".</p> ]]></trans>
+   <trans><![CDATA[ <p>Cette option va afficher le nom de tous les fichiers contenus dans un fichier de sauvegarde déjà stocké sur l'ordinateur local. Vous pouvez utiliser cette option pour vérifier le contenu du fichier de sauvegarde.</p> ]]></trans>
   </entry>
   <entry>
    <base>SELECT_BACKUP_FILE</base>
@@ -149,7 +149,7 @@
   </entry>
   <entry>
    <base>RESTORE_IN_PROGRESS_DESC</base>
-   <trans>Après la fin de la restauration, vous devrez redémarrer le serveur. Votre restauration sera terminée quand le fichier "/etc/samba/smbpasswd" aura été restauré et que les mots "Restauration terminée" seront apparus en bas de l'écran.</trans>
+   <trans>Après la fin de la restauration, vous devrez redémarrer le serveur. Cette restauration sera terminée quand le message "Restauration terminée" apparaitra en bas de l'écran.</trans>
   </entry>
   <entry>
    <base>FILES_HAVE_BEEN_RESTORED</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/emailsettings   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/emailsettings    2010-04-29 07:56:08.000000000 -0600
@@ -306,12 +306,12 @@
 
     <entry>
        <base>LABEL_SPAM_SUBJECT</base>
-       <trans>SPAM subject prefix</trans>
+       <trans>Préfixe du sujet des pourriels</trans>
     </entry>
 
     <entry>
        <base>DESC_SPAM_SUBJECT</base>
-       <trans>You can enable to add a tag to the subject of each message that is classified as SPAM. The value for this tag can be defined below.</trans>
+       <trans>Vous pouvez autoriser l'ajout d'un préfixe au sujet de tout courriel identifié comme pourriel. Vous pouvez définir ce préfixe ci-dessous.</trans>
     </entry>
 
    <entry>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/portforwarding  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/portforwarding   2010-04-29 07:58:27.000000000 -0600
@@ -109,6 +109,6 @@
     </entry>
     <entry>
         <base>IN_SERVERONLY</base>
-        <trans>Ce serveur est actuellement configuré en mode "serveur uniquement", le renvoi de port n'est donc pas possible.</trans>
+        <trans>Ce serveur est actuellement configuré en mode "serveur uniquement" et le renvoi de port n'est possible que pour ce serveur (localhost).</trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/proxy   2008-10-07 09:28:31.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/proxy    2010-04-29 07:58:47.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>Les nouveaux paramètres du service Proxy ont été appliqués avec succès.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Bloqué</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/yum     2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/yum      2010-04-29 08:02:00.000000000 -0600
@@ -13,7 +13,7 @@
 
     <entry>
         <base>LABEL_YUM_STATUS</base>
-        <trans>Vérification quotidienne des mises à jour</trans>
+        <trans>Vérification des mises à jour</trans>
     </entry>
 
     <entry>
@@ -163,7 +163,7 @@
 
     <entry>
       <base>3MONTHLY</base>
-      <trans>Monter</trans>
+      <trans>Chaque mois</trans>
     </entry>
  
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/backup  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/backup   2010-04-29 07:54:42.000000000 -0600
@@ -125,7 +125,7 @@
   </entry>
   <entry>
    <base>VERIFY_BACKUP_DESC</base>
-   <trans><![CDATA[ <p>Ez az opció kilistázza az összes fájl nevét amelyet az asztali mentés fájl tartalmaz. Ezzel az opcióval ellenőrizhető a biztonsági mentés tartalma.</p> <p>A biztonsági mentésben az utolsó fájlnak az "smbpasswd" nevű fájlnak kell lennie.</p> ]]></trans>
+   <trans><![CDATA[ <p>Ez az opció kilistázza az összes fájl nevét amelyet az asztali mentés fájl tartalmaz. Ezzel az opcióval ellenőrizhető a biztonsági mentés tartalma.</p> </trans>
   </entry>
   <entry>
    <base>SELECT_BACKUP_FILE</base>
@@ -149,7 +149,7 @@
   </entry>
   <entry>
    <base>RESTORE_IN_PROGRESS_DESC</base>
-   <trans>A rendszer-helyreállítás után újra kell indítania a szervert. A helyreállítás akkor van kész, amikor az /etc/smbpasswd helyre lett állítva, és a képernyő alján olvasható a "Rendszer-helyreállítás befejeződött" felirat.</trans>
+   <trans>A rendszer-helyreállítás után újra kell indítania a szervert. A helyreállítás akkor van kész, amikor a képernyő alján a "Rendszer-helyreállítás befejeződött" felirat megjelenik.</trans>
   </entry>
   <entry>
    <base>FILES_HAVE_BEEN_RESTORED</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/emailsettings   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/emailsettings    2010-04-29 07:56:09.000000000 -0600
@@ -306,12 +306,12 @@
 
     <entry>
        <base>LABEL_SPAM_SUBJECT</base>
-       <trans>SPAM subject prefix</trans>
+       <trans>SPAM tárgy előtag</trans>
     </entry>
 
     <entry>
        <base>DESC_SPAM_SUBJECT</base>
-       <trans>You can enable to add a tag to the subject of each message that is classified as SPAM. The value for this tag can be defined below.</trans>
+       <trans>Engedélyezheti egy jelölés hozzáadását minden SPAM-nek minősített levél tárgysorához. A jelölő beállítását itt végezheti el.</trans>
     </entry>
 
    <entry>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/portforwarding  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/portforwarding   2010-04-29 07:58:27.000000000 -0600
@@ -49,11 +49,11 @@
     </entry>
     <entry>
         <base>LABEL_RULE_COMMENT</base>
-        <trans>Megjegyzés</trans>
+        <trans>Szabály leírása</trans>
     </entry>
     <entry>
         <base>LABEL_ALLOW_HOSTS</base>
-        <trans>Kiszolgálók</trans>
+        <trans>Kiszolgálók engedélyezése</trans>
     </entry>
     <entry>
         <base>Port forwarding</base>
@@ -65,11 +65,11 @@
     </entry>
     <entry>
         <base>RULE_COMMENT</base>
-        <trans>Megjegyzés</trans>
+        <trans>Szabály leírása</trans>
     </entry>
     <entry>
         <base>ALLOW_HOSTS</base>
-        <trans>Kiszolgálók</trans>
+        <trans>Kiszolgálók engedélyezése</trans>
     </entry>
     <entry>
         <base>ERR_NO_MASQ_RECORD</base>
@@ -105,10 +105,10 @@
     </entry>
     <entry>
         <base>ERR_BADAHOST</base>
-        <trans>This does not appear to be a valid IP address list. ie: 192.168.0.1,192.168.1.1/24</trans>
+        <trans>Ez nem tűnik érvényes IP cím listának. Pl.: 192.168.0.1,192.168.1.1/24</trans>
     </entry>
     <entry>
         <base>IN_SERVERONLY</base>
-        <trans>Ez a szerver, csak szerver módban működik, ezért a portforwarding nem elérhető.</trans>
+        <trans>Ez a szerver, csak szerver módban működik, ezért a port átirányítást csak a localhost-ra adhatja meg.</trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/proxy   2008-10-07 09:28:35.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/proxy    2010-04-29 07:58:47.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>Az új proxy beállítások sikeresen alkalmazva.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Blokkolt</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/id/etc/e-smith/web/functions/proxy   2008-10-07 09:28:31.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/id/etc/e-smith/web/functions/proxy    2010-04-29 07:58:47.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>Setting proxy telah berhasil diterapkan.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Blocked</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/it/etc/e-smith/web/functions/backup  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/it/etc/e-smith/web/functions/backup   2010-04-29 07:54:43.000000000 -0600
@@ -125,7 +125,7 @@
   </entry>
   <entry>
    <base>VERIFY_BACKUP_DESC</base>
-   <trans><![CDATA[ <p>Questa opzione mostra i nomi di tutti i file contenuti in un backup su desktop precedentemente creato. Utilizzarla per verificare il contenuto di un file di backup su desktop.</p> <p>L'ultimo file contenuto nel backup dovrebbe essere il file "smbpasswd".</p> ]]></trans>
+   <trans><![CDATA[ <p>Questa opzione mostra i nomi di tutti i file contenuti in un backup su desktop precedentemente creato. Utilizzarla per verificare il contenuto di un file di backup su desktop.</p> ]]></trans>
   </entry>
   <entry>
    <base>SELECT_BACKUP_FILE</base>
@@ -149,7 +149,7 @@
   </entry>
   <entry>
    <base>RESTORE_IN_PROGRESS_DESC</base>
-   <trans>Al termine del ripristino sarà necessario riavviare il server. Il ripristino sarà completato quando /etc/smbpasswd sarà stato ripristinato e la dicitura "Ripristino completato" apparirà in fondo allo schermo.</trans>
+   <trans>Al termine del ripristino sarà necessario riavviare il server. Il ripristino sarà completato quando la dicitura "Ripristino completato" apparirà in fondo allo schermo.</trans>
   </entry>
   <entry>
    <base>FILES_HAVE_BEEN_RESTORED</base>
@@ -157,7 +157,7 @@
   </entry>
   <entry>
    <base>RESTORE_FAILED_MSG</base>
-   <trans>Ripristino fallito! Errore durante la lettura del file.</trans>
+   <trans>Ripristino fallito! Errore durante la lettura del file di backup.</trans>
   </entry>
   <entry>
    <base>RESTORE_COMPLETE</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/it/etc/e-smith/web/functions/emailsettings   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/it/etc/e-smith/web/functions/emailsettings    2010-04-29 07:56:09.000000000 -0600
@@ -306,12 +306,12 @@
 
     <entry>
        <base>LABEL_SPAM_SUBJECT</base>
-       <trans>SPAM subject prefix</trans>
+       <trans>Tag per le e-mail riconosciute come SPAM</trans>
     </entry>
 
     <entry>
        <base>DESC_SPAM_SUBJECT</base>
-       <trans>You can enable to add a tag to the subject of each message that is classified as SPAM. The value for this tag can be defined below.</trans>
+       <trans>Abilitare per aggiungere un tag all'oggetto della e-mail riconosciuta come SPAM. Il contenuto del tag è definito di seguito.</trans>
     </entry>
 
    <entry>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/it/etc/e-smith/web/functions/portforwarding  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/it/etc/e-smith/web/functions/portforwarding   2010-04-29 07:58:27.000000000 -0600
@@ -89,7 +89,7 @@
     </entry>
     <entry>
         <base>ERR_BADPORT</base>
-        <trans>Le porte sono un intero positivo minore di 65536.</trans>
+        <trans>Le porte devono essere un intero positivo minore di 65536.</trans>
     </entry>
     <entry>
         <base>ERR_BADIP</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/it/etc/e-smith/web/functions/proxy   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/it/etc/e-smith/web/functions/proxy    2010-04-29 07:58:47.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>La nuova configurazione del proxy è stata applicata con successo.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Bloccato</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/ja/etc/e-smith/web/functions/proxy   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/ja/etc/e-smith/web/functions/proxy    2010-04-29 07:58:48.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>The new proxy settings were applied successfully.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>ブロックする</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/nb/etc/e-smith/web/functions/proxy   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/nb/etc/e-smith/web/functions/proxy    2010-04-29 07:58:48.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>De nye proxy instillingene er lagt til.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Blokkert</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/emailsettings   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/emailsettings    2010-04-29 07:56:10.000000000 -0600
@@ -301,7 +301,7 @@
 
     <entry>
        <base>DESC_SPAM_SCAN</base>
-       <trans>U kunt e-mail controleren op spam. Als Spam filteren aanstaat zal een X-Spam-Status: berichtkop worden toegevoegd aan elk bericht welke gebruikt kan worden voor het filteren van spam. U kunt de gevoeligheid van de Spam detectie wijzigen van standaard naar Gemiddeld. Voor betere controle kunt u de Spam gevoeligheid op Aangepast instellen en een aangepast markeringsniveau opgeven en eventueel een niveau waarop een bericht wordt geweigerd.</trans>
+       <trans>U kunt e-mail controleren op spam. Als Spam filteren aanstaat zal een X-Spam-Status: berichtkop worden toegevoegd aan elk bericht welke gebruikt kan worden voor het filteren van spam. U kunt de gevoeligheid van de Spam detectie wijzigen van Standaard naar Gemiddeld. Voor betere controle kunt u de Spam gevoeligheid op Aangepast instellen en een aangepast markeringsniveau opgeven en eventueel een niveau waarop een bericht wordt geweigerd.</trans>
     </entry>
 
     <entry>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/proxy   2008-10-07 09:28:32.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/proxy    2010-04-29 07:58:48.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>De nieuwe proxy-instellingen zijn met succes gewijzigd.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Geblokkeerd</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/backup  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/backup   2010-04-29 07:54:45.000000000 -0600
@@ -253,7 +253,7 @@
   </entry>
   <entry>
    <base>BETWEEN_0_AND_59</base>
-   <trans>Please choose a minute between 0 and 59.</trans>
+   <trans>Proszę wybrać minutę między 0 a 59.</trans>
   </entry>
   <entry>
    <base>ERR_INVALID_REMINDER_HOUR</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/datetime        2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/datetime 2010-04-29 07:55:16.000000000 -0600
@@ -1,202 +1,202 @@
 <lexicon lang="pl">
     <entry>
       <base>FORM_TITLE</base>
-      <trans>Date and time configuration</trans>
+      <trans>Konfiguracja daty i czasu</trans>
     </entry>
     <entry>
       <base>INITIAL_DESC</base>
-      <trans>This is where you configure the date and time of this server. You may use an existing network time server or manually set the date and time for your time zone.</trans>
+      <trans>Tutaj możesz skonfigurować datę i czas dla tego serwera. Możesz użyć obecnego serwera czasu lub ręcznie ustawić datę i czas.</trans>
     </entry>
     <entry>
       <base>SET_DATE_TITLE</base>
-      <trans>Set Date and Time</trans>
+      <trans>Ustaw datę i czas</trans>
     </entry>
     <entry>
       <base>COULD_NOT_OPEN_TZ_FILE</base>
-      <trans>Error: Could not open timezone file for reading:</trans>
+      <trans>Błąd: nie można odczytać pliku strefy czasowej:</trans>
     </entry>
     <entry>
       <base>JANUARY</base>
-      <trans>January</trans>
+      <trans>Styczeń</trans>
     </entry>
     <entry>
       <base>FEBRUARY</base>
-      <trans>February</trans>
+      <trans>Luty</trans>
     </entry>
     <entry>
       <base>MARCH</base>
-      <trans>March</trans>
+      <trans>Marzec</trans>
     </entry>
     <entry>
       <base>APRIL</base>
-      <trans>April</trans>
+      <trans>Kwiecień</trans>
     </entry>
     <entry>
       <base>MAY</base>
-      <trans>May</trans>
+      <trans>Maj</trans>
     </entry>
     <entry>
       <base>JUNE</base>
-      <trans>June</trans>
+      <trans>Czerwiec</trans>
     </entry>
     <entry>
       <base>JULY</base>
-      <trans>July</trans>
+      <trans>Lipiec</trans>
     </entry>
     <entry>
       <base>AUGUST</base>
-      <trans>August</trans>
+      <trans>Sierpień</trans>
     </entry>
     <entry>
       <base>SEPTEMBER</base>
-      <trans>September</trans>
+      <trans>Wrzesień</trans>
     </entry>
     <entry>
       <base>OCTOBER</base>
-      <trans>October</trans>
+      <trans>Październik</trans>
     </entry>
     <entry>
       <base>NOVEMBER</base>
-      <trans>November</trans>
+      <trans>Listopad</trans>
     </entry>
     <entry>
       <base>DECEMBER</base>
-      <trans>December</trans>
+      <trans>Grudzień</trans>
     </entry>
     <entry>
       <base>NEW_M/D/Y</base>
-      <trans>New month/day/year:</trans>
+      <trans>Nowy miesiąc/dzień/rok:</trans>
     </entry>
     <entry>
       <base>NEW_H/M/S</base>
-      <trans>New hour/min/sec:</trans>
+      <trans>Nowa godzina/minuta/sekunda:</trans>
     </entry>
     <entry>
       <base>AM/PM_AND_TZ</base>
-      <trans>AM/PM and time zone:</trans>
+      <trans>AM/PM i strefa czasowa:</trans>
     </entry>
     <entry>
       <base>NTP_ENABLE_DESC</base>
-      <trans>The server can periodically synchronize the system clock to a network time protocol (NTP) server. If you select this option, enter the hostname or IP address of the NTP server below.</trans>
+      <trans>Serwer może okresowo synchronizować zegar systemowy z sieciowym serwerem czasu (NTP). Jeżeli wybrałeś tę opcję, wpisz nazwę hosta lub adres IP serwera NTP poniżej.</trans>
     </entry>
     <entry>
       <base>NTP_CONFIGURE_DESC</base>
-      <trans>The server is periodically synchronizing the system clock to the network time protocol (NTP) server specified below. To synchronize to a different NTP server, enter a different hostname or IP address in the field below.</trans>
+      <trans>Serwer okresowo synchronizuje zegar systemowy z sieciowym serwerem czasu (NTP) określonym poniżej. Aby zsynchronizować go do innego sewera NTP, wpisz inną nazwę hosta lub adres IP poniżej.</trans>
     </entry>
     <entry>
       <base>NTP_DISABLE_DESC</base>
-      <trans>Choose this option to stop syncronizing the system clock to the NTP server. When the NTP service is disabled, you can set the system date and time manually from this page.</trans>
+      <trans>Wybierz tę opcję, aby zatrzymać synchronizację z serwerem NTP. Kiedy usługa NTP jest wyłączona, możesz ręcznie ustawić datę i czas dzięki tej stronie</trans>
     </entry>
     <entry>
       <base>NTP_SERVER</base>
-      <trans>NTP Server</trans>
+      <trans>Serwer NTP</trans>
     </entry>
     <entry>
       <base>VERIFY_DATE_AND_TIME</base>
-      <trans>Verify date and time</trans>
+      <trans>Sprawdź datę i czas</trans>
     </entry>
     <entry>
       <base>NEW_DATE_AND_TIME</base>
-      <trans>New date and time setting:</trans>
+      <trans>Nowe ustawienia daty i czasu:</trans>
     </entry>
     <entry>
       <base>SETTING_DATE_AND_TIME</base>
-      <trans>Setting date and time</trans>
+      <trans>Ustawienia daty i czasu</trans>
     </entry>
     <entry>
       <base>INVALID_DAY</base>
-      <trans>Error: invalid day of month:</trans>
+      <trans>Błąd: nieprawidłowy dzień miesiąca:</trans>
     </entry>
     <entry>
       <base>BETWEEN_1_AND_31</base>
-      <trans>Please choose a day between 1 and 31.</trans>
+      <trans>Proszę wybrać dzień pomiędzy 1 a 31.</trans>
     </entry>
     <entry>
       <base>INVALID_YEAR</base>
-      <trans>Error: invalid year:</trans>
+      <trans>Błąd: nieprawidłowy rok:</trans>
     </entry>
     <entry>
       <base>FOUR_DIGIT_YEAR</base>
-      <trans>Please choose a four-digit year between 1900 and 2200.</trans>
+      <trans>Proszę wybrać czterocyfrowy rok między 1900 a 2200.</trans>
     </entry>
     <entry>
       <base>INVALID_HOUR</base>
-      <trans>Error: invalid hour:</trans>
+      <trans>Błąd: nieprawidłowy zapis godziny:</trans>
     </entry>
     <entry>
       <base>BETWEEN_1_AND_12</base>
-      <trans>Please choose an hour between 1 and 12.</trans>
+      <trans>Proszę wybrać godzinę między 1 a 12.</trans>
     </entry>
     <entry>
       <base>INVALID_MINUTE</base>
-      <trans>Error: invalid minute:</trans>
+      <trans>Błąd: nieprawidłowy zapis minuty:</trans>
     </entry>
     <entry>
       <base>BETWEEN_0_AND_59</base>
-      <trans>Please choose a minute between 0 and 59.</trans>
+      <trans>Proszę wybrać minutę między 0 a 59.</trans>
     </entry>
     <entry>
       <base>INVALID_SECOND</base>
-      <trans>Error: invalid second</trans>
+      <trans>Błąd: nieprawidłowy zapis sekundy</trans>
     </entry>
     <entry>
       <base>UPDATING_CLOCK</base>
-      <trans><![CDATA[ System clock is being updated. Please wait for a few seconds, then click <A HREF="datetime?page=1&wherenext=Verify" TARGET="main">here</A> to verify changes. ]]></trans>
+      <trans><![CDATA[ Zegar systemowy będzie zaktualizowany. Proszę poczekać kilka sekund, a następnie kliknąć <A HREF="datetime?page=1&wherenext=Verify" TARGET="main">tutaj</A> ,aby sprawdzić zmiany ]]></trans>
     </entry>
     <entry>
       <base>ERR_SETTING_CLOCK</base>
-      <trans>Error occurred while setting system time and hardware clock.</trans>
+      <trans>Wystąpił błąd podczas ustawiania czasu systemowego i zegaru sprzętowego.</trans>
     </entry>
     <entry>
       <base>SERVER_DISABLED</base>
-      <trans>Network time server disabled successfully</trans>
+      <trans>Serwer czasu sieciowego został pomyślnie wyłączony</trans>
     </entry>
     <entry>
       <base>SERVER_DISABLED_DESC</base>
-      <trans><![CDATA[ You have disabled this service: The server will rely on its internal clock, and <b>will not</b> try to synchronize from a time server. ]]></trans>
+      <trans><![CDATA[ Wyłączyłeś tą usługę. Teraz ten serwer będzie używał swojego wewnętrznego zegara, i <b>nie będzie</b> próbował go zsynchronizować do serwera czasu. ]]></trans>
     </entry>
     <entry>
       <base>ERR_CHANGING_TS</base>
-      <trans>Error while changing network time server setting</trans>
+      <trans>Wystąpił błąd podczas zmiany ustawień sieciowego serwera czasu</trans>
     </entry>
     <entry>
       <base>INVALID_NTP_ADDR</base>
-      <trans>Invalid NTP server address:</trans>
+      <trans>Nieprawidłowy adres serwera NTP:</trans>
     </entry>
     <entry>
       <base>SETTINGS_CHANGED</base>
-      <trans>Network time server setting changed successfully</trans>
+      <trans>Ustawienia sieciowego serwera czasu zostały pomyślnie zmienione</trans>
     </entry>
     <entry>
       <base>SYNC_WITH</base>
-      <trans>This server is now configured to synchronize periodically (via the Internet) with:</trans>
+      <trans>Ten serwer jest skonfigurowany do synchronizacji (przez internet) z serwerem: </trans>
     </entry>
     <entry>
       <base>INVALID_NTP_SERVER</base>
-      <trans><![CDATA[ Invalid NTP server, the server <b>will not</b> try to synchronize from a time server. ]]></trans>
+      <trans><![CDATA[ Nieprawidłowy serwer NTP, ten serwer <b>nie będzie</b> synchronizował czasu z serwerem NTP. ]]></trans>
     </entry>
     <entry>
       <base>NETWORK_TIME_SERVER</base>
-      <trans>Network Time Server</trans>
+      <trans>Sieciowy serwer czasu (NTP)</trans>
     </entry>
     <entry>
       <base>NTP_CONFIGURE_TITLE</base>
-      <trans>Configure Network Time Server</trans>
+      <trans>Skonfiguruj sieciowego serwera czasu</trans>
     </entry>
     <entry>
       <base>NTP_ENABLE_TITLE</base>
-      <trans>Enable Network Time Server</trans>
+      <trans>Włącz sieciowego serwera czasu</trans>
     </entry>
     <entry>
       <base>NTP_DISABLE_TITLE</base>
-      <trans>Disable Network Time Server</trans>
+      <trans>Wyłącz sieciowego serwera czasu</trans>
     </entry>
     <entry>
       <base>CURRENT_SETTING</base>
-      <trans>Current setting</trans>
+      <trans>Obecne ustawienia</trans>
     </entry>
     <entry>
       <base>Date and time</base>
-      <trans>Date and time</trans>
+      <trans>Data i czas</trans>
     </entry>
   </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/groups  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/groups   2010-04-29 07:56:58.000000000 -0600
@@ -1,84 +1,84 @@
 <lexicon lang="pl">
     <entry>
         <base>FORM_TITLE</base>
-        <trans>Create, modify, or remove user groups</trans>
+        <trans>Utwórz, zmodyfikuj lub usuń grupę użytkowników</trans>
     </entry>   
     <entry>
         <base>GROUP_TOO_LONG</base>
-        <trans>Error: group name is too long.The maximum is {$maxLength} characters.</trans>
+        <trans>Błąd: nazwa grupy jest za długa. Maksymalna długość wynosi {$maxLength} znaków.</trans>
     </entry>    
     <entry>
         <base>ACCOUNT_CONFLICT</base>
-        <trans>Error: the group "{$group}" can't be created because there is already a {$type} account of that name.</trans>
+        <trans>Błąd: grupa "{$group}" nie mogła być utworzona, ponieważ konto {$type} jest już zajęte.</trans>
     </entry>    
     <entry>
         <base>INVALID_GROUP_DESCRIPTION</base>
-        <trans>Error: unexpected or missing characters in group description</trans>
+        <trans>Błąd: nieoczekiwane lub brakujące znaki w opisie grupy</trans>
     </entry>
     <entry>
         <base>NO_MEMBERS</base>
-        <trans>Error: no members in group. Did not create new group.</trans>
+        <trans>Błąd: brak członków dla grupy. Nie można utworzyć nowej grupy.</trans>
     </entry>
     <entry>
         <base>CREATED_GROUP</base>
-        <trans>Successfully created user group</trans>
+        <trans>Pomyślnie utworzona nowa grupa</trans>
     </entry> 
     <entry>
         <base>DELETED_GROUP</base>
-        <trans>Successfully removed user group</trans>
+        <trans>Pomyślnie usunięta grupa użytkowników</trans>
     </entry> 
     <entry>
         <base>MODIFIED_GROUP</base>
-        <trans>Successfully modifed user group</trans>
+        <trans>Pomyślnie zmodyfikowana grupa użytkowników</trans>
     </entry>   
     <entry>
         <base>CREATE_ERROR</base>
-        <trans>An error occurred while creating user group.</trans>
+        <trans>Wystąpił błąd podczas tworzenia grupy użytkowników.</trans>
     </entry> 
     <entry>
         <base>DELETE_ERROR</base>
-        <trans>An error occurred while removing user group.</trans>
+        <trans>Wystąpił błąd podczas usunięcia grupy użytkowników.</trans>
     </entry> 
     <entry>
         <base>MODIFY_ERROR</base>
-        <trans>An error occurred while modifying user group.</trans>
+        <trans>Wystąpił błąd podczas modyfikowania grupy użytkowników.</trans>
     </entry>   
     <entry>
         <base>GROUP_NAMING</base>
-        <trans><![CDATA[ The group name should contain only lower-case letters, numbers, hyphens, periods, and underscores, and should start with a lower-case letter. For example "sales", "beta5", and "reseller_partners" are all valid group names, but "3rd-event", "Marketing Team" and "lost&found" are not. ]]></trans>
+        <trans><![CDATA[ Nazwa grupy powinna zawierać tylko małe litery, cyfry, łączniki, kropki i podkreślenia i powinna zaczynać się od małej litery. Na przykład "sprzedaz", "12grupa" i "obrazy_muzyka" są poprawne, ale "Dane użytkowników", "Zarząd&inni", "12@grupa" nie. ]]></trans>
     </entry>
     <entry>
         <base>GROUP_HAS_MEMBERS</base>
-        <trans>This group contains the following members:</trans>
+        <trans>Grupa ta składa się z następujących członków:</trans>
     </entry>
     <entry>
         <base>NOT_A_GROUP</base>
-        <trans>Error: That is not an existing group account.</trans>
+        <trans>Błąd: To konto nie istnieje.</trans>
     </entry>
     <entry>
         <base>GROUP_DESC</base>
-        <trans>Brief Description/Windows Group Alias</trans>
+        <trans>Krótki opis / Alias grupy Windows</trans>
     </entry>
    <entry>
         <base>GROUP_DESC_EXPL</base>
-        <trans>Input a brief group description in the field below. This field also designates the group name viewable by Windows clients.</trans>
+        <trans>Wpisz krótki opis grupy w polu poniżej. To pole również wyznacza nazwę grupy widzianej przez klientów systemu Windows.</trans>
    </entry>
 
 
     <entry>
         <base>IBAYS_WILL_BE_CHANGED</base>
-        <trans>The following information bays were assigned to this group and will be changed to the Administrator group (you can change them to something else afterward):</trans>
+        <trans>Poniższy magazyn danych był przypisany do tej grupy i zostanie zmieniony na grupę administratora (można ją później zmienić):</trans>
     </entry>
     <entry>
         <base>CONFIRM_DELETE_GROUP</base>
-        <trans><![CDATA[ <p><b>Are you sure you wish to remove this group?</b></p> ]]></trans>
+        <trans><![CDATA[ <p><b>Czy napewno chcesz usunąć tę grupę?</b></p> ]]></trans>
     </entry>
     <entry>
         <base>CURRENT_LIST</base>
-        <trans><![CDATA[<p>Current list of User Groups</p>]]></trans>
+        <trans><![CDATA[<p>Lista grup użytkowników</p>]]></trans>
     </entry>
     <entry>
                <base>DELETE_DESCRIPTION</base>
-               <trans><![CDATA[ You are about to remove the user group "<b>{$group}</b>." ]]></trans>
+               <trans><![CDATA[ Masz zamiar usunąć grupę użytkowników "<b>{$group}</b>." ]]></trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/ibays   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/ibays    2010-04-29 07:57:35.000000000 -0600
@@ -5,11 +5,11 @@
     </entry>
     <entry>
         <base>FIRSTPAGE_DESC</base>
-        <trans><![CDATA[ <p> <a class="button-like" href="ibays?page=0&page_stack=&Next=Next&wherenext=CreateModify">Add i-bay</a> </p> <p> You can remove any information bay or reset its password by clicking on the corresponding command next to the information bay. If the information bay shows up in red, that means that the password has not yet been changed from the default, and should be changed soon. </p> ]]></trans>
+        <trans><![CDATA[ <p> <a class="button-like" href="ibays?page=0&page_stack=&Next=Next&wherenext=CreateModify">Dodaj magazyn</a> </p> <p> Możesz usunąć każdy magazyn lub zresetować hasło klikając w odpowiednie polecenie w obok magazynu. Jeśli magazyn pojawi się na czerwono, oznacza to, że hasło nie zostało zmienione z domyślnej wartości i powinny zostać zmienione.</p> ]]></trans>
     </entry>
     <entry>
         <base>ADD_TITLE</base>
-        <trans>Create or modify an i-bay</trans>
+        <trans>Utwórz lub zmodyfikuj magazyn</trans>
     </entry>
     <entry>
         <base>NAME_FIELD_DESC</base>
@@ -45,119 +45,119 @@
     </entry>
     <entry>
         <base>ERROR_WHILE_CREATING_IBAY</base>
-        <trans>An error occurred while creating the i-bay.</trans>
+        <trans>Wystąpił błąd podczas tworzenia magazynu.</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_CREATED_IBAY</base>
-        <trans>Successfully created i-bay.</trans>
+        <trans>Pomyślnie utworzono magazyn.</trans>
     </entry>
     <entry>
         <base>NO_IBAYS</base>
-        <trans>There are no i-bays currently configured.</trans>
+        <trans>Nie ma żadnych obecnie skonfigurowanych magazynów.</trans>
     </entry>
     <entry>
         <base>CANT_FIND_IBAY</base>
-        <trans>Can't find account for {$name} (does it exist?)</trans>
+        <trans>Nie udało się znaleźć konta dla {$name}(czy istnieje?)</trans>
     </entry>
     <entry>
         <base>CANT_CREATE_IBAY</base>
-        <trans>Can't create new account for {$name} (does it already exist?)</trans>
+        <trans>Nie udało się utworzyć nowego konta dla {$name}(czy już istnieje?)</trans>
     </entry>
     <entry>
         <base>ERROR_WHILE_MODIFYING_IBAY</base>
-        <trans>An error occurred while modifying the i-bay.</trans>
+        <trans>Wystąpił błąd podczas modyfikowania magazynu.</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_MODIFIED_IBAY</base>
-        <trans>Successfully modified i-bay.</trans>
+        <trans>Pomyślnie zmodyfikowano magazyn.</trans>
     </entry>
     <entry>
         <base>VIRTUAL_HOST_MESSAGE</base>
-        <trans>The following virtual domains were using this information bay as their content and will be changed to the primary web site (you can change them to something else afterward).</trans>
+        <trans>Poniższe wirtualne domeny używały tego magazynu, jako głównego, który zostanie zmieniony do głównej witryny sieci Web (możesz zmienić go na inny w późniejszym czasie).</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_DELETED_IBAY</base>
-        <trans>Successfully deleted i-bay.</trans>
+        <trans>Pomyślnie usunięto magazyn.</trans>
     </entry>
     <entry>
         <base>ERROR_WHILE_DELETING_IBAY</base>
-        <trans>An error occurred while deleting the i-bay.</trans>
+        <trans>Wystąpił błąd podczas usuwania magazynu.</trans>
     </entry>
     <entry>
         <base>PASSWORD_DESC</base>
-        <trans>You are about to change the password for the i-bay {$name}.</trans>
+        <trans>Masz zamiar zmienić hasło dla magzynu {$name}.</trans>
     </entry>
     <entry>
         <base>IBAY_PASSWD_VALIDATION_ERROR</base>
-        <trans>The password may contain only letters and numbers.</trans>
+        <trans>Hasło może zawierać tylko litery i cyfry.</trans>
     </entry>
     <entry>
         <base>IBAY_PASSWD_VERIFY_ERROR</base>
-        <trans>The passwords do not match.</trans>
+        <trans>Hasła nie zgadzają się.</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_RESET_PASSWORD</base>
-        <trans>Successfully reset password.</trans>
+        <trans>Pomyślnie zresetowano hasło.</trans>
     </entry>
     <entry>
         <base>ERROR_WHILE_RESETTING_PASSWORD</base>
-        <trans>Error while resetting password.</trans>
+        <trans>Wystąpił błąd podczas resetowania hasła.</trans>
     </entry>
     <entry>
         <base>VHOST_MESSAGE</base>
-        <trans><![CDATA[ <P>The following virtual domains were using this information bay as their content and will be changed to the primary web site (you can change them to something else afterward):</P> <ul>{$vhostList}</ul> ]]></trans>
+        <trans><![CDATA[ <P>Poniższe wirtualne domeny używały tego magazynu, jako głównego, który zostanie zmieniony do głównej witryny sieci Web (możesz zmienić go na inny w późniejszym czasie):</P> <ul>{$vhostList}</ul> ]]></trans>
     </entry>
     <entry>
         <base>Information bays</base>
-        <trans>Information bays</trans>
+        <trans>Magazyn informacji</trans>
     </entry>
     <entry>
         <base>WGRG</base>
-        <trans>Write = group, Read = group</trans>
+        <trans>Zapis = grupa, Odczyt = grupa</trans>
     </entry>
     <entry>
         <base>WGRE</base>
-        <trans>Write = group, Read = everyone</trans>
+        <trans>Zapis  = grupa, Odczyt = wszyscy</trans>
     </entry>
     <entry>
         <base>WARG</base>
-        <trans>Write = admin, Read = group</trans>
+        <trans>Zapis = administrator, Odczyt = grupa</trans>
     </entry>
     <entry>
         <base>NONE</base>
-        <trans>No access</trans>
+        <trans>Brak dostępu</trans>
     </entry>
     <entry>
         <base>LOCAL_NETWORK_NO_PASSWORD</base>
-        <trans>Local network (no password required)</trans>
+        <trans>Sieć lokalna (nie wymaga hasła)</trans>
     </entry>
     <entry>
         <base>LOCAL_NETWORK_PASSWORD</base>
-        <trans>Local network (password required)</trans>
+        <trans>Sieć lokalna (wymagaj hasła)</trans>
     </entry>
     <entry>
         <base>ENTIRE_INTERNET_NO_PASSWORD</base>
-        <trans>Entire Internet (no password required)</trans>
+        <trans>Internet (nie wymagaj hasła)</trans>
     </entry>
     <entry>
         <base>ENTIRE_INTERNET_PASSWORD</base>
-        <trans>Entire Internet (password required)</trans>
+        <trans>Internet (wymagaj hasła)</trans>
     </entry>
     <entry>
         <base>ENTIRE_INTERNET_PASSWORD_REMOTE</base>
-        <trans>Entire Internet (password required outside local network)</trans>
+        <trans>Internet (hasło wymagane z poza lokalnej sieci)</trans>
     </entry>
     <entry>
         <base>INVALID_IBAY_DESCRIPTION</base>
-        <trans>Error: unexpected or missing characters in i-bay description</trans>
+        <trans>Błąd: niespodziewane lub nieprawidłowe znaki w opisie magazynu</trans>
     </entry>
     <entry>
         <base>ACCT_NAME_HAS_INVALID_CHARS</base>
-        <trans>The i-bay name "{$acctName}" contains invalid characters. I-bay names must start with a lower case letter and contain only lower case letters, numbers, and hyphens.</trans>
+        <trans>Magazyn "{$acctName}" zawiera nieprawidłowe znaki. Nazwa magazynu musi zaczynać się od małej litery i zawierać tylko litery, cyfry i łączniki.</trans>
     </entry>
     <entry>
         <base>MAX_IBAY_NAME_LENGTH_ERROR</base>
-        <trans>The i-bay name "{$name}" is too long. The maximum is {$maxIbayNameLength} characters.</trans>
+        <trans>Nazwa magazynu "{$name}" jest za długa. Maksymalna długość wynosi {$maxIbayNameLength} znaków.</trans>
     </entry>
     <entry>
         <base>ACCT_CLASHES_WITH_PSEUDONYM</base>
@@ -165,6 +165,6 @@
     </entry>
     <entry>
         <base>ACCOUNT_EXISTS</base>
-        <trans>The account "{$acctName}" is an existing {$acctType} account.</trans>
+        <trans>Konto "{$acctName}" jest obecnym  kontem {$acctType}.</trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/initial.cgi     2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/initial.cgi      2010-04-29 07:57:43.000000000 -0600
@@ -1,16 +1,16 @@
 <lexicon lang="pl">
     <entry>
        <base>FORM_TITLE</base>
-       <trans>Welcome to the server manager</trans>
+       <trans>Witamy w menedżerze serwera</trans>
     </entry>
 
     <entry>
        <base>FRAMES_BODY</base>
-       <trans><![CDATA[ <p> Welcome to SME Server, the leading Linux distribution for small and medium enterprises. SME Server is brought to you by <A HREF="http://www.smeserver.org/" TARGET="_blank">SME Server, Inc.</A>, a non-profit corporation that exists to provide marketing and legal support for SME Server. </p> <p> SME Server is freely available under the GNU General Public License and is only possible through the efforts of the SME Server community. However, the availability and quality of SME Server is dependent on meeting our expenses, such as hosting costs, server hardware, etc. </p> <p> As such, we ask for a small donation to offset costs and fund further development. </p> <p> <b> Please visit <A HREF="http://www.smeserver.org/donate/" TARGET="_blank">http://www.smeserver.org/donate/</A> to donate. </b></P> <p> This software comes with ABSOLUTELY NO WARRANTY. Please <A HREF="/server-manager/support/" TARGET="main">click here</A> to view detailed support, warranty and licensing information. </p> <p> To perform a system administration function, click one of the links in the menu on the left of your screen. </p> ]]></trans>
+       <trans><![CDATA[ <p> Witamy w SME Server, dystrybucji Linuksa dla małych i średnich przedsiębiorstw. SME Server zostało przygotowane dla Ciebie przez <A HREF="http://www.smeserver.org/" TARGET="_blank">SME Server, Inc.</A>, korporacją non-profit, która istnieje, aby zarządzać marketingiem i wsparciem dla SME Server. </p> <p> SME Server jest dystrybucją ogólnodostępną, rozprowadzaną na licencji GNU GPL i jest tylko dzięki wysiłkom społeczności SME Server. Jednakże, dostępność i jakość SME Server jest uzależniona od naszych wydatków, jak koszty hostingu, serwera, itp. </p> <p> <b> Proszę odwiedzić <A HREF="http://www.smeserver.org/donate/" TARGET="_blank">http://www.smeserver.org/donate/</A>, aby wesprzeć pieniężnie projekt. </b></P> <p> Ten projekt jest rozprowadzany ABSOLUTNIE BEZ ŻADNEJ GWARANCJI. Proszę <A HREF="/server-manager/support/" TARGET="main">tutaj kliknąć</A>, aby wyświetlić szczegóły wsparcia, gwarancji i licencji. </p> <p> Aby przygotować funkcję administracji systemem, kliknij na jeden z hiperłączy w menu po lewej stronie monitora. </p> ]]></trans>
     </entry>
 
     <entry>
        <base>NOFRAMES_BODY</base>
-       <trans><![CDATA[ <p> Welcome to the SME Server. This software comes with ABSOLUTELY NO WARRANTY. Please <A HREF="/server-manager/support/" TARGET="main">click here</A> to view detailed support, warranty and licensing information. </p> <p> <A HREF="/server-manager/noframes">Click here</A> for a list of system administration functions. </p> ]]></trans>
+       <trans><![CDATA[ <p> Witamy w SME Server. To oprogramowanie jest rozprowadzane BEZ ŻADNEJ GWARANCJI. Proszę <A HREF="/server-manager/support/" TARGET="main">tutaj kliknąć</A>, aby wyświetlić szczegóły wsparcia, gwarancji i licencji.</p> <p> <A HREF="/server-manager/noframes">Kliknij tutaj</A> aby zobaczyć listę funkcji administracji systemem. </p> ]]></trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/localnetworks   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/localnetworks    2010-04-29 07:57:53.000000000 -0600
@@ -23,7 +23,7 @@
     </entry>
     <entry>
         <base>SUBNET_MASK</base>
-        <trans>Subnet mask</trans>
+        <trans>Maska podsieci</trans>
     </entry>
     <entry>
         <base>INVALID_IP_ADDRESS</base>
@@ -31,7 +31,7 @@
     </entry>
     <entry>
         <base>INVALID_SUBNET_MASK</base>
-        <trans>Invalid subnet mask</trans>
+        <trans>Nieprawidłowa maska podsieci</trans>
     </entry>
     <entry>
         <base>REMOVE_TITLE</base>
@@ -51,7 +51,7 @@
     </entry>
     <entry>
         <base>NUMBER_OF_HOSTS</base>
-        <trans>Number of hosts</trans>
+        <trans>Liczba hostów</trans>
     </entry>
     <entry>
         <base>NOT_ACCESSIBLE_FROM_LOCAL_NETWORK</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/proxy   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/proxy    2010-04-29 07:58:48.000000000 -0600
@@ -1,38 +1,42 @@
 <lexicon lang="pl">
     <entry>
         <base>Proxy settings</base>
-        <trans>Proxy settings</trans>
+        <trans>Ustawienia proxy</trans>
     </entry>
     <entry>
         <base>FIRST_PAGE_DESCRIPTION</base>
-        <trans>This page allows configuration of the server's proxy settings. The server includes a transparent proxy and cache for HTTP traffic. This is enabled by default, but not enforced if the server is in &quot;serveronly&quot; mode. If this server is acting as an e-mail server, connections from local network clients to external SMTP servers will default to being redirected to the local e-mail server.</trans>
+        <trans>Ta strona umożliwia konfigurowanie ustawień serwera proxy. Serwer zawiera transparentny proxy i cache dla ruchu HTTP. Serwer jest domyślnie włączony, ale nie działa prawidłowo, jeśli serwer jest w ustawiony w trybie &quot;serwera&quot;. Jeśli serwer działa jako serwer e-mail, połączenia z klientów sieci lokalnej do serwerów SMTP będą domyślnie przekierowywane do lokalnego serwera e-mail.</trans>
     </entry>
     <entry>
         <base>HTTP_PROXY_STATUS_DESCRIPTION</base>
-        <trans>The server's HTTP proxy works to reduce overall uplink usage by caching recently-visited pages. It is transparent to web browsers using this server as their gateway. Enable or disable this proxy with the following toggle.</trans>
+        <trans>Serwer proxy HTTP działa na zasadzie zmniejszenia ogólnego użytkowania sieci poprzez buforowanie ostatnio odwiedzanych stron. Jest niewidoczny dla przeglądarek internetowych za pomocą którego łączą się poprzez ten serwer. Możesz włączyć lub wyłączyć serwer proxy następującymi przełącznikami.</trans>
     </entry>
     <entry>
         <base>HTTP_PROXY_STATUS_LABEL</base>
-        <trans>HTTP proxy status</trans>
+        <trans>Status proxy HTTP</trans>
     </entry>
     <entry>
         <base>SMTP_PROXY_STATUS_DESCRIPTION</base>
-        <trans>The server's transparent SMTP proxy works to reduce virus traffic from infected client hosts by forcing all outgoing SMTP traffic through this server. If you wish to use an alternate SMTP server, and this server is your gateway to it, disable this proxy.</trans>
+        <trans>Transparentny serwer proxy SMTP działa, aby redukować ruch wirusów z zainfekowanych hostow poprzez przekierowanie wszystkich wychodzących tras SMTP na ten serwer. Jeżeli chcesz korzystać z alternatywnego serwera SMTP, a serwer jest bramą do niej, wyłącz proxy.</trans>
     </entry>
     <entry>
         <base>SMTP_PROXY_STATUS_LABEL</base>
-        <trans>SMTP proxy status</trans>
+        <trans>Status proxy SMTP</trans>
     </entry>
     <entry>
         <base>ERR_PROXY_UPDATE_FAILED</base>
-        <trans>ERROR: The proxy-update event returned an error.</trans>
+        <trans>Błąd: Zdarzenie aktualizacji proxy zwróciło błąd.</trans>
     </entry>
     <entry>
         <base>ERR_NO_SQUID_REC</base>
-        <trans>ERROR: There is no squid record in the configuration database.</trans>
+        <trans>Błąd: Nie ma rekordu w bazie danych konfiguracji.</trans>
     </entry>
     <entry>
         <base>SUCCESS</base>
-        <trans>The new proxy settings were applied successfully.</trans>
+        <trans>Nowe ustawienia proxy zostały ustawione pomyślnie.</trans>
+    </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Zablokowany</trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/qmailanalog     2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/qmailanalog      2010-04-29 07:59:08.000000000 -0600
@@ -1,7 +1,7 @@
 <lexicon lang="pl">
     <entry>
        <base>FORM_TITLE</base>
-       <trans>Mail Log File Analysis</trans>
+       <trans>Plik analizy dziennika poczty</trans>
     </entry>
     <entry>
        <base>INITIAL_DESC</base>
@@ -9,23 +9,23 @@
     </entry>
     <entry>
        <base>REPORT_TYPE</base>
-       <trans>Choose a report type</trans>
+       <trans>Wybierz typ raportu</trans>
     </entry>
     <entry>
        <base>GENERATE_REPORT</base>
-       <trans>Generate report</trans>
+       <trans>Wygeneruj raport</trans>
     </entry>
     <entry>
        <base>LIST_OUTGOING</base>
-       <trans>List outgoing messages and recipients</trans>
+       <trans>Lista wychodzących wiadomości i odbiorców</trans>
     </entry>
     <entry>
        <base>SUMMARIZE_QUEUE</base>
-       <trans>Summarize status of mail queue</trans>
+       <trans>Podsumuj stan kolejki wiadomości</trans>
     </entry>
     <entry>
        <base>SUCCESSFUL_DELIVERY_DELAY</base>
-       <trans>Successful delivery delay distribution</trans>
+       <trans>Skuteczne dostarczenie opóźnionej dystrybucji</trans>
     </entry>
     <entry>
        <base>REASONS_DEFERRAL</base>
@@ -37,7 +37,7 @@
     </entry>
     <entry>
        <base>BASIC_STATS</base>
-       <trans>Basic statistics</trans>
+       <trans>Podstawowe statystyki</trans>
     </entry>
     <entry>
        <base>RECIP_STATS</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/quota   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/quota    2010-04-29 07:59:18.000000000 -0600
@@ -17,7 +17,7 @@
     </entry>
     <entry>
       <base>LIMIT_WITH_GRACE</base>
-      <trans>Limit with grace period</trans>
+      <trans>Limit okresu karencji</trans>
     </entry>
     <entry>
       <base>LIMIT_WITH_GRACE_MB</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/remoteaccess    2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/remoteaccess     2010-04-29 07:59:38.000000000 -0600
@@ -69,39 +69,39 @@
     </entry>
     <entry>
        <base>DESC_PPTP</base>
-       <trans><![CDATA[ <hr class="sectionbar" /><h2>PPTP Settings</h2> You can allow PPTP access to your server. You should leave this feature disabled by setting the value to the number 0 unless you require PPTP access. ]]></trans>
+       <trans><![CDATA[ <hr class="sectionbar" /><h2>Ustawienia PPTP</h2> Możesz zezwolić na dostęp do sieci poprzez PPTP. Powinieneś zostawić wyłączoną usługę, poprzez ustawienie tej wielkości na 0, chyba że potrzebujesz dostępu poprzez PPTP. ]]></trans>
     </entry>
     <entry>
        <base>VALUE_ZERO_OR_POSITIVE</base>
-       <trans>Value must be zero or a positive integer</trans>
+       <trans>Wartość musi być większa lub równa zeru</trans>
     </entry>
     <entry>
        <base>REMOTE_MANAGEMENT</base>
-       <trans>Remote Management</trans>
+       <trans>Zdalne zarządzanie</trans>
     </entry>
     <entry>
        <base>VALIDFROM_DESC</base>
-       <trans><![CDATA[ <hr class="sectionbar" /><h2>{$REMOTE_MANAGEMENT}</h2> <p>It is possible to allow hosts on remote networks to access the server manager by entering those networks here. Use a subnet mask of 255.255.255.255 to limit the access to the specified host. Any hosts within the specified range will be able to access the server manager using HTTPS.</p> ]]></trans>
+       <trans><![CDATA[ <hr class="sectionbar" /><h2>{$REMOTE_MANAGEMENT}</h2> <p>Możliwe jest, aby zezwolić hostom w sieci zdalnej do dostępu do menedżera serwera poprzez wpisanie tutaj tych sieci. Użyj maski od 255.255.255.255, aby ograniczyć dostęp do poszczególnych hostów. Wszystkie hosty mieszczące się w randze, będą miały dostęp do menedżera serwera poprzez protokół HTTPS.</p> ]]></trans>
     </entry>
     <entry>
        <base>DESC_VALID_FROM_ENTRIES</base>
-       <trans>To add a new remote management network, enter the details below.</trans>
+       <trans>Aby dodać nową zdalnie zarządzaną siecią, wpisz szczegóły sieci poniżej.</trans>
     </entry>
     <entry>
        <base>SUBNET_MASK</base>
-       <trans>Subnet mask</trans>
+       <trans>Maska podsieci</trans>
     </entry>
     <entry>
        <base>NUM_OF_HOSTS</base>
-       <trans>Number of hosts</trans>
+       <trans>Liczba hostów</trans>
     </entry>
     <entry>
        <base>NO_ENTRIES_YET</base>
-       <trans>There are no entries yet</trans>
+       <trans>Tutaj nie ma jeszcze wpisów</trans>
     </entry>
     <entry>
        <base>INVALID_SUBNET_MASK</base>
-       <trans>Invalid subnet mask</trans>
+       <trans>Nieprawidłowa maska podsieci</trans>
     </entry>
     <entry>
        <base>ERR_INVALID_PARAMS</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/review  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/review   2010-04-29 07:59:54.000000000 -0600
@@ -1,126 +1,126 @@
 <lexicon lang="pl">
     <entry>
         <base>Review configuration</base>
-        <trans>Review configuration</trans>
+        <trans>Przegląd konfiguracji</trans>
     </entry>   
     <entry>
         <base>DESCRIPTION</base>
-        <trans>This report summarizes the networking, server, and domain parameters on this server relevant to configuring the client computers on your network. You may wish to print this page and use it as a reference.</trans>    
+        <trans>Niniejszy raport podsumowuje sieci, serwery i parametry domeny na tym serwerze dotyczących konfiguracji komputerów klienckich w sieci. Możesz wydrukować tę stronę i używać go jako punkt odniesienia.</trans>  
     </entry>
     <entry>
         <base>NETWORKING_PARAMS</base>
-        <trans>Networking Parameters</trans>
+        <trans>Parametry sieci</trans>
     </entry> 
     <entry>
         <base>SERVER_MODE</base>
-        <trans>Server Mode</trans>
+        <trans>Tryb serwera</trans>
     </entry>
     <entry>
         <base>LOCAL_IP_ADDRESS_SUBNET_MASK</base>
-        <trans>Local IP address / subnet mask</trans>
+        <trans>Lokalny adres IP / maska podsieci</trans>
     </entry>
     <entry>
         <base>EXTERNAL_IP_ADDRESS_SUBNET_MASK</base>
-        <trans>External IP address / subnet mask</trans>
+        <trans>Zewnętrzny adres IP / maska podsieci</trans>
     </entry>
     <entry>
         <base>GATEWAY</base>
-        <trans>Gateway</trans>
+        <trans>Brama</trans>
     </entry>
     <entry>
         <base>ADDITIONAL_LOCAL_NETWORKS</base>
-        <trans>Additional local networks</trans>
+        <trans>Dodatkowe sieci lokalne</trans>
     </entry>
     <entry>
         <base>DHCP_SERVER</base>
-        <trans>DHCP server</trans>
+        <trans>Serwer DHCP</trans>
     </entry>
     <entry>
         <base>BEGINNING_OF_DHCP_ADDRESS_RANGE</base>
-        <trans>Beginning of DHCP address range</trans>
+        <trans>Początek zakresu adresów DHCP</trans>
     </entry>
     <entry>
         <base>END_OF_DHCP_ADDRESS_RANGE</base>
-        <trans>End of DHCP address range</trans>
+        <trans>Koniec zakresu adresów DHCP</trans>
     </entry>
     <entry>
         <base>SERVER_NAMES</base>
-        <trans>Server names</trans>
+        <trans>Serwery nazw (DNS)</trans>
     </entry>
     <entry>
         <base>DNS_SERVER</base>
-        <trans>DNS server</trans>
+        <trans>Serwer DNS</trans>
     </entry>
     <entry>
         <base>WEB_SERVER</base>
-        <trans>Web server</trans>
+        <trans>Serwer WWW</trans>
     </entry>
     <entry>
         <base>PROXY_SERVER</base>
-        <trans>Proxy server</trans>
+        <trans>Serwer proxy</trans>
     </entry>
     <entry>
         <base>FTP_SERVER</base>
-        <trans>FTP server</trans>
+        <trans>Serwer FTP</trans>
     </entry>
     <entry>
         <base>SMTP_POP_AND_IMAP_MAIL_SERVERS</base>
-        <trans>SMTP, POP, and IMAP mail servers</trans>
+        <trans>Serwer poczty SMTP, POP i IMAP</trans>
     </entry>
     <entry>
         <base>HOSTS</base>
-        <trans>Hosts</trans>
+        <trans>Hosty</trans>
     </entry> 
     <entry>
         <base>DOMAIN_INFORMATION</base>
-        <trans>Domain information</trans>
+        <trans>Informacje domeny</trans>
     </entry>
     <entry>
         <base>PRIMARY_DOMAIN</base>
-        <trans>Primary domain</trans>
+        <trans>Domena podstawowa</trans>
     </entry>
     <entry>
         <base>VIRTUAL_DOMAINS</base>
-        <trans>Virtual domains</trans>
+        <trans>Domena wirtualna</trans>
     </entry>
     <entry>
         <base>PRIMARY_WEB_SITE</base>
-        <trans>Primary web site</trans>
+        <trans>Podstawowa witryna sieci Web</trans>
     </entry>
     <entry>
         <base>MITEL_NETWORKS_SME_SERVER_MANAGER</base>
-        <trans>Server manager</trans>
+        <trans>Menedżer serwera</trans>
     </entry>
     <entry>
         <base>MITEL_NETWORKS_SME_SERVER_USER_PASSWORD_PANEL</base>
-        <trans>User password panel</trans>
+        <trans>Panel hasła użytkownika</trans>
     </entry>
     <entry>
         <base>EMAIL_ADDRESSES</base>
-        <trans>Email Addresses</trans>
+        <trans>Adresy email</trans>
     </entry>
     <entry>
         <base>EMAIL_USERACCOUNT</base>
-        <trans>useraccount</trans>
+        <trans>nazwa użytkownika</trans>
     </entry>
     <entry>
         <base>EMAIL_FIRSTNAME</base>
-        <trans>firstname</trans>
+        <trans>pierwsze imię</trans>
     </entry>
     <entry>
         <base>EMAIL_LASTNAME</base>
-        <trans>lastname</trans>
+        <trans>drugie imię</trans>
     </entry>
     <entry>
         <base>NO_VIRTUAL_DOMAINS</base>
-        <trans>No virtual domains defined</trans>
+        <trans>Brak zdefiniowanych domen wirtualnych</trans>
     </entry>
     <entry>
         <base>NO_NETWORKS</base>
-        <trans>No additional networks defined</trans>
+        <trans>Brak dodatkowych zdefiniowanych sieci</trans>
     </entry>
     <entry>
         <base>INTERNET_VISIBLE_ADDRESS</base>
-        <trans>Internet Visible IP Address</trans>
+        <trans>Widzialny internetowy adres IP</trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/workgroup       2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/workgroup        2010-04-29 08:01:51.000000000 -0600
@@ -1,58 +1,58 @@
 <lexicon lang="pl">
     <entry>
         <base>FORM_TITLE</base>
-        <trans>Change workgroup settings</trans>
+        <trans>Zmień ustawienia grupy roboczej</trans>
     </entry>   
     <entry> 
         <base>DESC_WORKGROUP</base>
-        <trans><![CDATA[ Enter the name of the Windows workgroup that this server should appear in. ]]></trans>        
+        <trans><![CDATA[ Wpisz nazwę grupy roboczej systemu Windows, w której ten serwer powinien się pojawić. ]]></trans>     
     </entry>
     <entry>
         <base>LABEL_WORKGROUP</base>
-        <trans>Windows workgroup</trans>
+        <trans>Grupa robocza Windows</trans>
     </entry>
     <entry>
         <base>DESC_SERVERNAME</base>
-        <trans>Enter the name that this server should use for Windows and Macintosh file sharing.</trans>
+        <trans>Wpisz nazwę jaką ten serwer będzie się posługiwał w udostępnianiu plików w sieci Windows i Macintosh.</trans>
     </entry>
     <entry>
         <base>LABEL_SERVERNAME</base>
-        <trans>Server Name</trans>
+        <trans>Nazwa serwera</trans>
     </entry>
     <entry>
         <base>DESC_PDC</base>
-        <trans><![CDATA[Should this server act as the workgroup and domain controller on your Windows network? You should leave this set to <b>No</b> if another server is already performing this role on your network.]]></trans>
+        <trans><![CDATA[Czy chcesz, aby ten serwer pełnił rolę kontrolera domeny w sieci Windows? Powinieneś zostawić opcję <b>Nie</b>, jeżeli inny serwer pełni tę rolę w twojej sieci.]]></trans>
     </entry>
     <entry>
         <base>LABEL_PDC</base>
-        <trans>Workgroup and Domain Controller</trans>
+        <trans>Kontroler domeny</trans>
     </entry>
     <entry>
         <base>DESC_ROAM</base>
-        <trans><![CDATA[ Should this server support roaming profiles? You should leave this set to the default of <b>No</b> unless you have experience administering server-based Windows roaming profiles and know that this feature is required. ]]></trans>
+        <trans><![CDATA[ Czy ten serwer powinien wspierać profile mobilne? Powinieneś zostawić opcję <b>Nie</b>, chyba że posiadasz doświadczenie w administracji profilów Windows i wiesz, że ta funkcja jest w sieci niezbędna. ]]></trans>
     </entry>
     <entry>
         <base>LABEL_ROAM</base>
-        <trans>Roaming profiles</trans>
+        <trans>Profile mobilne</trans>
     </entry>
     <entry>
         <base>SUCCESS</base>
-        <trans>The new workgroup settings have been saved</trans>
+        <trans>Nowe ustawienia grupy roboczej zostały zapisane</trans>
     </entry>
     <entry>
         <base>INVALID_WORKGROUP</base>
-        <trans>The workgroup name must begin with a letter (upper or lower case), followed by any combination of letters, numbers, underscores, periods and hyphens.</trans>
+        <trans>Nazwa grupy roboczej musi zaczynać się od litery (wielkie lub małe litery), a następnie dowolną kombinacją liter, cyfr, podkreśleń, okresów i łączników.</trans>
     </entry>
     <entry>
         <base>INVALID_SERVERNAME</base>
-        <trans>The server name must begin with a letter (upper or lower case), followed by any combination of letters, numbers, underscores and hyphens.</trans>
+        <trans>Nazwa serwera musi zaczynać się od litery (wielkie lub małe litery), a następnie dowolną kombinacją liter, cyfr, podkreśleń i myślników.</trans>
     </entry>
     <entry>
         <base>INVALID_WORKGROUP_MATCHES_SERVERNAME</base>
-        <trans>The server and workgroup names match, when compared in lower case. These values must be different in order for filesharing to be turned on.</trans>
+        <trans>Nazwa serwera i grupy roboczej powinna być różna. Wartości te muszą być inne w celu udostępniania plików, którą ten serwer pełni rolę.</trans>
     </entry>
     <entry>
         <base>Workgroup</base>
-        <trans>Workgroup</trans>
+        <trans>Grupa robocza</trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/yum     2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/yum      2010-04-29 08:02:01.000000000 -0600
@@ -13,17 +13,17 @@
 
     <entry>
         <base>LABEL_YUM_STATUS</base>
-        <trans>Check for updates</trans>
+        <trans>Sprawdź dostępne aktualizacje</trans>
     </entry>
 
     <entry>
        <base>LABEL_YUM_AUTOINSTALLUPDATES</base>
-       <trans>Automatically install updates</trans>
+       <trans>Automatycznie zainstaluj aktualizacje</trans>
    </entry>
 
     <entry>
        <base>LABEL_YUM_PACKAGEFUNCTIONS</base>
-       <trans>Manage individual packages</trans>
+       <trans>Zarządzaj indywidualnymi paczkami</trans>
     </entry>
 
     <entry>
@@ -103,27 +103,27 @@
 
     <entry>
        <base>HEADER_INSTALLED_SOFTWARE</base>
-       <trans>The following software is installed on this system. You should only remove software from this system if you are aware of the consequences of doing so.</trans>
+       <trans>Poniższe oprogramowanie jest zainstalowane w systemie. Powinieneś usuwać oprogramowanie, jeśli jesteś świadomy konsekwencji tego czynu.</trans>
     </entry>
 
     <entry>
        <base>DESC_INSTALLED_GROUPS</base>
-       <trans>You can select software groups to remove from the list below.</trans>
+       <trans>Możesz zaznaczyć grupy oprogramowanie do usunięcia z poniższej listy.</trans>
     </entry>
 
     <entry>
        <base>LABEL_INSTALLED_GROUPS</base>
-       <trans>Installed groups</trans>
+       <trans>Zainstalowane grupy</trans>
     </entry>
 
     <entry>
        <base>DESC_INSTALLED_PACKAGES</base>
-       <trans>You can also select individual packages you wish to remove from the list below.</trans>
+       <trans>Możesz także zaznaczyć indywidualnie paczki, jakie chcesz usunąć z poniższej listy.</trans>
     </entry>
 
     <entry>
        <base>LABEL_INSTALLED_PACKAGES</base>
-       <trans>Installed packages</trans>
+       <trans>Zainstalowane paczki</trans>
     </entry>
 
     <entry>
@@ -163,7 +163,7 @@
 
     <entry>
       <base>3MONTHLY</base>
-      <trans>Monthly</trans>
+      <trans>Miesięcznie</trans>
     </entry>
  
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pt/etc/e-smith/web/functions/proxy   2008-10-07 09:28:35.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pt/etc/e-smith/web/functions/proxy    2010-04-29 07:58:48.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>As novas configurações do proxy foram aplicadas com sucesso.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Bloqueado</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/backup       2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/backup        2010-04-29 07:54:46.000000000 -0600
@@ -125,7 +125,7 @@
   </entry>
   <entry>
    <base>VERIFY_BACKUP_DESC</base>
-   <trans><![CDATA[ <p>Esta opção irá mostrar todos os nomes de arquivo criada previamente no arquivo de backup do desktop. Você pode usar esta opção para verificar o conteúdo do arquivo de backup.</p> <p>O último arquivo contido no arquivo de backup deverá ser o arquivo chamado "smbpasswd".</p> ]]></trans>
+   <trans><![CDATA[ <p>Esta opção irá mostrar todos os nomes de arquivos de backup para desktop criados anteriormente. Você pode usar esta opção para verificar o conteúdo do arquivo de backup.</p> ]]></trans>
   </entry>
   <entry>
    <base>SELECT_BACKUP_FILE</base>
@@ -149,7 +149,7 @@
   </entry>
   <entry>
    <base>RESTORE_IN_PROGRESS_DESC</base>
-   <trans>Depois que a restauração estiver completada você tem que reinicializar o servidor. Sua restauração estará completa quando /etc/smbpasswd for restaurado e as palavras "Restauração concluida" aparecerem na parte de baixo de sua tela.</trans>
+   <trans>Depois que a restauração estiver completada você precisa reinicializar o servidor. Sua restauração estará completa quando as palavras "Restauração concluida" aparecerem na parte de baixo de sua tela.</trans>
   </entry>
   <entry>
    <base>FILES_HAVE_BEEN_RESTORED</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/emailsettings        2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/emailsettings 2010-04-29 07:56:11.000000000 -0600
@@ -272,7 +272,7 @@
 
     <entry>
         <base>DESC_STATE_DELIVERY</base>
-        <trans><![CDATA[ <hr class="sectionbar"/><h2>Entrega de E-mail</h2> ]]></trans>
+        <trans><![CDATA[ <hr class="sectionbar"/><h2>Entrega de e-mail</h2> ]]></trans>
     </entry>
 
     <entry>
@@ -306,12 +306,12 @@
 
     <entry>
        <base>LABEL_SPAM_SUBJECT</base>
-       <trans>SPAM subject prefix</trans>
+       <trans>prefixo do assunto quando SPAM</trans>
     </entry>
 
     <entry>
        <base>DESC_SPAM_SUBJECT</base>
-       <trans>You can enable to add a tag to the subject of each message that is classified as SPAM. The value for this tag can be defined below.</trans>
+       <trans>Você pode habilitar aqui o acréscimo de um prefixo no assunto de cada mensagem que o servidor classificar como SPAM. Este prefixo pode ser definido abaixo.</trans>
     </entry>
 
    <entry>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/portforwarding       2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/portforwarding        2010-04-29 07:58:29.000000000 -0600
@@ -109,6 +109,6 @@
     </entry>
     <entry>
         <base>IN_SERVERONLY</base>
-        <trans>Este servidor está atuando no modo Somente Servidor e redirecinamento de porta(s) não é possível.</trans>
+        <trans>Este servidor está atuando no modo Somente Servidor assim o redirecinamento de portas não é possível.</trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/proxy        2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/proxy 2010-04-29 07:58:49.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>As novas configurações do proxy foram aplicadas com sucesso.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Bloqueado</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/ro/etc/e-smith/web/functions/proxy   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/ro/etc/e-smith/web/functions/proxy    2010-04-29 07:58:49.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>The new proxy settings were applied successfully.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Blocked</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/ru/etc/e-smith/web/functions/proxy   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/ru/etc/e-smith/web/functions/proxy    2010-04-29 07:58:49.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>Новые настройки прокси успешно применены.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Blocked</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/sl/etc/e-smith/web/functions/proxy   2008-03-07 13:53:45.000000000 -0700
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/sl/etc/e-smith/web/functions/proxy    2010-04-29 07:58:49.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>Nastavitve proxy streznika so uspesno posodobljene.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Blocked</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/backup  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/backup   2010-04-29 07:54:49.000000000 -0600
@@ -125,7 +125,7 @@
   </entry>
   <entry>
    <base>VERIFY_BACKUP_DESC</base>
-   <trans><![CDATA[ <p>Detta val kommer att visa namnet på alla filer i den förut skapade backupfilen som ligger på klienten. Du kan använda detta val till att verifiera innehållet på backupfilen.</p> <p>Den sista filen i backupfilen skall vara filen med namnet "smbpasswd".</p> ]]></trans>
+   <trans><![CDATA[ <p>Detta val kommer att visa namnet på alla filer i den förut skapade backupfilen som ligger på klienten. Du kan använda detta val till att verifiera innehållet på backupfilen.</p> ]]></trans>
   </entry>
   <entry>
    <base>SELECT_BACKUP_FILE</base>
@@ -149,7 +149,7 @@
   </entry>
   <entry>
    <base>RESTORE_IN_PROGRESS_DESC</base>
-   <trans>Efter det att återställningen är klar måste du starta om servern. Din återställning är klar när /etc/smbpasswd har blivit återställd och orden "Återställning genomförd" visas i nederkanten på din skärm.</trans>
+   <trans>Efter det att återställningen är klar måste du starta om servern. Din återställning är klar när "Återställning genomförd" visas i nederkanten på din skärm.</trans>
   </entry>
   <entry>
    <base>FILES_HAVE_BEEN_RESTORED</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/emailsettings   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/emailsettings    2010-04-29 07:56:13.000000000 -0600
@@ -306,12 +306,12 @@
 
     <entry>
        <base>LABEL_SPAM_SUBJECT</base>
-       <trans>SPAM subject prefix</trans>
+       <trans>Prefix i ämnet för SPAM</trans>
     </entry>
 
     <entry>
        <base>DESC_SPAM_SUBJECT</base>
-       <trans>You can enable to add a tag to the subject of each message that is classified as SPAM. The value for this tag can be defined below.</trans>
+       <trans>Du kan tillåta att en tag läggs till ämnet i varje meddelande som klassificeras SPAM. Värdet för denna tag anges nedan.</trans>
     </entry>
 
    <entry>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/portforwarding  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/portforwarding   2010-04-29 07:58:29.000000000 -0600
@@ -109,6 +109,6 @@
     </entry>
     <entry>
         <base>IN_SERVERONLY</base>
-        <trans>Denna server är för närvarande i endast servermod och vidarebefordran av port är inte möjligt.</trans>
+        <trans>Denna server är för närvarande i endast servermod och vidarebefordran av port är endast möjligt till localhost.</trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/proxy   2008-10-07 09:28:32.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/proxy    2010-04-29 07:58:49.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>De nya proxyinställningarna sparades.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Blockerad</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/th/etc/e-smith/web/functions/proxy   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/th/etc/e-smith/web/functions/proxy    2010-04-29 07:58:49.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>ค่าพร็อกซี่ที่ตั้งใหม่ถูกนำมาใช้แล้ว</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>ถูกกัน</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/tr/etc/e-smith/web/functions/proxy   2008-10-07 09:28:36.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/tr/etc/e-smith/web/functions/proxy    2010-04-29 07:58:50.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>The new proxy settings were applied successfully.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>Blocked</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/tr/FormMagick/general        2008-10-07 09:28:36.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/tr/FormMagick/general 2010-04-29 07:56:41.000000000 -0600
@@ -27,7 +27,7 @@
     </entry>
     <entry>
         <base>SAVE</base>
-        <trans>Save</trans>
+        <trans>Kaydet</trans>
     </entry>
     <entry>
         <base>CANCEL</base>
@@ -51,7 +51,7 @@
     </entry>
     <entry>
         <base>ADD</base>
-        <trans>Add</trans>
+        <trans>Ekle</trans>
     </entry>
     <entry>
         <base>CREATE</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/backup       2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/backup        2010-04-29 07:54:50.000000000 -0600
@@ -1,7 +1,7 @@
 <lexicon lang="zh-cn">
   <entry>
    <base>BACKUP_TITLE</base>
-   <trans>Backup or restore server data</trans>
+   <trans>备份或者行业服务器数据</trans>
   </entry>
   <entry>
    <base>BACKUP_DESC</base>
@@ -9,75 +9,75 @@
   </entry>
   <entry>
    <base>BACKUP_DESC_DAR</base>
-   <trans><![CDATA[ <P>The server provides three ways to back up and restore your server: using your local desktop, a tape drive or a workstation on your LAN.</P> <P>The first method creates a copy of your server configuration and user data files, and downloads it to your local desktop via your web browser. Currently your configuration and data files total approximately <b>$tarsize</b>. The backup file will be somewhat less than this, depending on how compressible the data are. The \"Verify desktop backup file\" option can be used to check the integrity of a desktop backup file.</P> <P>The tape backup method uses a software package called <I>$module</I> to back up your entire hard disk to tape every night. This requires a supported tape drive and a tape that is not write-protected. The backup is performed automatically at the selected time every night (with a reminder automatically e-mailed to the administrator during the day). Currently your hard disk contains <b>$dumpsize</b> of data.</P> <P>The workstation backup method uses a software package called <I>dar</I> to back up your server configuration and data files to a workstation on your LAN (or a local USB disk). This requires you provide a writable share (cifs or nfs) on the backup workstation or have a local USB disk. You can manage how many rotating sets of backup are kept on the backup share, and also make each set doing incremental backup upon several days. The backup is performed automatically at the selected time every day. Currently configuration and data files total approximately <b>$tarsize</b> uncompressed. Twice the compressed data size must be available on the backup share.</P> <P>All restore methods allow you to restore your configuration and user data files. Workstation backup provides individual file restore. <b>Ideally, full restore should be performed on a freshly installed server</b>.</P> ]]></trans>
+   <trans><![CDATA[ <P>服务器提供3种备份和还原途径：使用您的本地桌面，一个磁带驱动器或者局域网中的工作站。</P> <P>第一种方式是创建您服务器的配置和用户数据文件的备份，然后通过浏览器下载到您的本地桌面。当前，您的配置和数据文件大小将近 <b>$tarsize</b>。 备份文件将比这稍微小一些，这取决于数据压缩的方式。 \"检查桌面备份文件\"选项可以用来检查桌面备份文件的完整性。</P> <P>磁带备份方式使用名为 <I>$module</I>的软件来每晚备份整个磁盘到磁带上。这需要一个支持的磁带驱动器和未被写保护的磁带。备份将在每晚指定时间自动执行（每天有提醒器回馈自动给管理员发送邮件）。当前您的硬盘的数据大小为 <b>$dumpsize</b> 。</P> <P>工作站备份方式使用名为 <I>dar</I> 的软件来备份您服务器的配置和用户数据到您局域网的工作组（或一个本地USB磁盘）。这需要您在备份工作站提供可写的网络共享（cifs或者nfs），或者您拥有一个本地USB磁盘。您可以在备份共享中管理多个漫游备份设备，也可以为每个设备制定一些天数的增量备份。备份在每天选定的时间自动执行。当前，您的配置和数据文件大小将近<b>$tarsize</b> 未被压缩。共享备份大小必须够供两次压缩数据使用。</P> <P>所有的还原方式都可以让您还原您的配置和用户数据文件。工作组备份提供了单个文件还原方式。 <b>理论上，完整还原应该在一个全新安装的服务器上执行。</b>.</P> ]]></trans>
   </entry>
   <entry>
    <base>BACKUP_CONFIG_STATUS</base>
-   <trans>Backup configuration and status</trans>
+   <trans>备份配置和状态</trans>
   </entry>
   <entry>
    <base>TAPE_BACKUPS_ENABLED</base>
-   <trans><![CDATA[ Tape backups are currently <b>enabled</b>. ]]></trans>
+   <trans><![CDATA[ Tape backups are currently <b>启用</b>. ]]></trans>
   </entry>
   <entry>
    <base>BACKUPS_RUN_AT</base>
-   <trans>Regular tape backups will run at:</trans>
+   <trans>定期磁带备份将运行于：</trans>
   </entry>
   <entry>
    <base>REMINDER_MESSAGE_AT</base>
-   <trans>Reminder messages will be sent at:</trans>
+   <trans>提醒信息将被发送于：</trans>
   </entry>
   <entry>
    <base>TAPE_BACKUPS_DISABLED</base>
-   <trans><![CDATA[ Tape backups are <b>disabled</b> ]]></trans>
+   <trans><![CDATA[ 磁带备份被<b>禁用</b> ]]></trans>
   </entry>
   <entry>
    <base>DESKTOP_BACKUP</base>
-   <trans>Backup to desktop</trans>
+   <trans>备份到桌面</trans>
   </entry>
   <entry>
    <base>DESKTOP_RESTORE</base>
-   <trans>Restore from desktop</trans>
+   <trans>从桌面还原</trans>
   </entry>
   <entry>
    <base>DESKTOP_VERIFY</base>
-   <trans>Verify desktop backup file</trans>
+   <trans>检查桌面备份文件</trans>
   </entry>
   <entry>
    <base>TAPE_CONFIGURE</base>
-   <trans>Configure tape backup</trans>
+   <trans>配置磁带备份</trans>
   </entry>
   <entry>
    <base>TAPE_RESTORE</base>
-   <trans>Restore from tape</trans>
+   <trans>从磁带还原</trans>
   </entry>
   <entry>
    <base>RESTORE_IN_PROGRESS_BEGAN_AT</base>
-   <trans>A system restore is in progress. It began at:</trans>
+   <trans>一个系统还原被执行，开始于：</trans>
   </entry>
   <entry>
    <base>REFRESH_THIS_DISPLAY</base>
-   <trans>Refresh this display</trans>
+   <trans>刷新显示</trans>
   </entry>
   <entry>
    <base>CONFIGURE_TAPE_BACKUP</base>
-   <trans>Configure tape backup</trans>
+   <trans>配置磁带备份</trans>
   </entry>
   <entry>
    <base>RESTORE_COMPLETED</base>
-   <trans>A system restore has completed</trans>
+   <trans>系统还原已完成</trans>
   </entry>
   <entry>
    <base>STARTED_AT</base>
-   <trans>It began at:</trans>
+   <trans>开始于：</trans>
   </entry>
   <entry>
    <base>FINISHED_AT</base>
-   <trans>and finished at:</trans>
+   <trans>结束于：</trans>
   </entry>
   <entry>
    <base>YOU_MUST_REBOOT</base>
-   <trans>You must reboot the server to activate any configuration changes that were made as a result of this restore.</trans> 
+   <trans>您必须重新启动服务器来激活由还原操作带来任何配置的变化。</trans> 
   </entry> 
   <entry>
    <base>REBOOT</base>
@@ -85,19 +85,19 @@
   </entry>
   <entry>
    <base>SELECT_AN_ACTION</base>
-   <trans>Select an action</trans>
+   <trans>选择一个动作</trans>
   </entry>
   <entry>
    <base>X_BACKUP_OR_RESTORE</base>
-   <trans>X Backup or restore server data</trans>
+   <trans>X备份或者还原服务器数据</trans>
   </entry>
   <entry>
    <base>ERR_PRE_BACKUP</base>
-   <trans>Error occurred during pre-backup actions.</trans>
+   <trans>尝试预先备份操作时出错。</trans>
   </entry>
   <entry>
    <base>ERR_PRE_RESTORE</base>
-   <trans>Error occurred during pre-restore actions.</trans>
+   <trans>尝试预先恢复操作时出错。</trans>
   </entry>
   <entry>
    <base>ERR_POST_BACKUP</base>
@@ -105,23 +105,23 @@
   </entry>
   <entry>
    <base>RESTORE_SERVER_CONFIG</base>
-   <trans>Restore server configuration</trans>
+   <trans>还原服务器配置</trans>
   </entry>
   <entry>
    <base>DESKTOP_RESTORE_DESC</base>
-   <trans><![CDATA[ This process will upload a server backup file from your local desktop to your server and restore the configuration and user data files. <B>The restore should be performed on a freshly installed server</B>. ]]></trans>
+   <trans><![CDATA[ 此操作会冲您本地桌面上传一个备份文件到您的服务器，然后还原服务器配置和用户数据文件。 <B>还原应该在一个全新安装的服务器上执行</B>。]]></trans>
   </entry>
   <entry>
    <base>FREE_SPACE</base>
-   <trans><![CDATA[ You have approximately $tmpfree free space on the server. Check that desktop backup file is less than $halffree before commencing the restore. ]]></trans>
+   <trans><![CDATA[ 在服务器上，您大概有 $tmpfree 空余空间。在还原操作前，请检查桌面的备份文件是否小于 $halffree 。]]></trans>
   </entry>
   <entry>
    <base>MUST_REBOOT_AFTER_RESTORE</base>
-   <trans>After the restore completes you must reboot the server.</trans>
+   <trans>当还原完成后请您重新启动服务器。</trans>
   </entry>
   <entry>
    <base>FILE_TO_RESTORE</base>
-   <trans>Backup file to restore from</trans>
+   <trans>要还原的备份文件来自</trans>
   </entry>
   <entry>
    <base>VERIFY_BACKUP_DESC</base>
@@ -129,7 +129,7 @@
   </entry>
   <entry>
    <base>SELECT_BACKUP_FILE</base>
-   <trans>Select backup file</trans>
+   <trans>选择备份文件</trans>
   </entry>
   <entry>
    <base>VERIFY</base>
@@ -137,15 +137,15 @@
   </entry>
   <entry>
    <base>RESTORE_CANNOT_PROCEED</base>
-   <trans>Unable to proceed with restore of server configuration</trans>
+   <trans>无法执行此服务器配置的还原操作</trans>
   </entry>
   <entry>
    <base>ANOTHER_RESTORE_IN_PROGRESS</base>
-   <trans>Another restore is in progress. Please try again later.</trans>
+   <trans>有另一个还原操作正在执行，请您稍后再试。</trans>
   </entry>
   <entry>
    <base>RESTORE_IN_PROGRESS</base>
-   <trans>Restore in progress</trans>
+   <trans>还原正在执行</trans>
   </entry>
   <entry>
    <base>RESTORE_IN_PROGRESS_DESC</base>
@@ -153,83 +153,83 @@
   </entry>
   <entry>
    <base>FILES_HAVE_BEEN_RESTORED</base>
-   <trans>The following files and directories have been restored:</trans>
+   <trans>以下文件和目录已被还原：</trans>
   </entry>
   <entry>
    <base>RESTORE_FAILED_MSG</base>
-   <trans>Restore failed! There was an error in reading the backup file.</trans>
+   <trans>还原失败！在读取备份文件时出错。</trans>
   </entry>
   <entry>
    <base>RESTORE_COMPLETE</base>
-   <trans>Restore complete</trans>
+   <trans>还原完成</trans>
   </entry>
   <entry>
    <base>ERR_RESTORING_GID</base>
-   <trans>Error occurred while restoring gid of 'www'</trans>
+   <trans>当还原'www'的gid时出错</trans>
   </entry>
   <entry>
    <base>ERR_RESTORING_INITIAL_GRP</base>
-   <trans>Error occurred while restoring initial group of 'www'.</trans>
+   <trans>当还原操作初始化"www"组是出错。</trans>
   </entry>
   <entry>
    <base>RESTORE_FAILED</base>
-   <trans>Restore failed! The backup file was incomplete.</trans>
+   <trans>还有失败！此备份文件不完整。</trans>
   </entry>
   <entry>
    <base>COULD_NOT_EXEC_PIPELINE</base>
-   <trans>Could not execute backup pipeline:</trans>
+   <trans>不能执行备份管道：</trans>
   </entry>
   <entry>
    <base>COULD_NOT_DECODE</base>
-   <trans>Could not decode backup file:</trans>
+   <trans>不能解码备份文件：</trans>
   </entry>
   <entry>
    <base>FILES_IN_BACKUP</base>
-   <trans>The following files are considered in the backup :</trans>
+   <trans>以下文件被认为是备份：</trans>
   </entry>
   <entry>
    <base>VERIFY_COMPLETE</base>
-   <trans>Verification is complete</trans>
+   <trans>检查完成</trans>
   </entry>
   <entry>
    <base>BACKUP_FILE_INCOMPLETE</base>
-   <trans>The backup file was incomplete</trans>
+   <trans>备份文件不完整</trans>
   </entry>
   <entry>
    <base>ERR_READING_FILE</base>
-   <trans>There was an error in reading the backup file.</trans>
+   <trans>读取备份文件时有错误。</trans>
   </entry>
   <entry>
    <base>ENABLE_DISABLE_TAPE</base>
-   <trans>Enable/Disable Nightly Tape Backup</trans>
+   <trans>启用/禁用每晚磁带备份</trans>
   </entry>
   <entry>
    <base>TAPE_CONFIG_DESC</base>
-   <trans><![CDATA[ <p>Select whether you wish to enable nightly backups. Then indicate the desired times for the backup and the load tape reminder.</p> <p>The tape backup requires a supported tape drive. A warning message will be sent to the administrator at the designated reminder time if the tape drive is empty.</p> ]]></trans>
+   <trans><![CDATA[ <p>请选择您是否要每晚备份功能。然后指明备份和加载磁带提醒的时间。</p> <p>磁带备份需要系统支持的磁带类型。如果磁带驱动器内为空，在指定的提醒时间，系统将会向管理员发送一个警告信息。</p> ]]></trans>
   </entry>
   <entry>
    <base>ENABLE_TAPE_BACKUP</base>
-   <trans>Enable tape backup</trans>
+   <trans>启用磁带备份</trans>
   </entry>
   <entry>
    <base>TAPE_BACKUP_TIME</base>
-   <trans>Tape backup time of day (hour/min)</trans>
+   <trans>每天磁带备份时间（时/分）</trans>
   </entry>
   <entry>
    <base>LOAD_TAPE_REMINDER_TIME</base>
-   <trans>Load tape reminder time of day (hour/min)</trans>
+   <trans>每天加载磁带提醒器时间（时/分）</trans>
   </entry>
   <entry>
    <base>AM/PM</base>
-   <trans>AM/PM</trans>
+   <trans>上午/下午</trans>
   </entry>
   <entry>
    <base>AM</base>
-   <trans>AM</trans>
+   <trans>上午</trans>
   </entry>
   <entry>
    <base>PM</base>
-   <trans>PM</trans>
+   <trans>下午</trans>
   </entry>
   <entry>
    <base>UPDATE_CONF</base>
@@ -237,31 +237,31 @@
   </entry>
   <entry>
    <base>UPDATING_TAPE_CONF</base>
-   <trans>Updating tape backup configuration</trans>
+   <trans>更新磁带备份配置</trans>
   </entry>
   <entry>
    <base>ERR_INVALID_HOUR</base>
-   <trans>Error: invalid backup hour:</trans>
+   <trans>错误：非法备份小时：</trans>
   </entry>
   <entry>
    <base>BETWEEN_0_AND_12</base>
-   <trans>Please choose an hour between 0 and 12.</trans>
+   <trans>请选择0到12之间的小时数。</trans>
   </entry>
   <entry>
    <base>ERR_INVALID_MINUTE</base>
-   <trans>Error: invalid backup minute:</trans>
+   <trans>错误：非法备份分钟：</trans>
   </entry>
   <entry>
    <base>BETWEEN_0_AND_59</base>
-   <trans>Please choose a minute between 0 and 59.</trans>
+   <trans>请选择0到59之间的分钟数。</trans>
   </entry>
   <entry>
    <base>ERR_INVALID_REMINDER_HOUR</base>
-   <trans>Error: invalid reminder hour:</trans>
+   <trans>错误：非法提醒小时：</trans>
   </entry>
   <entry>
    <base>ERR_INVALID_REMINDER_MINUTE</base>
-   <trans>Error: invalid reminder minute:</trans>
+   <trans>错误：非法提醒分钟：</trans>
   </entry>
   <entry>
    <base>ERR_CONF_BACKUP</base>
@@ -269,51 +269,51 @@
   </entry>
   <entry>
    <base>SUCCESSFULLY_ENABLED_TAPE</base>
-   <trans>Successfully enabled tape backups</trans>
+   <trans>成功启用磁带备份</trans>
   </entry>
   <entry>
    <base>WITH_BACKUP_TIME</base>
-   <trans>with backup time:</trans>
+   <trans>备份时间：</trans>
   </entry>
   <entry>
    <base>WITH_REMINDER_TIME</base>
-   <trans>and load tape reminder time:</trans>
+   <trans>加载磁带提醒时间：</trans>
   </entry>
   <entry>
    <base>SUCCESSFULLY_DISABLED</base>
-   <trans>Successfully disabled tape backups</trans>
+   <trans>成功禁用磁带备份</trans>
   </entry>
   <entry>
    <base>RESTORE_CONF_FROM_TAPE</base>
-   <trans>Restore server configuration from tape backup</trans>
+   <trans>从磁带备份还原服务器配置</trans>
   </entry>
   <entry>
    <base>RESTORE_CONF_FROM_TAPE_DESC</base>
-   <trans><![CDATA[ <P>This process will restore the configuration and user data files from a server tape backup. <B>The restore should be performed on a freshly installed server</B>.</P> <P>Ensure that you have loaded the desired backup tape into the tape drive before proceeding.</P> <P>After the restore completes you must reboot the server.</P> ]]></trans>
+   <trans><![CDATA[ <P>此操作会从磁带备份处还原系统配置和用户文件。 <B>此还原操作应该在一个全新安装的服务器上执行。</B>.</P> <P>在执行之前，确保您加载的是您想要的备份。</P> <P>当还原完成后，您必须重新启动服务器。</P> ]]></trans>
   </entry>
   <entry>
    <base>RESTORE_FROM_TAPE</base>
-   <trans>Restore From Tape</trans>
+   <trans>从磁带还原</trans>
   </entry>
   <entry>
    <base>UNABLE_TO_RESTORE_CONF</base>
-   <trans>Unable to restore server configuration</trans>
+   <trans>无法还原服务器配置</trans>
   </entry>
   <entry>
    <base>RESTORING_FROM_TAPE</base>
-   <trans>Restoring From Tape</trans>
+   <trans>从磁带还原</trans>
   </entry>
   <entry>
    <base>NOW_RESTORING_FROM_TAPE</base>
-   <trans>Your server configuration and user data files are now being restored from tape.</trans>
+   <trans>您服务器的配置和用户数据文件现已从磁带被还原。</trans>
   </entry>
   <entry>
    <base>ERR_RESTORING_FROM_TAPE</base>
-   <trans>Error occurred restoring files from tape.</trans>
+   <trans>从磁带还原文件时出错。</trans>
   </entry>
   <entry>
    <base>ERR_UPDATING_CONF_AFTER_TAPE_RESTORE</base>
-   <trans>Error occurred while updating system configuration after tape restore.</trans>
+   <trans>当从磁盘还原后升级系统配置时出错。</trans>
   </entry>
   <entry>
    <base>COULD_NOT_FORK</base>
@@ -321,136 +321,136 @@
   </entry>
   <entry>
    <base>SERVER_REBOOT</base>
-   <trans>Server reboot</trans>
+   <trans>服务器重新启动</trans>
   </entry>
   <entry>
    <base>SERVER_WILL_REBOOT</base>
-   <trans>Your server will now reboot.</trans>
+   <trans>您的服务器就将重新启动。</trans>
   </entry>
   <entry>
    <base>NO_UID_FOR_NAME</base>
-   <trans>Could not get uid for user named:</trans>
+   <trans>不能获取用户id，名称为：</trans>
   </entry>
   <entry>
    <base>PAGE_REFRESH_IN</base>
-   <trans><![CDATA[ This page will refresh to the status display in {$sec} seconds, or click <a href="/server-manager/cgi-bin/backup">here</a>. ]]></trans>
+   <trans><![CDATA[ 此页面将在 {$sec} 秒内重新加载， 或者点击 <a href="/server-manager/cgi-bin/backup">此处</a>. ]]></trans>
   </entry>
     <entry>
        <base>Backup or restore</base>
-       <trans>Backup or restore</trans>
+       <trans>备份或者还原</trans>
     </entry>
 
   <entry>
        <base>BACKUP_DESKTOP_TOO_BIG</base>
-       <trans><![CDATA[ <div class="error"> Your server has too much data for a reliable backup to desktop. </div> ]]></trans>
+       <trans><![CDATA[ <div class="error"> 您的服务武器有太多数据需要可靠的备份到桌面。 </div> ]]></trans>
   </entry>
    <entry>
    <base>WORKSTN_BACKUPS_DISABLED</base>
-   <trans><![CDATA[ Workstation backups are <b>disabled</b> ]]></trans>
+   <trans><![CDATA[ 工作组备份被<b>禁用</b> ]]></trans>
   </entry>
   <entry>
    <base>WORKSTN_BACKUPS_ENABLED</base>
-   <trans><![CDATA[ Workstation backups are currently <b>enabled</b>. ]]></trans>
+   <trans><![CDATA[ 当前工作组备份被 <b>启用</b>. ]]></trans>
   </entry>
   <entry>
    <base>WKBACKUPS_RUN_AT</base>
-   <trans>Regular workstation backups will run at:</trans>
+   <trans>定期工作组备份将运行于：</trans>
   </entry>
   <entry>
    <base>WORKSTN_CONFIGURE</base>
-   <trans>Configure workstation backup</trans>
+   <trans>工作组备份配置</trans>
   </entry>
   <entry>
    <base>WORKSTN_VERIFY</base>
-   <trans>Verify workstation backup</trans>
+   <trans>检查工作组备份</trans>
   </entry>
   <entry>
    <base>WORKSTN_RESTORE</base>
-   <trans>Restore from workstation</trans>
+   <trans>从工作组还原</trans>
   </entry>
   <entry>
    <base>CONFIGURE_WORKSTN_BACKUP</base>
-   <trans>Configure Workstation Backup</trans>
+   <trans>工作组备份配置</trans>
   </entry>
   <entry>
    <base>ENABLE_DISABLE_WORKSTN</base>
-   <trans>Enable/Disable Daily Workstation Backup</trans>
+   <trans>启用/禁用每日工作组备份</trans>
   </entry>
   <entry>
    <base>ENABLE_WORKSTN_BACKUP</base>
-   <trans>Enable Workstation Backup</trans>
+   <trans>启用工作组备份</trans>
   </entry>
   <entry>
    <base>WORKSTN_BACKUP_TIME</base>
-   <trans>Workstation backup time of day (hour/min)</trans>
+   <trans>每天工作组备份时间（时/分）</trans>
   </entry>
   <entry>
    <base>UPDATING_WORKSTN_CONF</base>
-   <trans>Updating workstation backup configuration</trans>
+   <trans>更新工作组备份配置</trans>
   </entry>
   <entry>
    <base>SUCCESSFULLY_ENABLED_WORKSTN</base>
-   <trans>Successfully enabled workstation backups</trans>
+   <trans>成功启用工作组备份</trans>
   </entry>
   <entry>
    <base>SUCCESSFULLY_DISABLED_WORKSTN</base>
-   <trans>Successfully disabled workstation backups</trans>
+   <trans>成功禁用工作组备份</trans>
   </entry>
   <entry>
    <base>VERIFY_WORKSTN_BACKUP_FILE</base>
-   <trans>Verify workstation backup</trans>
+   <trans>检查工作组备份</trans>
   </entry>
   <entry>
    <base>VERIFY_WORKSTN_BACKUP_DESC</base>
-   <trans><![CDATA[ <p>This option will display the names of all files in a previously created workstation daily backup. You can use this option to verify the contents of the backup.<b>You must choose the backup you want to verify</b></p> <p>Only files flagged with [Saved] are contained in the backup.</p> <br/>Backup files are verified from shared folder : ]]></trans>
+   <trans><![CDATA[ <p>此选项将显示在以前创建的所有工作站的日常备份文件的名称。您可以使用此选项来检查备份的内容.<b>您必须选择您想要检查的备份</b></p> <p>只有标记为 [Saved] 的文件才会包含在备份中。</p> <br/>备份文件已被检查，文件来自于共享文件夹 : ]]></trans>
   </entry>
   <entry>
    <base>RESTORE_CONF_FROM_WORKSTN</base>
-   <trans>Restore server configuration from workstation backup</trans>
+   <trans>从工作组备份还原服务器配置</trans>
   </entry>
   <entry>
    <base>RESTORE_CONF_FROM_WORKSTN_DESC</base>
-   <trans><![CDATA[ <p>This process will restore the configuration and user data files from a Server workstation backup. <b>The restore should be performed on a freshly installed Server</b>.</p> <p>Ensure that choose the right backup to restore below before proceeding.</p> <p>After the restore completes you must reboot the server.</p> Backup will be restored from : ]]></trans>
+   <trans><![CDATA[ <p>此操作会从一个工作站备份处还原系统配置和用户数据文件。 <b>此还原操作应该在一个全新安装的服务器上执行</b>。</p> <p>在执行还原操作之前，确保选择正确的备份。</p> <p>还原过后，您必须重新启动服务器。</p> 备份还原文件来自 : ]]></trans>
   </entry>
   <entry>
    <base>RESTORE_FROM_WORKSTN</base>
-   <trans>Restore From Workstation</trans>
+   <trans>从工作组还原</trans>
   </entry>
   <entry>
    <base>RESTORING_FROM_WORKSTN</base>
-   <trans>Restoring From Workstation</trans>
+   <trans>正在从工作组还原</trans>
   </entry>
   <entry>
    <base>NOW_RESTORING_FROM_WORKSTN</base>
-   <trans>Your server configuration and user data files are now being restored from workstation shared folder.</trans>
+   <trans>正在从工作组共享文件夹还原您服务器配置和用户数据文件。</trans>
   </entry>
   <entry>
    <base>ERR_RESTORING_FROM_WORKSTN</base>
-   <trans>Error occurred restoring files from workstation.</trans>
+   <trans>从工作组还原文件时出错。</trans>
   </entry>
   <entry>
    <base>ERR_UPDATING_CONF_AFTER_WORKSTN_RESTORE</base>
-   <trans>Error occurred while updating system configuration after workstation restore.</trans>
+   <trans>从工作组还原后更新系统配置时出错。</trans>
   </entry>
   <entry>
    <base>WORKSTN_NAME</base>
-   <trans>Workstation IP or hostname</trans>
+   <trans>工作组IP或主机名</trans>
   </entry>
   <entry>
    <base>WORKSTN_BACKUP_SETTINGS</base>
-   <trans>Workstation Backup Settings</trans>
+   <trans>工作组备份设置</trans>
   </entry>
   <entry>
    <base>SHARED_FOLDER_NAME</base>
-   <trans>Backup share</trans>
+   <trans>备份共享</trans>
   </entry>
   <entry>
    <base>WORKSTN_LOGIN</base>
-   <trans>Login name</trans>
+   <trans>登陆用户</trans>
   </entry>
   <entry>
    <base>WORKSTATION_BACKUP_DEST</base>
-   <trans>Backup workstation settings</trans>
+   <trans>备份工作组设置</trans>
   </entry>
   <entry>
    <base>CONFIGURE_WORKSTN_BACKUP_DESC</base>
@@ -458,79 +458,79 @@
   </entry>
   <entry>
    <base>ERR_INVALID_WORKSTN</base>
-   <trans>Invalid Workstation IP or Hostname</trans>
+   <trans>工作组IP或者主机名非法</trans>
   </entry>
   <entry>
    <base>ERR_INVALID_FOLDER</base>
-   <trans>Invalid share name</trans>
+   <trans>共享名非法</trans>
   </entry>
   <entry>
    <base>ERR_INVALID_LOGIN</base>
-   <trans>Invalid Login</trans>
+   <trans>非法登录</trans>
   </entry>
   <entry>
    <base>ERR_INVALID_PASSWORD</base>
-   <trans>Invalid Password</trans>
+   <trans>密码错误</trans>
   </entry>
   <entry>
    <base>ERR_MOUNTING_SMBSHARE</base>
-   <trans>Unable to mount workstation shared folder</trans>
+   <trans>无法挂载工作组共享文件夹</trans>
   </entry>
   <entry>
    <base>WORKSTN_NOT_SET</base>
-   <trans>You must first correctly configure your workstation backup</trans>
+   <trans>您必须先正确配置您的工作组备份</trans>
   </entry>
   <entry>
    <base>NO_BACKUPS_TO_RESTORE</base>
-   <trans>There is no backup set on configured workstation shared folder. Verify your configuration settings.</trans>
+   <trans>在配置好的工作组共享文件夹上无备份设置。请检查您的配置。</trans>
   </entry>
   <entry>
    <base>NUMBER_OF_SETS</base>
-   <trans>Number of rotating backup sets</trans>
+   <trans>轮换备份设备数量</trans>
   </entry>
   <entry>
    <base>NUMBER_OF_FILES_IN_SET</base>
-   <trans>Daily backups in each set</trans>
+   <trans>每个设备的每日备份</trans>
   </entry>
   <entry>
    <base>ERR_INVALID_SETS_NUMBER</base>
-   <trans>Sets number must be 1 or greater</trans>
+   <trans>设备数量必须为1或者更大</trans>
   </entry>
   <entry>
    <base>ERR_INVALID_FILES_IN_SET_NUMBER</base>
-   <trans>This number must be 1 or greater. First backup in set is <b>full</b> others are <b>incrementals</b></trans>
+   <trans>此数字必须为1或者更大，第一个设备是 <b>完整备份</b> 其他为 <b>增量备份</b></trans>
   </entry>
   <entry>
    <base>WORKSTN_TIMEOUT</base>
-   <trans>Optional backup session timeout (hours)</trans>
+   <trans>（可选）备份会话超时（小时）</trans>
   </entry>
   <entry>
    <base>INC_ONLY_TIMEOUT</base>
-   <trans>Don't timeout full backup sessions</trans>
+   <trans>请勿为完整备份设置会话超时</trans>
   </entry>
   <entry>
    <base>ERR_INVALID_TIMEOUT</base>
-   <trans>Maximum backup time must be set between 1 and 24 hours</trans>
+   <trans>最大备份时间必须设置为1到24小时之间</trans>
   </entry>
   <entry>
    <base>ERR_NO_HOST_DIR</base>
-   <trans>No directory for your host in shared folder. Maybe your host name is different from backup ones</trans>
+   <trans>您主机的共享文件夹无目录，也许您的主机名与备份的不同。</trans>
   </entry>
   <entry>
    <base>ERROR_READING_FILE</base>
-   <trans>Error while reading files from</trans>
+   <trans>读取文件时出错，文件来自</trans>
   </entry>
   <entry>
    <base>WORKSTN_SEL_RESTORE</base>
-   <trans>Selective file restore from workstation</trans>
+   <trans>从工作组可选择的还原文件</trans>
   </entry>
   <entry>
    <base>WORKSTN_SELECTIVE_RESTORE</base>
-   <trans>Workstation selective file restore</trans>
+   <trans>工作组中可选择的还原文件</trans>
   </entry>
   <entry>
    <base>ALL_BACKUPS</base>
-   <trans>All backups</trans>
+   <trans>所有备份</trans>
   </entry>
   <entry>
    <base>WORKSTN_SEL_REST_DESC</base>
@@ -538,31 +538,31 @@
   </entry>
   <entry>
    <base>BACKUP_CHOICE</base>
-   <trans>Selecting files to display</trans>
+   <trans>要显示的可选择文件</trans>
   </entry>
   <entry>
    <base>SELECT_DATE_BEFORE</base>
-   <trans>Restore most recent before</trans>
+   <trans>从最近的备份还原</trans>
   </entry>
   <entry>
    <base>FILTER_EXPRESSION</base>
-   <trans>Names filtered by</trans>
+   <trans>过滤名称 通过</trans>
   </entry>
   <entry>
    <base>READ_COMPLETE</base>
-   <trans><![CDATA[ You can choose all the directories and files you want to restore in the displayed list (use ctrl or shift for multiple selection). <br/> <b>Warning :</b> If you select a directory, all contained files and directories will be restored.<p/> By default the most recent version of selected files is restored, but if you specify a date in the format <i>[ [ [yyyy/]mm/]dd-]hh:mm[:ss]</i> the process will restore only the most recent version modified <b>before the given date</b>. ]]></trans>
+   <trans><![CDATA[ 您可以再显示列表中选择您要还原的所有目录和文件 (使用 ctrl 键 或者 shift键来选择多个项目)。 <br/> <b>警告:</b> 如果您选择一个目录，那么该目录包含的文件或者目录将被还原。<p/> 默认选择最近的备份版本会被选中用来还原，但是当您指定了一个日期格式为 <i>[ [ [yyyy/]mm/]dd-]hh:mm[:ss]</i> ，此操作将会还原在<b>指定日期之前</b>的被编辑的最新备份。 ]]></trans>
   </entry>
   <entry>
    <base>ERR_INVALID_SELDATE</base>
-   <trans>Date format is invalid, must be [ [ [yyyy/]mm/]dd-]hh:mm[:ss]. ie: 2005/12/31-08:23:32 or 10-08:32 or 08:32</trans>
+   <trans>非法日期格式，必须为[ [ [yyyy/]mm/]dd-]hh:mm[:ss]，比如： 2005/12/31-08:23:32 或者 10-08:32 or 08:32</trans>
   </entry>
   <entry>
    <base>SELECT_FILES_TO_RESTORE</base>
-   <trans>Select files to restore</trans>
+   <trans>选择要还原的文件</trans>
   </entry>
   <entry>
    <base>ERR_WHILE_UNMOUNTING</base>
-   <trans>Error occurs when unmounting distant share</trans>
+   <trans>卸载远端共享时出错</trans>
   </entry>
   <entry>
    <base>ERR_DAR_CATALOG</base>
@@ -570,75 +570,75 @@
   </entry>
   <entry>
    <base>COMPRESSION_LEVEL</base>
-   <trans>Backup compression level [0-9]</trans>
+   <trans>备份压缩等级[0-9]</trans>
   </entry>
   <entry>
    <base>FULL_ONLY_ON</base>
-   <trans>Full backup is allowed on</trans>
+   <trans>完整备份允许在</trans>
   </entry>
   <entry>
    <base>ERR_INVALID_COMPRESSION</base>
-   <trans>Compression level must be set between 0 (no compression) and 9 (maximum compression)</trans>
+   <trans>压缩等级必须设置为0（不压缩）或者9（压缩最大化）</trans>
   </entry>
   <entry>
    <base>DOW</base>
-   <trans>Sunday Monday Tuesday Wednesday Thursday Friday Saturday Everyday</trans>
+   <trans>周日 周一 周二 周三 周三 周五 周六 每天</trans>
   </entry>
   <entry>
    <base>CONFIGURATION_TO_BE_DONE</base>
-   <trans>Please configure the backup settings.</trans>
+   <trans>请配置备份设置。</trans>
   </entry>
   <entry>
    <base>WORKSTN_BACKUP_DESC</base>
-   <trans><![CDATA[ <p>This panel displays the present workstation backup configuration. You can change it in this panel and the next one.</p><p/> ]]></trans>
+   <trans><![CDATA[ <p>此面板显示当前工作组备份配置。您可以在此面板和下一个面板上修改。</p><p/> ]]></trans>
   </entry>
   <entry>
    <base>WORKSTN_BACKUP_NOT_CONFIGURED</base>
-   <trans><![CDATA[ <p>Presently, workstation backup is not configured. You can set this configuration with this panel and the next one.</p><p/> ]]></trans>
+   <trans><![CDATA[ <p>当前年，工作组备份为被配置。您可以在此面板或者下一个面板设置此配置 。</p><p/> ]]></trans>
   </entry>
   <entry>
    <base>WORKSTN_BACKUP_ENABLED</base>
-   <trans>Backup is</trans>
+   <trans>备份为</trans>
   </entry>
   <entry>
    <base>WORKSTN_BACKUP_USB</base>
-   <trans>Backup is made on local USB disk</trans>
+   <trans>备份被创建到本地USB磁盘上</trans>
   </entry>
   <entry>
    <base>WORKSTN_BACKUP_HOST</base>
-   <trans>Backup is made on LAN workstation</trans>
+   <trans>备份被创建到LAN工作组上</trans>
   </entry>
   <entry>
    <base>WORKSTN_BACKUP_VFSTYPE</base>
-   <trans>via</trans>
+   <trans>通过</trans>
   </entry>
   <entry>
    <base>WORKSTN_BACKUP_SHARE</base>
-   <trans>Destination backup share folder is</trans>
+   <trans>目的备份共享文件夹为</trans>
   </entry>
   <entry>
    <base>WORKSTN_BACKUP_TOD</base>
-   <trans>Daily backup occurs at</trans>
+   <trans>每日备份发生在</trans>
   </entry>
   <entry>
    <base>LOGIN</base>
-   <trans>Login is</trans>
+   <trans>登录者为</trans>
   </entry>
   <entry>
    <base>PASSWORD</base>
-   <trans>Password is</trans>
+   <trans>密码为</trans>
   </entry>
   <entry>
    <base>WORKSTN_BACKUP_SETSNUM</base>
-   <trans>Number of rotating backup sets is</trans>
+   <trans>漫游备份设备数量为</trans>
   </entry>
   <entry>
    <base>WORKSTN_BACKUP_DAYSINSET</base>
-   <trans>Number of daily backups contained in each set is</trans>
+   <trans>每个设备每日备份数量为</trans>
   </entry>
   <entry>
    <base>WORKSTN_BACKUP_COMPRESSION</base>
-   <trans>Compression level (0-9) of backup is</trans>
+   <trans>备份的压缩等级（0-9）为</trans>
   </entry>
   <entry>
    <base>WORKSTN_BACKUP_TIMEOUT</base>
@@ -650,54 +650,54 @@
   </entry>
   <entry>
    <base>WORKSTN_FULL_BACKUP_EVERYDAY</base>
-   <trans>Full backup sessions (new backup set) are allowed everyday</trans>
+   <trans>完整备份会话（新备份设备）已被允许每天运行</trans>
   </entry>
   <entry>
    <base>WORKSTN_FULL_BACKUP_DAY</base>
-   <trans>Full backup session (new backup sets) is allowed only on</trans>
+   <trans>完整备份会话（新备份设备）已被允许在</trans>
   </entry>
   <entry>
    <base>WORKSTATION_BACKUP_SETCONF</base>
-   <trans>Create or modify workstation backup configuration</trans>
+   <trans>创建或者修改工作站备份配置</trans>
   </entry>
   <entry>
    <base>SELECT_VFS_TYPE</base>
-   <trans>Select the type of share for backup destination</trans>
+   <trans>为备份目标选择共享类型</trans>
   </entry>
   <entry>
    <base>ERR_NO_USB_DISK</base>
-   <trans>Error : No USB disk available. Please connect an USB disk or select another type of backup share.</trans>
+   <trans>错误：无可用USB磁盘。请插入UBS磁盘或者选择其他的备份类型。</trans>
   </entry>
   <entry>
    <base>HOURS</base>
-   <trans>hours.</trans>
+   <trans>小时。</trans>
   </entry>
   <entry>
    <base>ERR_NO_FULL_BACKUP</base>
-   <trans>Aborting restore because needed full backup is missing or unreadable.</trans>
+   <trans>还原意外终止因为必需的完整备份丢失或者不可读。</trans>
   </entry>
   <entry>
    <base>ERR_NO_INC_BACKUP</base>
-   <trans>Aborting restore because the set has missing or unreadable incremental backup number</trans>
+   <trans>还原意外终止因为设备丢失或者无法读取增量备份数</trans>
   </entry>
   <entry>
    <base>CHECK_TO_VERIFY_FULL_RESTORE</base>
-   <trans>Check here to test integrity of all backups needed for a full restore with the selected backup</trans>
+   <trans>点击此处来测试与选定备份完全还原所需的所有备份的完整性</trans>
   </entry>
   <entry>
    <base>TESTING_NEEDED_BACKUPS_FOR_RESTORE</base>
-   <trans>Testing all backups needed for a full restore with selected backup</trans>
+   <trans>测试与选定备份完全恢复所需的所有备份</trans>
   </entry>
   <entry>
    <base>TESTED_BACKUP</base>
-   <trans>Testing integrity of backup</trans>
+   <trans>测试备份的完整性</trans>
   </entry>
   <entry>
    <base>RESTORE_VERIFY_FAILED</base>
-   <trans>Verify integrity failed</trans>
+   <trans>完整性检查失败</trans>
   </entry>
   <entry>
    <base>CHECK_INTEGRITY_WARNING</base>
-   <trans>Warning : For large backups, checking integrity may be a long task and should be made with daily workstation backup disabled.</trans>
+   <trans>警告：对于较大的备份，检查完整性可能是一个长期性的任务，当工作组备份并禁用时，需要每天进行检查。</trans>
   </entry>
  </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/clamav       2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/clamav        2010-04-29 07:54:59.000000000 -0600
@@ -1,38 +1,38 @@
 <lexicon lang="zh-cn">
     <entry>
         <base>FORM_TITLE</base>
-        <trans>Antivirus settings</trans>
+        <trans>反病毒设置</trans>
     </entry>
     <entry>
         <base>LABEL_FILESYSTEM_SCAN_PERIOD</base>
-        <trans>Scan filesystem</trans>
+        <trans>扫描文件系统</trans>
     </entry>
     <entry>
         <base>DESC_FILESYSTEM_SCAN_PERIOD</base>
-        <trans><![CDATA[ <h2>General Settings</h2> If this option is enabled then the filesystem will be scanned for viruses. A report of any found viruses will be emailed to the administrator.]]></trans>
+        <trans><![CDATA[ <h2>常规设置</h2> 如果此选项被启用，那么文件系统将被进行病毒扫描。 当发现病毒，会向管理员发送报告。]]></trans>
     </entry>
     <entry>
         <base>LABEL_QUARANTINE</base>
-        <trans>Quarantine infected files</trans>
+        <trans>隔离感染文件</trans>
     </entry>
     <entry>
         <base>LABEL_CLAM_VERSIONS</base>
-        <trans>ClamAV and db versions</trans>
+        <trans>ClamAV和病毒库版本</trans>
     </entry>
     <entry>
       <base>WEEKLY</base>
-      <trans>Weekly</trans>
+      <trans>每周</trans>
     </entry>
     <entry>
       <base>NEVER</base>
-      <trans>Never</trans>
+      <trans>从不</trans>
     </entry>
     <entry>
       <base>DAILY</base>
-      <trans>Daily</trans>
+      <trans>每日</trans>
     </entry>
     <entry>
         <base>SUCCESS</base>
-        <trans>The new clamav antivirus settings have been saved.</trans>
+        <trans>反病毒设置已被保存。</trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/datetime     2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/datetime      2010-04-29 07:55:18.000000000 -0600
@@ -1,202 +1,202 @@
 <lexicon lang="zh-cn">
     <entry>
       <base>FORM_TITLE</base>
-      <trans>Date and time configuration</trans>
+      <trans>日期和时间配置</trans>
     </entry>
     <entry>
       <base>INITIAL_DESC</base>
-      <trans>This is where you configure the date and time of this server. You may use an existing network time server or manually set the date and time for your time zone.</trans>
+      <trans>此处您可以配置此服务器的日期和时间。您可以使用一个已存在的网络时间服务器，或者手动设置您所在时区的日期和时间。</trans>
     </entry>
     <entry>
       <base>SET_DATE_TITLE</base>
-      <trans>Set Date and Time</trans>
+      <trans>设置日期和时间</trans>
     </entry>
     <entry>
       <base>COULD_NOT_OPEN_TZ_FILE</base>
-      <trans>Error: Could not open timezone file for reading:</trans>
+      <trans>错误：无法打开要读取的时区文件：</trans>
     </entry>
     <entry>
       <base>JANUARY</base>
-      <trans>January</trans>
+      <trans>一月</trans>
     </entry>
     <entry>
       <base>FEBRUARY</base>
-      <trans>February</trans>
+      <trans>二月</trans>
     </entry>
     <entry>
       <base>MARCH</base>
-      <trans>March</trans>
+      <trans>三月</trans>
     </entry>
     <entry>
       <base>APRIL</base>
-      <trans>April</trans>
+      <trans>四月</trans>
     </entry>
     <entry>
       <base>MAY</base>
-      <trans>May</trans>
+      <trans>五月</trans>
     </entry>
     <entry>
       <base>JUNE</base>
-      <trans>June</trans>
+      <trans>六月</trans>
     </entry>
     <entry>
       <base>JULY</base>
-      <trans>July</trans>
+      <trans>七月</trans>
     </entry>
     <entry>
       <base>AUGUST</base>
-      <trans>August</trans>
+      <trans>八月</trans>
     </entry>
     <entry>
       <base>SEPTEMBER</base>
-      <trans>September</trans>
+      <trans>九月</trans>
     </entry>
     <entry>
       <base>OCTOBER</base>
-      <trans>October</trans>
+      <trans>十月</trans>
     </entry>
     <entry>
       <base>NOVEMBER</base>
-      <trans>November</trans>
+      <trans>十一月</trans>
     </entry>
     <entry>
       <base>DECEMBER</base>
-      <trans>December</trans>
+      <trans>十二月</trans>
     </entry>
     <entry>
       <base>NEW_M/D/Y</base>
-      <trans>New month/day/year:</trans>
+      <trans>新 月/日/年：</trans>
     </entry>
     <entry>
       <base>NEW_H/M/S</base>
-      <trans>New hour/min/sec:</trans>
+      <trans>新 时/分/秒：</trans>
     </entry>
     <entry>
       <base>AM/PM_AND_TZ</base>
-      <trans>AM/PM and time zone:</trans>
+      <trans>上午/下午和时区：</trans>
     </entry>
     <entry>
       <base>NTP_ENABLE_DESC</base>
-      <trans>The server can periodically synchronize the system clock to a network time protocol (NTP) server. If you select this option, enter the hostname or IP address of the NTP server below.</trans>
+      <trans>此服务器可与一个网络设计协议（NTP）服务器定期同步系统时钟。如果您选择此选项，在下面输入网络时间服务器的主机名或者IP地址。</trans>
     </entry>
     <entry>
       <base>NTP_CONFIGURE_DESC</base>
-      <trans>The server is periodically synchronizing the system clock to the network time protocol (NTP) server specified below. To synchronize to a different NTP server, enter a different hostname or IP address in the field below.</trans>
+      <trans>此服务器可与下面指定的网络设计协议（NTP）服务器定期同步系统时钟，要与不同的网络时间服务器同步，在下面输入不同的主机名或者IP地址。</trans>
     </entry>
     <entry>
       <base>NTP_DISABLE_DESC</base>
-      <trans>Choose this option to stop syncronizing the system clock to the NTP server. When the NTP service is disabled, you can set the system date and time manually from this page.</trans>
+      <trans>选择此选项来停止与网络时间服务器同步系统时钟。当网络时间服务被禁用，您可以在此页面手动设置系统日期和时间。</trans>
     </entry>
     <entry>
       <base>NTP_SERVER</base>
-      <trans>NTP Server</trans>
+      <trans>网络时间服务器</trans>
     </entry>
     <entry>
       <base>VERIFY_DATE_AND_TIME</base>
-      <trans>Verify date and time</trans>
+      <trans>检查日期和时间</trans>
     </entry>
     <entry>
       <base>NEW_DATE_AND_TIME</base>
-      <trans>New date and time setting:</trans>
+      <trans>新日期和时间设置：</trans>
     </entry>
     <entry>
       <base>SETTING_DATE_AND_TIME</base>
-      <trans>Setting date and time</trans>
+      <trans>设置日期和时间</trans>
     </entry>
     <entry>
       <base>INVALID_DAY</base>
-      <trans>Error: invalid day of month:</trans>
+      <trans>错误：月的天数非法：</trans>
     </entry>
     <entry>
       <base>BETWEEN_1_AND_31</base>
-      <trans>Please choose a day between 1 and 31.</trans>
+      <trans>请选择一个1到31之间的天数。</trans>
     </entry>
     <entry>
       <base>INVALID_YEAR</base>
-      <trans>Error: invalid year:</trans>
+      <trans>错误：年份非法：</trans>
     </entry>
     <entry>
       <base>FOUR_DIGIT_YEAR</base>
-      <trans>Please choose a four-digit year between 1900 and 2200.</trans>
+      <trans>请选择一个1900到2200之间的四位数年份。</trans>
     </entry>
     <entry>
       <base>INVALID_HOUR</base>
-      <trans>Error: invalid hour:</trans>
+      <trans>错误：小时数非法：</trans>
     </entry>
     <entry>
       <base>BETWEEN_1_AND_12</base>
-      <trans>Please choose an hour between 1 and 12.</trans>
+      <trans>请选择一个1到12之间的小时数。</trans>
     </entry>
     <entry>
       <base>INVALID_MINUTE</base>
-      <trans>Error: invalid minute:</trans>
+      <trans>错误：分钟数非法：</trans>
     </entry>
     <entry>
       <base>BETWEEN_0_AND_59</base>
-      <trans>Please choose a minute between 0 and 59.</trans>
+      <trans>请选择0到59之间的分钟数。</trans>
     </entry>
     <entry>
       <base>INVALID_SECOND</base>
-      <trans>Error: invalid second</trans>
+      <trans>错误：秒数非法</trans>
     </entry>
     <entry>
       <base>UPDATING_CLOCK</base>
-      <trans><![CDATA[ System clock is being updated. Please wait for a few seconds, then click <A HREF="datetime?page=1&wherenext=Verify" TARGET="main">here</A> to verify changes. ]]></trans>
+      <trans><![CDATA[ 系统时钟正被更新。请您稍等片刻， 然后点击 <A HREF="datetime?page=1&wherenext=Verify" TARGET="main">此处</A> 来验证. ]]></trans>
     </entry>
     <entry>
       <base>ERR_SETTING_CLOCK</base>
-      <trans>Error occurred while setting system time and hardware clock.</trans>
+      <trans>在设置系统时间和硬件时钟时出错。</trans>
     </entry>
     <entry>
       <base>SERVER_DISABLED</base>
-      <trans>Network time server disabled successfully</trans>
+      <trans>网络时间服务器被成功禁用</trans>
     </entry>
     <entry>
       <base>SERVER_DISABLED_DESC</base>
-      <trans><![CDATA[ You have disabled this service: The server will rely on its internal clock, and <b>will not</b> try to synchronize from a time server. ]]></trans>
+      <trans><![CDATA[ 您已经禁用此服务: 此服务器将依靠自身的内部时钟, 并且 <b>将不会</b> 尝试与一个网络时间服务器同步。 ]]></trans>
     </entry>
     <entry>
       <base>ERR_CHANGING_TS</base>
-      <trans>Error while changing network time server setting</trans>
+      <trans>在改变网络时间服务器设置时出错</trans>
     </entry>
     <entry>
       <base>INVALID_NTP_ADDR</base>
-      <trans>Invalid NTP server address:</trans>
+      <trans>时间服务器地址非法：</trans>
     </entry>
     <entry>
       <base>SETTINGS_CHANGED</base>
-      <trans>Network time server setting changed successfully</trans>
+      <trans>网络时间服务器设置成功修改</trans>
     </entry>
     <entry>
       <base>SYNC_WITH</base>
-      <trans>This server is now configured to synchronize periodically (via the Internet) with:</trans>
+      <trans>此服务器现被配置为定期同步（通过因特网），同步网络时间服务器为：</trans>
     </entry>
     <entry>
       <base>INVALID_NTP_SERVER</base>
-      <trans><![CDATA[ Invalid NTP server, the server <b>will not</b> try to synchronize from a time server. ]]></trans>
+      <trans><![CDATA[ 网络时间服务器非法，此服务器 <b>将不会</b> 尝试与时间服务器同步。 ]]></trans>
     </entry>
     <entry>
       <base>NETWORK_TIME_SERVER</base>
-      <trans>Network Time Server</trans>
+      <trans>网络时间服务器</trans>
     </entry>
     <entry>
       <base>NTP_CONFIGURE_TITLE</base>
-      <trans>Configure Network Time Server</trans>
+      <trans>配置网络时间服务器</trans>
     </entry>
     <entry>
       <base>NTP_ENABLE_TITLE</base>
-      <trans>Enable Network Time Server</trans>
+      <trans>启用网络时间服务器</trans>
     </entry>
     <entry>
       <base>NTP_DISABLE_TITLE</base>
-      <trans>Disable Network Time Server</trans>
+      <trans>禁用网络时间服务器</trans>
     </entry>
     <entry>
       <base>CURRENT_SETTING</base>
-      <trans>Current setting</trans>
+      <trans>当前设置</trans>
     </entry>
     <entry>
       <base>Date and time</base>
-      <trans>Date and time</trans>
+      <trans>日期和时间</trans>
     </entry>
   </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/directory    2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/directory     2010-04-29 07:55:38.000000000 -0600
@@ -1,76 +1,76 @@
 <lexicon lang="zh-cn">
    <entry>
      <base>FORM_TITLE</base>
-       <trans>Change LDAP directory settings</trans>
+       <trans>改变LDAP目录设置</trans>
    </entry>    
 <entry>
 <base>LABEL_ROOT</base>
-<trans>Server root</trans>
+<trans>服务器的根</trans>
 </entry>
 
 <entry>
 <base>DESCRIPTION</base>
-<trans>The LDAP server provides a network-available listing of the user accounts and groups on your server, and can be accessed using an LDAP client such as the Address Book feature in Netscape Communicator. Configure your LDAP client with the local IP address of your server, port number 389, and the server root parameter shown below.</trans>
+<trans>LDAP服务器提供了在您的服务器上的用户帐户和群组的可用列表，并且可以通过使用一个LDAP客户端（如Netscape Communicator的地址簿功能）来访问。您的LDAP配置与您的服务器的本地IP地址的客户端，端口号389，服务器的根参数如下。</trans>
 </entry>
 <entry>
 <base>DESC_DIRECTORY_ACCESS</base>
-<trans>You can control access to your LDAP directory: the private setting allows access only from your local network, and the public setting allows access from anywhere on the Internet.</trans>
+<trans>您可以控制对您LDAP目录的访问：私有设置允许只从您的本地网络访问，公用设置允许从因特网的任何地方访问。</trans>
 </entry>
 <entry>
 <base>DIRECTORY_ACCESS</base>
-<trans>LDAP directory access</trans>
+<trans>LDAP目录访问</trans>
 </entry>
 <entry>
        <base>DESC_DEPARTMENT</base>
-<trans>These fields are the LDAP defaults for your organization. Whenever you create a new user account, you will be prompted to enter all of these fields (they can be different for each user) but the values you set here will show up as defaults. This is a convenience to make it faster to create user accounts.</trans>
+<trans>这些字段是LDAP默认值。当您创建了一个新的用户账号，您将会被提示输入所有这些字段（每个用户可能不一样），但是你在此处设置的值将会被视为默认值。这样方便快速创建用户账号。</trans>
 </entry>
 <entry>
         <base>DEPARTMENT</base>
-        <trans>Default department</trans>
+        <trans>默认部门</trans>
 </entry>
 
 <entry>
         <base>COMPANY</base>
-        <trans>Default company</trans>
+        <trans>默认公司</trans>
 </entry>
 <entry>
         <base>STREET</base>
-        <trans>Default Street address</trans>
+        <trans>默认街道地址</trans>
 </entry>
 
 <entry>
         <base>CITY</base>
-        <trans>Default City</trans>
+        <trans>默认城市</trans>
 </entry>
 
 <entry>
         <base>PHONENUMBER</base>
-        <trans>Default Phone Number</trans>
+        <trans>默认电话号码</trans>
 </entry>
 
 <entry>
 <base>DESC_EXISTING</base>
-<trans>You can either leave existing user accounts as they are, using the above defaults only for new users, or you can apply the above defaults to all existing users as well.</trans>
+<trans>您既可以让已存在用户保持原样、让新用户使用上述默认值，也可以将上述默认值应用到所有已存在用户。</trans>
 </entry>
 
 
 
 <entry>
 <base>EXISTING</base>
-<trans>Existing users</trans>
+<trans>已存在用户</trans>
 </entry>
 <entry>
 <base>SUCCESS</base>
-<trans>The new LDAP default settings have been saved.</trans>
+<trans>LDAP默认设置已被保存。</trans>
 </entry>
 
 <entry>
 <base>LEAVE</base>
-<trans>Leave as they are</trans>
+<trans>保持原样</trans>
 </entry>
 <entry>
 <base>UPDATE</base>
-<trans>Update with new defaults</trans>
+<trans>使用新的默认值更新</trans>
 </entry>
     <entry>
         <base>Directory</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/domains      2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/domains       2010-04-29 07:55:53.000000000 -0600
@@ -1,23 +1,23 @@
 <lexicon lang="zh-cn">
     <entry>
         <base>FORM_TITLE</base>
-        <trans>Manage domains</trans>
+        <trans>管理域</trans>
     </entry>
     <entry>
         <base>FORM_DESCRIPTION</base>
-        <trans><![CDATA[ <p>When you create a domain, your server will be able to receive e-mail for that domain and will also be able to host a web site for that domain.</p> <p><a class="button-like" href="domains?page=0&page_stack=&Next=Next&wherenext=DOMAINS_PAGE_CREATE">Add domain</a> ]]></trans>
+        <trans><![CDATA[ <p>当您创建一个域，您的服务器将会受到一份该域的邮件，并可以为此域建立网站。</p> <p><a class="button-like" href="domains?page=0&page_stack=&Next=Next&wherenext=DOMAINS_PAGE_CREATE">增加域</a> ]]></trans>
     </entry>
     <entry>
         <base>NO_VIRTUAL_DOMAINS</base>
-        <trans>There are no domains in the system.</trans>
+        <trans>系统中暂无域。</trans>
     </entry>
     <entry>
         <base>CURRENT_LIST_OF_DOMAINS</base>
-        <trans>Current list of domains</trans>
+        <trans>当前域列表</trans>
     </entry>
     <entry>
         <base>PRIMARY_SITE</base>
-        <trans>primary site</trans>
+        <trans>主站点</trans>
     </entry>
     <entry>
         <base>CONTENT</base>
@@ -25,109 +25,109 @@
     </entry>
     <entry>
         <base>CREATE_TITLE</base>
-        <trans>Create a new domain</trans>
+        <trans>创建一个新域</trans>
     </entry>
     <entry>
         <base>CONTENT_FIELD_DESCRIPTION</base>
-        <trans>For the web site, you may choose your primary web site or any i-bay as the content.</trans>
+        <trans>对于web站点，您可以选择您的主站点或者i-bay最为网站的内容。</trans>
     </entry>
     <entry>
         <base>DOMAIN_NAME_VALIDATION_ERROR</base>
-        <trans>Error: unexpected or missing characters in domain name {$domainName}. The domain name should contain one or more letters, numbers, periods and minus signs. Did not create new domain.</trans>
+        <trans>错误：在域名{$domainName}中意外或者丢失字符。此域名应该包含一个或者多个字母、数字、句点和负号。未能创建新域。</trans>
     </entry>
     <entry>
         <base>DOMAIN_DESCRIPTION_VALIDATION_ERROR</base>
-        <trans>Error: unexpected or missing characters in domain description {$domainDesc}. Did not create new domain.</trans>
+        <trans>错误：在域名{$domainDesc}中出现意外或者丢失字符。未能创建新域。</trans>
     </entry>
     <entry>
         <base>DOMAIN_IN_USE_ERROR</base>
-        <trans>Error: domain {$domainName} is already in use. Did not create new domain.</trans>
+        <trans>错误：域 {$domainName} 已在使用中。未能创建新域。</trans>
     </entry>
     <entry>
         <base>SYSTEM_DOMAIN_ERROR</base>
-        <trans>Error: domain {$domainName} is your system domain name. You cannot have a domain with the same name. Did not create new domain.</trans>
+        <trans>错误：域 {$domainName}是您系统的域名。您不能创建一个同名域。未能创建新域。</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_CREATED</base>
-        <trans>Successfully created domain {$domainName}. Your web server is now being restarted. The links on this page will be inactive until the web server restart is complete.</trans>
+        <trans>成功修改了域{$domainName}。您的web服务器现正重新启动。此页面上的链接将失效，直到该web服务器启动好为止。</trans>
     </entry>
     <entry>
         <base>MODIFY_TITLE</base>
-        <trans>Modify domain</trans>
+        <trans>修改域</trans>
     </entry>
     <entry>
         <base>NONEXISTENT_DOMAIN_ERROR</base>
-        <trans>Error: {$domainName} is not an existing domain.</trans>
+        <trans>错误: {$domainName} 已经存在。</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_MODIFIED</base>
-        <trans>Successfully modified domain {$domainName}. Your web server is now being restarted. The links on this page will be inactive until the web server restart is complete.</trans>
+        <trans>成功修改了域{$domainName}。您的web服务器现正重新启动。此页面上的链接将失效，直到该web服务器启动好。</trans>
     </entry>
     <entry>
         <base>REMOVE_TITLE</base>
-        <trans>Remove domain</trans>
+        <trans>移除域</trans>
     </entry>
     <entry>
         <base>REMOVE_DESCRIPTION</base>
-        <trans><![CDATA[ <p> You are about to remove the domain {$domain} ({$domainDesc}). </p> <p> <b>Are you sure you wish to remove this domain?</b> </p> ]]></trans>
+        <trans><![CDATA[ <p> 您正在打算移除域 {$domain} ({$domainDesc}). </p> <p> <b>您是否确信要移除此域么？</b> </p> ]]></trans>
     </entry>
     <entry>
         <base>ERROR_WHILE_REMOVING_DOMAIN</base>
-        <trans>Error: internal failure while removing domain {$domain}.</trans>
+        <trans>错误：当移除域 {$domain} 时出现内部故障。</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_DELETED</base>
-        <trans>Successfully deleted domain {$domain}. Your web server is now being restarted. The links on this page will be inactive until the web server restart is complete.</trans>
+        <trans>成功删除域 {$domain}。您的web服务器现正重新启动。此页面上的链接将失效，直到该web服务器启动好。</trans>
     </entry>
 
     <entry>
         <base>DESC_CORPORATE_DNS_CURRENT</base>
-        <trans><![CDATA[ <hr class="sectionbar" /><h2>Corporate DNS Settings</h2> ]]></trans>
+        <trans><![CDATA[ <hr class="sectionbar" /><h2>公司DNS设置</h2> ]]></trans>
     </entry>
 
     <entry>
         <base>BUTTON_CORPORATE_DNS</base>
-        <trans><![CDATA[ <p>If this server does not have access to the Internet, or you have special requirements for DNS resolution, enter the DNS server IP address here. You should not enter the address of your ISP's DNS servers here, as the server is capable of resolving all Internet DNS names without this additional configuration.</p> <p> <a class="button-like" href="domains?page=0&page_stack=&Next=Next&wherenext=DOMAINS_PAGE_CORPORATE_DNS">Modify corporate DNS settings</a> ]]></trans>
+        <trans><![CDATA[ <p>如果此服务器不访问因特网，或者您对此DNS解析有特别的需要，在此处输入DNS服务器IP地址。您不需要在此处输入您ISP的DNS服务器地址，此服务器 可以解析所有因特网域名而不需要附加设置。</p> <p> <a class="button-like" href="domains?page=0&page_stack=&Next=Next&wherenext=DOMAINS_PAGE_CORPORATE_DNS">编辑公司DNS设置</a> ]]></trans>
     </entry>
 
     <entry>
         <base>DESC_CORPORATE_DNS</base>
-        <trans>If this server does not have access to the Internet, or you have special requirements for DNS resolution, enter the DNS server IP addresses here. These fields should be left blank unless you have a specific reason to configure other DNS servers. You should not enter the address of your ISP's DNS servers here, as the server is capable of resolving all Internet DNS names without this additional configuration.</trans>
+        <trans>如果此服务器不访问因特网，或者有特殊的DNS解析需要，请在此处输入DNS服务器IP地址。这些字段应该留空，除非您有特别的原因要配置为其他的DNS服务器。您不需要在此处输入你ISP的DSN服务器，因为不需要额外的配置，就可以解决因特网解析。</trans>
     </entry>
 
     <entry>
         <base>LABEL_CORPORATE_DNS_PRIMARY</base>
-        <trans>Primary corporate DNS server</trans>
+        <trans>主DNS服务器</trans>
     </entry>
 
     <entry>
         <base>LABEL_CORPORATE_DNS_SECONDARY</base>
-        <trans>Secondary corporate DNS server</trans>
+        <trans>辅助DNS服务器</trans>
     </entry>
 
     <entry>
         <base>DESC_NAMESERVERS</base>
-        <trans>You can select whether this domain is resolved locally, passed to the corporate DNS servers, or resolved by the Internet DNS servers. The default will be correct for most networks.</trans>
+        <trans>您既可以选择此域通过公司DNS服务器被本地解析，也可以被因特网DSN服务器解析。默认值适用于大多数网络。</trans>
     </entry>
 
     <entry>
         <base>LABEL_NAMESERVERS</base>
-        <trans>Domain DNS servers</trans>
+        <trans>域DNS服务器</trans>
     </entry>
 
     <entry>
         <base>localhost</base>
-        <trans>Resolve locally</trans>
+        <trans>本地解析</trans>
     </entry>
 
     <entry>
         <base>internet</base>
-        <trans>Internet DNS servers</trans>
+        <trans>因特网DNS服务器</trans>
     </entry>
 
     <entry>
         <base>corporate</base>
-        <trans>Corporate DNS servers</trans>
+        <trans>公司DNS服务器</trans>
     </entry>
 
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/emailsettings        2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/emailsettings 2010-04-29 07:56:14.000000000 -0600
@@ -11,7 +11,7 @@
     </entry>
     <entry>
         <base>SUCCESS</base>
-        <trans>The new e-mail settings have been saved.</trans>
+        <trans>新的备份设置已经被保存。</trans>
     </entry>
     <entry>
         <base>NEVER</base>
@@ -87,41 +87,41 @@
     </entry>
     <entry>
         <base>LABEL_FETCH_PERIOD</base>
-        <trans>During office hours (8:00 AM to 6:00 PM) on weekdays</trans>
+        <trans>在平日的办公时间内（上午8:00至下午6:00）</trans>
     </entry>
     <entry>
         <base>LABEL_FETCH_PERIOD_NIGHTS</base>
-        <trans>Outside office hours (6:00 PM to 8:00 AM) on weekdays</trans>
+        <trans>在平日的办公时间外（下午6:00至上午8:00）</trans>
     </entry>
     <entry>
         <base>LABEL_FETCH_PERIOD_WEEKENDS</base>
-        <trans>During the weekend</trans>
+        <trans>在周末</trans>
     </entry>
     <entry>
         <base>DESC_POP_ACCOUNT</base>
-        <trans>For multi-drop e-mail, specify the POP user account and password. (If using standard or ETRN e-mail, these fields can be blank.) Also, for multi-drop, you can either use the default mail sorting method, or you can specify a particular message header to use for mail sorting.</trans>
+        <trans>对于多点电子邮件，请指定的POP用户帐户和密码。 （如果使用标准或ETRN电子邮件，这些字段可以为空。）此外，对于多点电子邮件，你可以使用默认的邮件整理方式，或者也可以指定一个特定的用于邮件排序邮件消息头。</trans>
     </entry>
     <entry>
         <base>LABEL_POP_PASS</base>
-        <trans>POP user password (for multi-drop)</trans>
+        <trans>POP用户密码（多点电子邮件）</trans>
     </entry>
 
     <entry>
         <base>LABEL_POP_ACCOUNT</base>
-        <trans>POP user account (for multi-drop)</trans>
+        <trans>POP用户账号（多点电子邮件）</trans>
     </entry>
     <entry>
         <base>LABEL_SORT_METHOD</base>
-        <trans>Select sort method (for multi-drop)</trans>
+        <trans>选择整理方式（多点电子邮件）</trans>
     </entry>
 
     <entry>
         <base>LABEL_SORT_HEADER</base>
-        <trans>Select sort header (for multi-drop)</trans>
+        <trans>选择整理信息头（多点电子邮件）</trans>
     </entry>
     <entry>
         <base>LABEL_FETCH_PROTO</base>
-        <trans>Protocol (for multi-drop)</trans>
+        <trans>协议（多点电子邮件）</trans>
     </entry>
     <entry>
         <base>LABEL_FETCH_SECURE</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/groups       2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/groups        2010-04-29 07:57:00.000000000 -0600
@@ -1,84 +1,84 @@
 <lexicon lang="zh-cn">
     <entry>
         <base>FORM_TITLE</base>
-        <trans>Create, modify, or remove user groups</trans>
+        <trans>创建、编辑或者移除用户群组。</trans>
     </entry>   
     <entry>
         <base>GROUP_TOO_LONG</base>
-        <trans>Error: group name is too long.The maximum is {$maxLength} characters.</trans>
+        <trans>错误：群组名称太长，最大为{$maxLength}个字符。</trans>
     </entry>    
     <entry>
         <base>ACCOUNT_CONFLICT</base>
-        <trans>Error: the group "{$group}" can't be created because there is already a {$type} account of that name.</trans>
+        <trans>错误：群组"{$group}"不能被删除，因为该群组已有一个{$type}账号。</trans>
     </entry>    
     <entry>
         <base>INVALID_GROUP_DESCRIPTION</base>
-        <trans>Error: unexpected or missing characters in group description</trans>
+        <trans>错误：非预期的或者再群组描述中缺少字符</trans>
     </entry>
     <entry>
         <base>NO_MEMBERS</base>
-        <trans>Error: no members in group. Did not create new group.</trans>
+        <trans>错误：群组中无成员。暂未创建新群组。</trans>
     </entry>
     <entry>
         <base>CREATED_GROUP</base>
-        <trans>Successfully created user group</trans>
+        <trans>成功创建用户群组。</trans>
     </entry> 
     <entry>
         <base>DELETED_GROUP</base>
-        <trans>Successfully removed user group</trans>
+        <trans>成功移除用户群组。</trans>
     </entry> 
     <entry>
         <base>MODIFIED_GROUP</base>
-        <trans>Successfully modifed user group</trans>
+        <trans>成功修改以后群组。</trans>
     </entry>   
     <entry>
         <base>CREATE_ERROR</base>
-        <trans>An error occurred while creating user group.</trans>
+        <trans>创建用户群组时出错。</trans>
     </entry> 
     <entry>
         <base>DELETE_ERROR</base>
-        <trans>An error occurred while removing user group.</trans>
+        <trans>移除用户群组时出错。</trans>
     </entry> 
     <entry>
         <base>MODIFY_ERROR</base>
-        <trans>An error occurred while modifying user group.</trans>
+        <trans>编辑用户群组时出错。</trans>
     </entry>   
     <entry>
         <base>GROUP_NAMING</base>
-        <trans><![CDATA[ The group name should contain only lower-case letters, numbers, hyphens, periods, and underscores, and should start with a lower-case letter. For example "sales", "beta5", and "reseller_partners" are all valid group names, but "3rd-event", "Marketing Team" and "lost&found" are not. ]]></trans>
+        <trans><![CDATA[ 群组名称应该只包含小写字母、连接符和下划线,并且以一个小写字母开头。例如 "sales", "beta5", 和 "reseller_partners" 都是合法的群组名称，但是 "3rd-event"、"Marketing Team" 和 "lost&found" 是不允许的 ]]></trans>
     </entry>
     <entry>
         <base>GROUP_HAS_MEMBERS</base>
-        <trans>This group contains the following members:</trans>
+        <trans>此群组包含如下成员：</trans>
     </entry>
     <entry>
         <base>NOT_A_GROUP</base>
-        <trans>Error: That is not an existing group account.</trans>
+        <trans>错误：这不是一个已存在的群组账号。</trans>
     </entry>
     <entry>
         <base>GROUP_DESC</base>
-        <trans>Brief Description/Windows Group Alias</trans>
+        <trans>简介/Windows群组别名</trans>
     </entry>
    <entry>
         <base>GROUP_DESC_EXPL</base>
-        <trans>Input a brief group description in the field below. This field also designates the group name viewable by Windows clients.</trans>
+        <trans>在下面的字段中输入一个简短的群组说明，此字段也标明被Windows客户端查看到的群组名称。</trans>
    </entry>
 
 
     <entry>
         <base>IBAYS_WILL_BE_CHANGED</base>
-        <trans>The following information bays were assigned to this group and will be changed to the Administrator group (you can change them to something else afterward):</trans>
+        <trans>以下信息bays已分配到此群组，并且将被变更为管理员群组（有些部分您可以稍后修改）：</trans>
     </entry>
     <entry>
         <base>CONFIRM_DELETE_GROUP</base>
-        <trans><![CDATA[ <p><b>Are you sure you wish to remove this group?</b></p> ]]></trans>
+        <trans><![CDATA[ <p><b>您确信要移除此群组么？</b></p> ]]></trans>
     </entry>
     <entry>
         <base>CURRENT_LIST</base>
-        <trans><![CDATA[<p>Current list of User Groups</p>]]></trans>
+        <trans><![CDATA[<p>当前用户群组列表</p>]]></trans>
     </entry>
     <entry>
                <base>DELETE_DESCRIPTION</base>
-               <trans><![CDATA[ You are about to remove the user group "<b>{$group}</b>." ]]></trans>
+               <trans><![CDATA[ 您正准备移除用户群组 "<b>{$group}</b>。" ]]></trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/hostentries  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/hostentries   2010-04-29 07:57:11.000000000 -0600
@@ -3,23 +3,23 @@
     -->
     <entry>
         <base>Hostnames and addresses</base>
-        <trans>Hostnames and addresses</trans>
+        <trans>主机名和地址</trans>
     </entry>
     <entry>
         <base>UNABLE_TO_OPEN_CONFIGDB</base>
-        <trans>Unable to open configuration database</trans>
+        <trans>无法打开配置数据库。</trans>
     </entry>
     <entry>
         <base>DNS_FORWARDER_ENABLED</base>
-        <trans>A DNS forwarder has been configured. This means that all DNS lookups will be handled by the DNS forwarder. Hostnames and addresses cannot be modified on this server while a DNS forwarder is configured.</trans>
+        <trans>DNS转发器已被配置。这意味着所有的DNS查询将由此DNS转发器来处理。当DNS转发器被配置过，那么在此服务器上，主机名和地址不能被修改。</trans>
     </entry>
     <entry>
         <base>ADD_HOSTNAME</base>
-        <trans><![CDATA[ <a class="button-like" href="hostentries?page=0&page_stack=&Next=Next&wherenext=CreateModify">Add hostname</a> ]]></trans>
+        <trans><![CDATA[ <a class="button-like" href="hostentries?page=0&page_stack=&Next=Next&wherenext=CreateModify">增加主机名</a> ]]></trans>
     </entry>
     <entry>
         <base>HOSTNAME</base>
-        <trans>Hostname</trans>
+        <trans>主机名</trans>
     </entry>
     <entry>
         <base>HOSTTYPE</base>
@@ -27,142 +27,142 @@
     </entry>
     <entry>
         <base>LOCAL_IP</base>
-        <trans>Local IP</trans>
+        <trans>本地IP</trans>
     </entry>
     <entry>
         <base>ETHERNET_ADDRESS</base>
-        <trans>Ethernet address</trans>
+        <trans>以太网地址</trans>
     </entry>
     <entry>
         <base>CURRENT_HOSTNAMES_FOR_DOMAIN</base>
-        <trans>Current list of hostnames for {$domain}.</trans>
+        <trans>当前{$domain}的主机名列表。</trans>
     </entry>
     <entry>
         <base>NO_HOSTNAMES_FOR_SERVICENAME</base>
-        <trans>There are no hostnames in the system for {$serviceName}.</trans>
+        <trans>系统中{$serviceName}暂无主机名。</trans>
     </entry>
     <entry>
         <base>CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN</base>
-        <trans>Current list of hostnames for {$localDomainName}</trans>
+        <trans>当前{$localDomainName}的主机名列表。</trans>
     </entry>
     <entry>
         <base>NO_HOSTNAMES_FOR_LOCAL_DOMAIN</base>
-        <trans>There are no hostnames in the system for {$localDomainName}.</trans>
+        <trans>系统中{$localDomainName}暂无主机名。</trans>
     </entry>
     <entry>
         <base>STATIC_HOST_MESSAGE</base>
-        <trans>- This host represents your system name and cannot be modified or removed.</trans>
+        <trans> - 此主机代表您的系统名称，不能被修改或者移除。</trans>
     </entry>
     <entry>
         <base>CREATE_LOCAL_HOST_TITLE</base>
-        <trans>Create a new hostname for this server</trans>
+        <trans>为此服务器创建新主机名</trans>
     </entry>
     <entry>
         <base>HOSTNAME_VALIDATION_ERROR</base>
-        <trans>Error: unexpected characters in host name: "{$HostName}". The host name should contain only letters, numbers, and hyphens and must start with a letter or a number.</trans>
+        <trans>错误：在主机名"{$HostName}"出现非预期字符。主机名应该只包含字母、数字和连接符，并且以一个字母或者数字开头。</trans>
     </entry>
     <entry>
         <base>HOSTNAME_LENGTH_ERROR</base>
-        <trans>Error: account name {$HostName} is too long. The maximum is 32 characters.</trans>
+        <trans>错误：账号名称{$HostName}太长，最大为32个字符。</trans>
     </entry>
     <entry>
         <base>DOMAIN_VALIDATION_ERROR</base>
-        <trans>Error: unexpected or missing characters in domain name {$DomainName}. The domain name should contain one or more letters, numbers, periods and minus signs. Did not create new domain.</trans>
+        <trans>错误：在域名{$domainName}中意外或者丢失字符。此域名应该包含一个或者多个字母、数字、句点和负号。未能创建新域。</trans>
     </entry>
     <entry>
         <base>HOSTNAME_EXISTS_ERROR</base>
-        <trans>Error: account {$fullHostName} is an existing {$type} hostname.</trans>
+        <trans>错误：账号{$fullHostName}是一个已存在的{$type}主机名。</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_CREATED</base>
-        <trans>Successfully created hostname.</trans>
+        <trans>成功创建主机名</trans>
     </entry>
     <entry>
         <base>HOSTNAME_DESCRIPTION</base>
-        <trans>The hostname must contain only letters, numbers, and hyphens, and must start with a letter or number.</trans>
+        <trans>主机名必须只能保护字母、数字和连接符，并且必须以一个字母或者数字开头。</trans>
     </entry>
     <entry>
         <base>LOCAL_IP_DESCRIPTION</base>
-        <trans>The Local IP address is the IP address of another machine on the local network. Please enter a valid IP address in the format "aaa.bbb.ccc.ddd".</trans>
+        <trans>此IP地址是本地网络中其他机器的IP地址。请输入一个合法的IP地址，格式为"aaa.bbb.ccc.ddd"。</trans>
     </entry>
     <entry>
         <base>ETHERNET_ADDRESS_DESCRIPTION</base>
-        <trans>The ethernet address is optional and causes the DHCP server to statically bind the local IP address to the computer with this ethernet address. If specified, it must be of the form "AA:BB:CC:DD:EE:FF" and must contain only the numbers 0-9 and the letters A-F.</trans>
+        <trans>以太网地址是可选的，通过它，可以让DHCP服务器静态绑定本地的IP地址到计算机。如果指定了，它必须是此种格式"AA:BB:CC:DD:EE:FF"，并且必须只包含数字0-9和字母A-F。</trans>
     </entry>
     <entry>
         <base>CREATE_LOCAL_HOST_TITLE</base>
-        <trans>Create a new hostname referring to a local host.</trans>
+        <trans>创建一个新的本地主机名</trans>
     </entry>
     <entry>
         <base>DIDNT_ENTER_LOCAL_IP</base>
-        <trans>Error: You did not specify a Local IP address. IP addresses must contain only numbers and periods and be in the form "aaa.bbb.ccc.ddd". Did not create hostname.</trans>
+        <trans>错误：您为指定一个本地IP地址。IP地址只允许包含数字和句点，并且格式为"aaa.bbb.ccc.ddd"。未能创建主机名。</trans>
     </entry>
     <entry>
         <base>IP_VALIDATION_ERROR</base>
-        <trans>Error: IP Address {$InternalIP} is invalid. IP Addresses must contain only numbers and periods and be in the form "aaa.bbb.ccc.ddd". Did not create hostname.</trans>
+        <trans>错误：IP地址{$InternalIP}不合法。IP地址必须仅包含数字和句点，并且格式为"aaa.bbb.ccc.ddd"。未能创建主机名。</trans>
     </entry>
     <entry>
         <base>MAC_ADDRESS_VALIDATION_ERROR</base>
-        <trans>Error: Ethernet address {$MACAddress} is invalid. Ethernet addresses must be in the form "AA:BB:CC:DD:EE:FF" and only contain the numbers 0-9 and the letters A-F. Did not create hostname.</trans>
+        <trans>错误：以太网地址{$MACAddress}不合法。以太网地址格式必须为"AA:BB:CC:DD:EE:FF"，并且只能包含数字0-9和字母A-Z。未能创建主机名。</trans>
     </entry>
     <entry>
         <base>CREATE_REMOTE_HOST_TITLE</base>
-        <trans>Create a new hostname referring to a remote host</trans>
+        <trans>创建一个新的远程主机名</trans>
     </entry>
     <entry>
         <base>CREATE_TITLE</base>
-        <trans>Create or modify hostname</trans>
+        <trans>创建或者编辑主机名</trans>
     </entry>
     <entry>
         <base>LOCAL_PAGE_DESCRIPTION</base>
-        <trans>Please enter the following additional details for a local host:</trans>
+        <trans>请为本地主机输入如下的其他细节：</trans>
     </entry>
     <entry>
         <base>REMOTE_PAGE_DESCRIPTION</base>
-        <trans>Please enter the following additional details for a remote host:</trans>
+        <trans>请为远程主机输入如下的其他细节</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_DELETED</base>
-        <trans>Successfully deleted host.</trans>
+        <trans>成功删除主机。</trans>
     </entry>
     <entry>
         <base>SUCCESSFULLY_MODIFIED</base>
-        <trans>Successfully modified host.</trans>
+        <trans>成功编辑主机。</trans>
     </entry>
     <entry>
         <base>REMOVE_PAGE_DESCRIPTION</base>
-        <trans><![CDATA[ You are about to remove the hostname "{$hostname}.{$domain}". </p> <p> <b>Are you sure you wish to remove this hostname?</b> ]]></trans>
+        <trans><![CDATA[ 您正要移除主机名 "{$hostname}.{$domain}". </p> <p> <b>您确信要删除此主机名么？</b> ]]></trans>
     </entry>
     <entry>
         <base>CONFIRM_DESCRIPTION</base>
-        <trans>Please confirm the following details.</trans>
+        <trans>请确认如下细节。</trans>
     </entry>
     <entry>
         <base>NO_HOSTS_FOR_THIS_DOMAIN</base>
-        <trans>There are no hosts for this domain.</trans>
+        <trans>此域暂无主机。</trans>
     </entry>
     <entry>
         <base>ADDR_IN_DHCP_RANGE</base>
-        <trans>Address is inside the DHCP assigned dynamic range</trans>
+        <trans>地址是DHCP内部动态分配的范围</trans>
     </entry>
     <entry>
         <base>ERROR_WHILE_CREATING_HOST</base>
-        <trans>Error occurred while creating hostname.</trans>
+        <trans>创建主机名时出错。</trans>
     </entry>
     <entry>
         <base>ERROR_WHILE_MODIFYING_HOST</base>
-        <trans>Error occurred while modifying hostname.</trans>
+        <trans>编辑主机名时出错。</trans>
     </entry>
     <entry>
         <base>ERROR_WHILE_DELETING_HOST</base>
-        <trans>Error occurred while deleting hostname.</trans>
+        <trans>删除主机名时出错。</trans>
     </entry>
     <entry>
         <base>ERR_IP_IS_LOCAL_OR_GATEWAY</base>
-        <trans>Error: IP cannot be server IP or Gateway IP.</trans>
+        <trans>错误：IP地址不能为服务器IP或者网关IP。</trans>
     </entry>
     <entry>
         <base>ERR_IP_NOT_LOCAL</base>
-        <trans>Error: This IP address is not on any of our local networks.</trans>
+        <trans>错误：此IP地址不在本地网络范围内。</trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/initial.cgi  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/initial.cgi   2010-04-29 07:57:45.000000000 -0600
@@ -1,16 +1,16 @@
 <lexicon lang="zh-cn">
     <entry>
        <base>FORM_TITLE</base>
-       <trans>Welcome to the server manager</trans>
+       <trans>欢迎来到服务器管理器</trans>
     </entry>
 
     <entry>
        <base>FRAMES_BODY</base>
-       <trans><![CDATA[ <p> Welcome to SME Server, the leading Linux distribution for small and medium enterprises. SME Server is brought to you by <A HREF="http://www.smeserver.org/" TARGET="_blank">SME Server, Inc.</A>, a non-profit corporation that exists to provide marketing and legal support for SME Server. </p> <p> SME Server is freely available under the GNU General Public License and is only possible through the efforts of the SME Server community. However, the availability and quality of SME Server is dependent on meeting our expenses, such as hosting costs, server hardware, etc. </p> <p> As such, we ask for a small donation to offset costs and fund further development. </p> <p> <b> Please visit <A HREF="http://www.smeserver.org/donate/" TARGET="_blank">http://www.smeserver.org/donate/</A> to donate. </b></P> <p> This software comes with ABSOLUTELY NO WARRANTY. Please <A HREF="/server-manager/support/" TARGET="main">click here</A> to view detailed support, warranty and licensing information. </p> <p> To perform a system administration function, click one of the links in the menu on the left of your screen. </p> ]]></trans>
+       <trans><![CDATA[ <p> 欢迎来到 SME 服务器, 中小企业linux发行版本的领导者。 SME 服务器的赞助商为 <A HREF="http://www.smeserver.org/" TARGET="_blank">SME Server, Inc.</A>, 一个非营利性公司，它的存在是为了为SME 服务器提供市场营销和法律支持。 </p> <p> SME服务器是免费的GNU通用公共许可证，并通过中小企业服务器社会的努力才是可能的。然而，SME服务器的可用性和质量上满足诸如托管费用，服务器硬件等的支出，供养等等。</p> <p> 因此，我们要求的一小捐赠和资助，以抵消成本的进一步增长。 </p> <p> <b> 请访问<A HREF="http://www.smeserver.org/donate/" TARGET="_blank">http://www.smeserver.org/donate/</A> 来赞助我们。 </b></P> <p> 这个软件是绝对没有担保。请 <A HREF="/server-manager/support/" TARGET="main">点击此处</A> 查看支持细节、保证和许可信息 。 </p> <p> 要执行系统管理功能，请屏幕左侧菜单上的链接。 </p> ]]></trans>
     </entry>
 
     <entry>
        <base>NOFRAMES_BODY</base>
-       <trans><![CDATA[ <p> Welcome to the SME Server. This software comes with ABSOLUTELY NO WARRANTY. Please <A HREF="/server-manager/support/" TARGET="main">click here</A> to view detailed support, warranty and licensing information. </p> <p> <A HREF="/server-manager/noframes">Click here</A> for a list of system administration functions. </p> ]]></trans>
+       <trans><![CDATA[ <p>欢迎来到 SME 服务器。这个软件是绝对没有担保。请 <A HREF="/server-manager/support/" TARGET="main">点击此处</A> 查看支持细节、保证和许可信息 。 </p> <p> <A HREF="/server-manager/noframes">点击此处</A> 查看系统管理功能列表。 </p> ]]></trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/online-manual        2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/online-manual 2010-04-29 07:58:07.000000000 -0600
@@ -1,7 +1,7 @@
 <lexicon lang="zh-cn">
       <entry>
        <base>FORM_TITLE</base>
-       <trans>Online manual and other documentation</trans>
+       <trans>在线手册和其他文档</trans>
       </entry> 
       <entry> 
        <base>DESCRIPTION</base>
@@ -9,7 +9,7 @@
       </entry>         
       <entry>
        <base>Online manual</base>
-       <trans>Online manual</trans>
+       <trans>在线手册</trans>
       </entry>
 
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/proxy        2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/proxy 2010-04-29 07:58:50.000000000 -0600
@@ -35,4 +35,8 @@
         <base>SUCCESS</base>
         <trans>The new proxy settings were applied successfully.</trans>
     </entry>
+    <entry>
+        <base>BLOCKED</base>
+        <trans>阻塞</trans>
+    </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/quota        2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/quota 2010-04-29 07:59:20.000000000 -0600
@@ -17,7 +17,7 @@
     </entry>
     <entry>
       <base>LIMIT_WITH_GRACE</base>
-      <trans>Limit with grace period</trans>
+      <trans>有宽限期的限制</trans>
     </entry>
     <entry>
       <base>LIMIT_WITH_GRACE_MB</base>
@@ -25,7 +25,7 @@
     </entry>
     <entry>
       <base>ABS_LIMIT</base>
-      <trans>Absolute limit</trans>
+      <trans>绝对限制</trans>
     </entry>
     <entry>
       <base>ABS_LIMIT_MB</base>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/reboot       2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/reboot        2010-04-29 07:59:29.000000000 -0600
@@ -1,7 +1,7 @@
 <lexicon lang="zh-cn">
     <entry>
        <base>FORM_TITLE</base>
-       <trans>Shutdown or reboot</trans>
+       <trans>关机或者重新启动</trans>
     </entry>
     <entry>
        <base>REBOOT</base>
@@ -9,34 +9,34 @@
     </entry>
     <entry>
        <base>REBOOT_SUCCEEDED</base>
-       <trans>Reboot request initiated successfully.</trans>
+       <trans>重新启动请求成功启动。</trans>
     </entry>
     <entry>
        <base>DESC_REBOOT</base>
-       <trans>Your server has initiated the reboot process.</trans>
+       <trans>您的服务器已经开始重新启动的过程。</trans>
     </entry>
     <entry>
        <base>RECONFIGURE_SUCCEEDED</base>
-       <trans>Reconfiguration request initiated successfully.</trans>
+       <trans>重新配置请求成功启动。</trans>
     </entry>
     <entry>
        <base>DESC_RECONFIGURE</base>
-       <trans>Your server has initiated a full system reconfiguration and reboot.</trans>
+       <trans>您的服务器已经开始一个完整的系统重新配置过程，并且系统将重新启动。</trans>
     </entry>
     <entry>
        <base>DESC_SHUTDOWN</base>
-       <trans>Your server has initiated the shutdown process. The process will take several minutes to complete, after which you can switch off the power.</trans>
+       <trans>您的服务器已经开始关机的过程。此过程需要花费几分钟时间来完成，之后您可以关闭电源。</trans>
     </entry>
     <entry>
        <base>LABEL_REBOOT</base>
-       <trans>Select Shutdown, Reboot or Reconfigure</trans>
+       <trans>选择关机、重新启动还是重新配置</trans>
     </entry>
     <entry>
        <base>DESCRIPTION</base>
-       <trans><![CDATA[ You can reboot, shut down your server or perform a full system reconfiguration from this screen. You must perform a shutdown before switching the power off. All of these functions take several minutes to complete. When you click <b>perform</b> the operation will be initiated immediately, so be ready! ]]></trans>
+       <trans><![CDATA[在此界面，您可以重新启动、关机或者执行一个完整的系统重新配置。 在您关闭电源之前，请先执行关机操作。所有这些功能会花费几分钟时间来完成。当您点击 <b>执行</b> ，操作将会立即开始，因此请事先做好准备！ ]]></trans>
     </entry>
     <entry>
        <base>Reboot or shutdown</base>
-       <trans>Reboot or shutdown</trans>
+       <trans>重新启动或者关机</trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/support      2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/support       2010-04-29 08:00:28.000000000 -0600
@@ -1,10 +1,10 @@
 <lexicon lang="zh-cn">
     <entry>
       <base>FORM_TITLE</base>
-      <trans>Support, warranty and licensing information</trans>
+      <trans>支持，授权和许可信息</trans>
     </entry>
     <entry>
         <base>Support and licensing</base>
-        <trans>Support and licensing</trans>
+        <trans>支持和许可</trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/workgroup    2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/workgroup     2010-04-29 08:01:53.000000000 -0600
@@ -1,58 +1,58 @@
 <lexicon lang="zh-cn">
     <entry>
         <base>FORM_TITLE</base>
-        <trans>Change workgroup settings</trans>
+        <trans>改变工作组设置</trans>
     </entry>   
     <entry> 
         <base>DESC_WORKGROUP</base>
-        <trans><![CDATA[ Enter the name of the Windows workgroup that this server should appear in. ]]></trans>        
+        <trans><![CDATA[ 输入此服务器将出现的Windows工作组名称 ]]></trans>    
     </entry>
     <entry>
         <base>LABEL_WORKGROUP</base>
-        <trans>Windows workgroup</trans>
+        <trans>Windows 工作组</trans>
     </entry>
     <entry>
         <base>DESC_SERVERNAME</base>
-        <trans>Enter the name that this server should use for Windows and Macintosh file sharing.</trans>
+        <trans>为windows和Mac文件夹共享使用，输入此服务器的名称。</trans>
     </entry>
     <entry>
         <base>LABEL_SERVERNAME</base>
-        <trans>Server Name</trans>
+        <trans>服务器名称</trans>
     </entry>
     <entry>
         <base>DESC_PDC</base>
-        <trans><![CDATA[Should this server act as the workgroup and domain controller on your Windows network? You should leave this set to <b>No</b> if another server is already performing this role on your network.]]></trans>
+        <trans><![CDATA[是否要让此服务器在您的windows网络中作为工作组和域控器来使用？您应该选择 <b>No</b> ，如果您的网络中已有域控器。]]></trans>
     </entry>
     <entry>
         <base>LABEL_PDC</base>
-        <trans>Workgroup and Domain Controller</trans>
+        <trans>工作组和域控器</trans>
     </entry>
     <entry>
         <base>DESC_ROAM</base>
-        <trans><![CDATA[ Should this server support roaming profiles? You should leave this set to the default of <b>No</b> unless you have experience administering server-based Windows roaming profiles and know that this feature is required. ]]></trans>
+        <trans><![CDATA[ 此服务器是否支持漫游账户？您应该选择默认设置 <b>No</b>， 除非你在基于服务器的Windows漫游账户方面有很好的管理经验，并且知道此特征为必须的. ]]></trans>
     </entry>
     <entry>
         <base>LABEL_ROAM</base>
-        <trans>Roaming profiles</trans>
+        <trans>漫游账户</trans>
     </entry>
     <entry>
         <base>SUCCESS</base>
-        <trans>The new workgroup settings have been saved</trans>
+        <trans>新的工作组设置已被保存</trans>
     </entry>
     <entry>
         <base>INVALID_WORKGROUP</base>
-        <trans>The workgroup name must begin with a letter (upper or lower case), followed by any combination of letters, numbers, underscores, periods and hyphens.</trans>
+        <trans>工作组名称必须以字母开头（大写或小写），其次是任意的字母组合，数字，下划线，句号和连字符。</trans>
     </entry>
     <entry>
         <base>INVALID_SERVERNAME</base>
-        <trans>The server name must begin with a letter (upper or lower case), followed by any combination of letters, numbers, underscores and hyphens.</trans>
+        <trans>服务器名称必须以字母开头（大写或小写），其次是任何的字母组合，数字，下划线和连字符。</trans>
     </entry>
     <entry>
         <base>INVALID_WORKGROUP_MATCHES_SERVERNAME</base>
-        <trans>The server and workgroup names match, when compared in lower case. These values must be different in order for filesharing to be turned on.</trans>
+        <trans>在小写比较中，服务器和工作组名称应匹配。为了打开文件共享功能，这些值必须不相同。</trans>
     </entry>
     <entry>
         <base>Workgroup</base>
-        <trans>Workgroup</trans>
+        <trans>工作组</trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/yum  2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/yum   2010-04-29 08:02:03.000000000 -0600
@@ -3,97 +3,97 @@
     -->
     <entry>
        <base>Software installer</base>
-       <trans>Software installer</trans>
+       <trans>软件安装器</trans>
     </entry>
 
     <entry>
         <base>SUCCESS</base>
-        <trans>The new settings have been saved.</trans>
+        <trans>新设置已被保存。</trans>
     </entry>
 
     <entry>
         <base>LABEL_YUM_STATUS</base>
-        <trans>Check for updates</trans>
+        <trans>检查更新</trans>
     </entry>
 
     <entry>
        <base>LABEL_YUM_AUTOINSTALLUPDATES</base>
-       <trans>Automatically install updates</trans>
+       <trans>自动安装更新</trans>
    </entry>
 
     <entry>
        <base>LABEL_YUM_PACKAGEFUNCTIONS</base>
-       <trans>Manage individual packages</trans>
+       <trans>管理单个软件</trans>
     </entry>
 
     <entry>
        <base>DESC_YUM_PACKAGEFUNCTIONS</base>
-       <trans>The software installer can manage groups of related package or individual packages. By default, only groups of packages are presented. If you wish to manage individual packages, enable this option. This should only be done by experienced administrators.</trans>
+       <trans>软件安装器可以管理有关的软件组或单个软件。默认情况下，只有软件组被呈现。如果你想管理单个软件，启用该选项。这应该只能让有经验的管理员来做。</trans>
     </entry>
 
     <entry>
        <base>LABEL_ENABLED_REPOSITORIES</base>
-       <trans>Enabled repositories</trans>
+       <trans>启用软件库</trans>
     </entry>
 
     <entry>
        <base>DESC_ENABLED_REPOSITORIES</base>
-       <trans>The software installer can install software from any of enabled repositories. To enable a repository, select it from the list. To disable a repository, de-select it from the list. By default, only stable, tested software is available for installation.</trans>
+       <trans>软件安装器可以从任何可用软件库安装软件。要启用一个软件库，只要在列表中选择即可。要禁用一个软件库，也只要在列表中选择即可。通常，只有稳定的、经过测试的软件对安装可用。</trans>
     </entry>
 
     <entry>
         <base>DESC_UPTODATE</base>
-        <trans><![CDATA[ <div class="success"> <h2>This system is up to date.</h2> All updates have been installed. </div> ]]></trans>
+        <trans><![CDATA[ <div class="success"> <h2>此系统已更新至最新。</h2> 所有更新都已被安装。 </div> ]]></trans>
     </entry>
 
     <entry>
         <base>DESC_UPDATES_AVAILABLE</base>
-        <trans><![CDATA[ <div class="success"> <h2>Updates Available</h2> There are updates available for your system. These updates should be installed as soon as possible. </div> ]]></trans>
+        <trans><![CDATA[ <div class="success"> <h2>有更新可用</h2> 您的系统有更新可用。这些更新需要尽快安装。 </div> ]]></trans>
     </entry>
 
     <entry>
         <base>LABEL_AVAILABLE_UPDATES</base>
-        <trans>Updates available</trans>
+        <trans>更新可用</trans>
     </entry>
 
     <entry>
         <base>DESC_AVAILABLE_UPDATES</base>
-        <trans>The following updates are available for your system. You should normally install all available updates. If there are updates you do not wish to install, de-select them from the list below.</trans>
+        <trans>您的系统有以下更新可用。您一般需要安装所有的可用更新。如果有些更新您不希望安装，请在下面的列表中取消选择它们即可。</trans>
     </entry>
 
     <entry>
         <base>INSTALL_UPDATES</base>
-        <trans>Install selected updates</trans>
+        <trans>安装所选更新</trans>
     </entry>
 
     <entry>
         <base>DESC_BUTTON_INSTALL_UPDATES</base>
-        <trans><![CDATA[ <a class="button-like" href="yum?page=0&page_stack=&Next=Next&wherenext=YUM_PAGE_INSTALL_UPDATES">Install available updates</a> ]]></trans>
+        <trans><![CDATA[ <a class="button-like" href="yum?page=0&page_stack=&Next=Next&wherenext=YUM_PAGE_INSTALL_UPDATES">安装可用更新</a> ]]></trans>
     </entry>
 
     <entry>
        <base>HEADER_AVAILABLE_SOFTWARE</base>
-       <trans>The following software is available to be installed onto your system. You should only install additional software onto this system if you are aware of the consequences of doing so.</trans>
+       <trans>下面的软件可以被安装到您的系统。您可以只安装到此系统额外的软件，如果你知道这样做的后果。</trans>
     </entry>
 
     <entry>
        <base>DESC_AVAILABLE_GROUPS</base>
-       <trans>You can select software groups to install from the list below.</trans>
+       <trans>您可以从下面的列表中选择要安装的软件组。</trans>
     </entry>
 
     <entry>
        <base>LABEL_AVAILABLE_GROUPS</base>
-       <trans>Available groups</trans>
+       <trans>可用软件组</trans>
     </entry>
 
     <entry>
        <base>DESC_AVAILABLE_PACKAGES</base>
-       <trans>You can also select individual packages to install from the list below.</trans>
+       <trans>您也可以从下面的列表中选择单独的软件包来安装。</trans>
     </entry>
 
     <entry>
        <base>LABEL_AVAILABLE_PACKAGES</base>
-       <trans>Available packages</trans>
+       <trans>可用软件包</trans>
     </entry>
 
     <entry>
@@ -103,67 +103,67 @@
 
     <entry>
        <base>HEADER_INSTALLED_SOFTWARE</base>
-       <trans>The following software is installed on this system. You should only remove software from this system if you are aware of the consequences of doing so.</trans>
+       <trans>以下软件已被安装到此系统。您应该只此系统移除软件，如果您知道这样做的后果。</trans>
     </entry>
 
     <entry>
        <base>DESC_INSTALLED_GROUPS</base>
-       <trans>You can select software groups to remove from the list below.</trans>
+       <trans>您可以从下面的列表中选择要移除的软件组。</trans>
     </entry>
 
     <entry>
        <base>LABEL_INSTALLED_GROUPS</base>
-       <trans>Installed groups</trans>
+       <trans>已安装软件组</trans>
     </entry>
 
     <entry>
        <base>DESC_INSTALLED_PACKAGES</base>
-       <trans>You can also select individual packages you wish to remove from the list below.</trans>
+       <trans>您可以从下面的列表中选择要移除的单个软件。</trans>
     </entry>
 
     <entry>
        <base>LABEL_INSTALLED_PACKAGES</base>
-       <trans>Installed packages</trans>
+       <trans>已安装软件包</trans>
     </entry>
 
     <entry>
         <base>DESC_BUTTON_CONFIGURATION</base>
-        <trans><![CDATA[ <a class="button-like" href="yum?page=0&page_stack=&Next=Next&wherenext=YUM_PAGE_CONFIGURATION">Change software installer settings</a> ]]></trans>
+        <trans><![CDATA[ <a class="button-like" href="yum?page=0&page_stack=&Next=Next&wherenext=YUM_PAGE_CONFIGURATION">改变软件安装设置</a> ]]></trans>
     </entry>
 
     <entry>
         <base>DESC_BUTTON_INSTALL_AVAILABLE</base>
-        <trans><![CDATA[ <a class="button-like" href="yum?page=0&page_stack=&Next=Next&wherenext=YUM_PAGE_INSTALL_AVAILABLE">Install additional software</a> ]]></trans>
+        <trans><![CDATA[ <a class="button-like" href="yum?page=0&page_stack=&Next=Next&wherenext=YUM_PAGE_INSTALL_AVAILABLE">安装额外软件</a> ]]></trans>
     </entry>
 
     <entry>
         <base>DESC_BUTTON_REMOVE</base>
-        <trans><![CDATA[ <a class="button-like" href="yum?page=0&page_stack=&Next=Next&wherenext=YUM_PAGE_REMOVE">Remove installed software</a> ]]></trans>
+        <trans><![CDATA[ <a class="button-like" href="yum?page=0&page_stack=&Next=Next&wherenext=YUM_PAGE_REMOVE">移除已安装软件</a> ]]></trans>
     </entry>
 
     <entry>
        <base>HEADER_POSTUPGRADE_REQUIRED</base>
-       <trans><![CDATA[ The system needs to be reconfigured after adding or removing software, or applying updates. <p> Please click on the Reconfigure button at the bottom of this page to start the reconfiguration process. <b>An automatic reboot will be initiated as part of this reconfiguration process</b> </p> ]]></trans>
+       <trans><![CDATA[ 在安装或者移除软件，或者更新后，系统需要被重新配置。 <p> 请点击本页面底部的重新配置按钮来执行重新配置过程。 <b>重新配置过程中系统将有一次自动重新启动。</b> </p> ]]></trans>
      </entry>
 
     <entry>
        <base>SYSTEM_BEING_RECONFIGURED</base>
-       <trans>Your system is being automatically rebooted to complete the reconfiguraton process.</trans>
+       <trans>您的系统需要重新启动以便完成重新配置操作。</trans>
     </entry>
 
     <entry>
       <base>1DAILY</base>
-      <trans>Daily</trans>
+      <trans>每日</trans>
     </entry>
 
     <entry>
       <base>2WEEKLY</base>
-      <trans>Weekly</trans>
+      <trans>每周</trans>
     </entry>
 
     <entry>
       <base>3MONTHLY</base>
-      <trans>Monthly</trans>
+      <trans>每月</trans>
     </entry>
  
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/panels/password/cgi-bin/userpassword   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/panels/password/cgi-bin/userpassword    2010-04-29 08:01:25.000000000 -0600
@@ -2,7 +2,7 @@
 
     <entry>
       <base>DESCRIPTION</base>
-      <trans><![CDATA[ <P>To change your account password, please fill out the following form. You will need to provide the name of your account, your old password, and your desired new password. (You must type the new password twice.)</P> <P>If you cannot change your password because you have forgotten the old one, your local system administrator can reset your password using the <EM>server manager</EM>.</P> ]]></trans>
+      <trans><![CDATA[ <P>要更改您的账号密码，请填写下面的表格。您需要提供您账户名称，旧密码，新密码。 (您必须输入新密码两次。)</P> <P>如果您不能修改密码，那是因为可能您忘记了旧密码，您的系统管理员使用<EM>系统管理</EM>可以重置您的密码 。</P> ]]></trans>
     </entry>
 
 </lexicon>
--- smeserver-locale-2.2.0/root/etc/e-smith/locale/zh-cn/FormMagick/general     2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/root/etc/e-smith/locale/zh-cn/FormMagick/general      2010-04-29 07:56:41.000000000 -0600
@@ -19,11 +19,11 @@
     </entry>
     <entry>
         <base>Miscellaneous</base>
-        <trans>Miscellaneous</trans>
+        <trans>其他项</trans>
     </entry>
     <entry>
         <base>Your Settings</base>
-        <trans>Your Settings</trans>
+        <trans>您的设置</trans>
     </entry>
     <entry>
         <base>SAVE</base>
@@ -35,11 +35,11 @@
     </entry>
     <entry>
         <base>ENABLED</base>
-        <trans>Enabled</trans>
+        <trans>启用</trans>
     </entry>
     <entry>
         <base>DISABLED</base>
-        <trans>Disabled</trans>
+        <trans>禁用</trans>
     </entry>
     <entry>
         <base>NO</base>
@@ -67,7 +67,7 @@
     </entry>
     <entry>
         <base>COMMENT</base>
-        <trans>Comment</trans>
+        <trans>注释</trans>
     </entry>
     <entry>
         <base>NEXT</base>
@@ -75,7 +75,7 @@
     </entry>
     <entry>
         <base>SELF</base>
-        <trans>Self</trans>
+        <trans>自己</trans>
     </entry>
     <entry>
         <base>REMOTE</base>
@@ -87,7 +87,7 @@
     </entry>
     <entry>
         <base>ACTION</base>
-        <trans>Action</trans>
+        <trans>动作</trans>
     </entry>
     <entry>
         <base>NETWORK</base>
@@ -95,11 +95,11 @@
     </entry>
     <entry>
         <base>ROUTER</base>
-        <trans>Router</trans>
+        <trans>路由器</trans>
     </entry>
     <entry>
         <base>OPERATION_STATUS_REPORT</base>
-        <trans>Operation status report</trans>
+        <trans>操作统计报告</trans>
     </entry>
     <entry>
         <base>ACCOUNT</base>
@@ -115,35 +115,35 @@
     </entry>
     <entry>
         <base>NO_PIPES_ALLOWED</base>
-        <trans>Pipe symbols (|) are not permitted in this field</trans>
+        <trans>管道符号(|) 在此字段中是不允许的。</trans>
     </entry>
     <entry>
         <base>ERROR_BELOW</base>
-        <trans>ERROR: There was an error in the validation of this page. Please scroll down and find the specific problem.</trans>
+        <trans>错误：验证此页面时出现错误。请下拉并找到指定错误。</trans>
     </entry>
     <entry>
         <base>ACCESS</base>
-        <trans>Access</trans>
+        <trans>访问</trans>
     </entry>
     <entry>
         <base>ACCOUNT_LOCKED</base>
-        <trans>Account is locked</trans>
+        <trans>访问被锁定</trans>
     </entry>
     <entry>
         <base>GROUP_ADD</base>
-        <trans>Add group</trans>
+        <trans>增加群组</trans>
     </entry>
     <entry>
         <base>NETWORKS_ALLOW_LOCAL</base>
-        <trans>Allow access only from local networks</trans>
+        <trans>只允许本地网络访问</trans>
     </entry>
     <entry>
         <base>NETWORKS_ALLOW_PUBLIC</base>
-        <trans>Allow public access (entire Internet)</trans>
+        <trans>允许公众访问（整个因特网）</trans>
     </entry>
     <entry>
         <base>ERROR_PASSWORD_CHANGE</base>
-        <trans>An error occurred while attempting to change your password. Please make sure that the old password entered is correct.</trans>
+        <trans>尝试变更您密码是出错。请确认输入的旧密码是否正确。</trans>
     </entry>
     <entry>
         <base>BACK</base>
@@ -155,7 +155,7 @@
     </entry>
     <entry>
         <base>DESCRIPTION_BRIEF</base>
-        <trans>Brief description</trans>
+        <trans>概述</trans>
     </entry>
     <entry>
         <base>PASSWORD_CHANGE</base>
@@ -163,11 +163,11 @@
     </entry>
     <entry>
         <base>RESET_PASSWORD_TITLE</base>
-        <trans>Reset user password</trans>
+        <trans>重置用户密码</trans>
     </entry>
     <entry>
         <base>ACCOUNT_PASSWORD_CHANGE</base>
-        <trans>Change account password</trans>
+        <trans>修改账号密码</trans>
     </entry>
     <entry>
         <base>CONTENT</base>
@@ -175,11 +175,11 @@
     </entry>
     <entry>
         <base>CREATE_GROUP</base>
-        <trans>Create user group</trans>
+        <trans>创建用户群组</trans>
     </entry>
     <entry>
         <base>USER_LIST_CURRENT</base>
-        <trans>Current list of users</trans>
+        <trans>当前用户列表</trans>
     </entry>
     <entry>
         <base>DESCRIPTION</base>
@@ -191,7 +191,7 @@
     </entry>
     <entry>
         <base>DOMAIN_NAME</base>
-        <trans>Domain name</trans>
+        <trans>域名称</trans>
     </entry>
     <entry>
         <base>DOMAIN</base>
@@ -199,7 +199,7 @@
     </entry>
     <entry>
         <base>DOMAINS</base>
-        <trans>Domains</trans>
+        <trans>域</trans>
     </entry>
     <entry>
         <base>DOWNLOAD</base>
@@ -207,19 +207,19 @@
     </entry>
     <entry>
         <base>ERROR_UPDATING_CONFIGURATION</base>
-        <trans>Error occurred while updating system configuration.</trans>
+        <trans>当更新系统配置时出错</trans>
     </entry>
     <entry>
         <base>GROUP_MEMBERS</base>
-        <trans>Group Members</trans>
+        <trans>群组成员</trans>
     </entry>
     <entry>
         <base>GROUP_NAME</base>
-        <trans>Group Name</trans>
+        <trans>群组名称</trans>
     </entry>
     <entry>
         <base>GROUPS</base>
-        <trans>Groups</trans>
+        <trans>群组</trans>
     </entry>
     <entry>
         <base>IP_ADDRESS</base>
@@ -227,7 +227,7 @@
     </entry>
     <entry>
         <base>USER_INVALID</base>
-        <trans>Invalid user</trans>
+        <trans>非法用户</trans>
     </entry>
     <entry>
         <base>LOCATION</base>
@@ -239,7 +239,7 @@
     </entry>
     <entry>
         <base>MODIFY_USER_GROUP</base>
-        <trans>Modify user group</trans>
+        <trans>修改用户群组</trans>
     </entry>
     <entry>
         <base>NAME</base>
@@ -247,11 +247,11 @@
     </entry>
     <entry>
         <base>PASSWORD_VERIFY_NEW</base>
-        <trans>New password (verify):</trans>
+        <trans>新密码（验证）：</trans>
     </entry>
     <entry>
         <base>PASSWORD_NEW</base>
-        <trans>New password:</trans>
+        <trans>新密码：</trans>
     </entry>
     <entry>
         <base>OFF</base>
@@ -263,7 +263,7 @@
     </entry>
     <entry>
         <base>PASSWORD_OLD</base>
-        <trans>Old password:</trans>
+        <trans>旧密码：</trans>
     </entry>
     <entry>
         <base>ON</base>
@@ -275,238 +275,238 @@
     </entry>
     <entry>
         <base>PERFORM</base>
-        <trans>Perform</trans>
+        <trans>执行</trans>
     </entry>
     <entry>
         <base>RECONFIGURE</base>
-        <trans>Reconfigure</trans>
+        <trans>重新配置</trans>
     </entry>
     <entry>
         <base>REMOVE_USER_GROUP</base>
-        <trans>Remove user group</trans>
+        <trans>移除用户群组</trans>
     </entry>
     <entry>
         <base>PASSWORD_RESET</base>
-        <trans>Reset password</trans>
+        <trans>重置密码</trans>
     </entry>
     <entry>
         <base>RESTORE</base>
-        <trans>Restore</trans>
+        <trans>还原</trans>
     </entry>
     <entry>
         <base>SHUTDOWN</base>
-        <trans>Shutdown</trans>
+        <trans>关机</trans>
     </entry>
     <entry>
         <base>SUCCESS</base>
-        <trans>Success</trans>
+        <trans>成功</trans>
     </entry>
     <entry>
         <base>ACCOUNT_NAME_INVALID</base>
-        <trans>The account name entered is invalid.</trans>
+        <trans>输入的账号名称非法。</trans>
     </entry>
     <entry>
         <base>ACCOUNT_NAME_INVALID_CHARS</base>
-        <trans>The account name you entered contained invalid characters.</trans>
+        <trans>您输入的账号名称中包含非法字符。</trans>
     </entry>
     <entry>
         <base>PASSWORD_OLD_INVALID_CHARS</base>
-        <trans>The old password you entered contained invalid characters.</trans>
+        <trans>您输入的旧密码中包含非法字符。</trans>
     </entry>
     <entry>
         <base>PASSWORD_INVALID_CHARS</base>
-        <trans>The password you entered contained invalid characters.</trans>
+        <trans>您输入的密码中包含非法字符。</trans>
     </entry>
     <entry>
         <base>PASSWORD_VERIFY_ERROR</base>
-        <trans>The passwords you entered did not match.</trans>
+        <trans>您输入的密码不匹配。</trans>
     </entry>
     <entry>
         <base>ACCOUNT_USER_NONE</base>
-        <trans>There are no user accounts in the system.</trans>
+        <trans>当前系统中暂无用户账号。</trans>
     </entry>
     <entry>
         <base>ACCOUNT_GROUP_NONE</base>
-        <trans>There are no user groups in the system.</trans>
+        <trans>当前系统中暂无用户群组。</trans>
     </entry>
     <entry>
         <base>ERROR_INVALID_CHARS</base>
-        <trans>Unexpected characters in description.</trans>
+        <trans>在描述有非预期的字符。</trans>
     </entry>
     <entry>
         <base>USER_NAME</base>
-        <trans>User Name</trans>
+        <trans>用户名称</trans>
     </entry>
     <entry>
         <base>YOUR_ACCOUNT</base>
-        <trans>Your account:</trans>
+        <trans>您的账号：</trans>
     </entry>
     <entry>
       <base>YOUR_ACCOUNT_INVALID</base>
-      <trans>The account name entered is invalid.</trans>
+      <trans>输入的账号名称非法。</trans>
     </entry>
     <entry>
         <base>PASSWORD_CHANGE_SUCCESS</base>
-        <trans>Your password has been successfully changed.</trans>
+        <trans>您的密码已成功修改。</trans>
     </entry>
     <entry>
         <base>FM_NONBLANK</base>
-        <trans>This field must not be left blank</trans>
+        <trans>此字段禁止留空。</trans>
     </entry>
     <entry>
         <base>FM_INTEGER</base>
-        <trans>This field must contain a positive integer</trans>
+        <trans>此字段必须包含一个正整数。</trans>
     </entry>
     <entry>
         <base>FM_NUMBER</base>
-        <trans>This field must contain a number</trans>
+        <trans>此字段必须包含一个数字。</trans>
     </entry>
     <entry>
         <base>FM_WORD</base>
-        <trans>This field must look like a single word.</trans>
+        <trans>此字段必须看起来像一个单独的字。</trans>
     </entry>
     <entry>
         <base>FM_DATE</base>
-        <trans>The data entered could not be parsed as a date</trans>
+        <trans>输入的数据无法解析为一个日期。</trans>
     </entry>
     <entry>
         <base>FM_CREDIT_CARD_NUMBER1</base>
-        <trans>You must enter a credit card number</trans>
+        <trans>您必须输入一个信用卡号码</trans>
     </entry>
     <entry>
         <base>FM_CREDIT_CARD_NUMBER2</base>
-        <trans>Credit card numbers shouldn't have anything but numbers, spaces or dashes</trans>
+        <trans>信用卡号码不该含有除了字母、空格或者破折号以外的其他任何字符。</trans>
     </entry>
     <entry>
         <base>FM_CREDIT_CARD_NUMBER3</base>
-        <trans>Must be at least 14 characters in length</trans>
+        <trans>长度必须至少为14个字符</trans>
     </entry>
     <entry>
         <base>FM_CREDIT_CARD_NUMBER4</base>
-        <trans>Doesn't appear to be a valid credit card number</trans>
+        <trans>似乎没有一个有效的信用卡号码</trans>
     </entry>
     <entry>
         <base>FM_CREDIT_CARD_EXPIRY1</base>
-        <trans>No expiry date entered.</trans>
+        <trans>未输入截止日期</trans>
     </entry>
     <entry>
         <base>FM_CREDIT_CARD_EXPIRY2</base>
-        <trans>Expiry date must be in the format MM/YY or MM/YYYY</trans>
+        <trans>截止日期的格式必须为MM/YY或者MM/YYYY</trans>
     </entry>
     <entry>
         <base>FM_CREDIT_CARD_EXPIRY3</base>
-        <trans>This expiry date appears to have already passed</trans>
+        <trans>此截止日期似乎已经过了。</trans>
     </entry>
     <entry>
         <base>FM_CREDIT_CARD_EXPIRY4</base>
-        <trans>This expiry date appears to be too far in the future</trans>
+        <trans>这个期限似乎在太遥远了。</trans>
     </entry>
     <entry>
         <base>FM_ISO_COUNTRY_CODE1</base>
-        <trans>You must provide a country code</trans>
+        <trans>您必须提供一个国家代码</trans>
     </entry>
     <entry>
         <base>FM_ISO_COUNTRY_CODE2</base>
-        <trans>This field does not contain an ISO country code</trans>
+        <trans>此字段不包含ISO国家代码</trans>
     </entry>
     <entry>
         <base>FM_US_STATE</base>
-        <trans>This doesn't appear to be a valid 2-letter US state abbreviation</trans>
+        <trans>这似乎不是一个有效的美国的州的 2个字母的缩写</trans>
     </entry>
     <entry>
         <base>FM_US_ZIPCODE</base>
-        <trans>US zip codes must contain 5 or 9 numbers</trans>
+        <trans>美国邮编必须包含5或者9个数字。</trans>
     </entry>
     <entry>
         <base>FM_MINLENGTH1</base>
-        <trans>Minimum length has been specified meaninglessly as {$minlength}</trans>
+        <trans>指定的最小长度{$minlength}无意义。</trans>
     </entry>
     <entry>
         <base>FM_MINLENGTH2</base>
-        <trans>This field must be at least {$minlength} characters</trans>
+        <trans>此字段必须至少{$minlength}个字符。</trans>
     </entry>
     <entry>
         <base>FM_MAXLENGTH1</base>
-        <trans>Maximum length has been specified meaninglessly as {$maxlength}</trans>
+        <trans>指定的最大长度{$maxlength}无意义。</trans>
     </entry>
     <entry>
         <base>FM_MAXLENGTH2</base>
-        <trans>This field must be no more than {$maxlength} characters</trans>
+        <trans>此字段不能多于{$maxlength}个字符。</trans>
     </entry>
     <entry>
         <base>FM_EXACTLENGTH1</base>
-        <trans>You must specify the length for the field.</trans>
+        <trans>您必须指定此字段长度。</trans>
     </entry>
     <entry>
         <base>FM_EXACTLENGTH2</base>
-        <trans>You must specify the exactlength of the field with an integer</trans>
+        <trans>您必须指定该整数字段的准确长度。</trans>
     </entry>
     <entry>
         <base>FM_EXACTLENGTH3</base>
-        <trans>This field must be exactly {$exactlength} characters</trans>
+        <trans>此字段必须为确认为{$exactlength}个字符。</trans>
     </entry>
     <entry>
         <base>FM_LENGTHRANGE1</base>
-        <trans>You must specify the maximum and minimum length for the field.</trans>
+        <trans>您必须指定该字段的最大和最小长度。</trans>
     </entry>
     <entry>
         <base>FM_LENGTHRANGE2</base>
-        <trans>You must specify the maximum and minimum lengths of the field with an integer</trans>
+        <trans>您必须此整数字段的最大和最小长度。</trans>
     </entry>
     <entry>
         <base>FM_LENGTHRANGE3</base>
-        <trans>This field must be between {$minlength} and {$maxlength} characters</trans>
+        <trans>此字段长度必须是在{$minlength} 和 {$maxlength}个字符之间。</trans>
     </entry>
     <entry>
         <base>FM_URL</base>
-        <trans>This field must contain a URL starting with http:// or ftp://</trans>
+        <trans>此字段必须包含以 http:// 或 ftp://开头的URL</trans>
     </entry>
     <entry>
         <base>FM_EMAIL_SIMPLE1</base>
-        <trans>You must enter an email address.</trans>
+        <trans>您必须输入一个email地址。</trans>
     </entry>
     <entry>
         <base>FM_EMAIL_SIMPLE2</base>
-        <trans>This field doesn't look like an RFC822-compliant email address</trans>
+        <trans>此字段看上去不像与RTC822兼容的email地址。</trans>
     </entry>
     <entry>
         <base>FM_DOMAIN_NAME</base>
-        <trans>This field doesn't look like a valid Internet domain name or hostname.</trans>
+        <trans>此字段看上去不像一个合法的因特网域名或主机名。</trans>
     </entry>
     <entry>
         <base>FM_IP_NUMBER1</base>
-        <trans>This field must contain a valid IP number and can not be left blank.</trans>
+        <trans>此字段必须包含一个合法的IP并且不能为空。</trans>
     </entry>
     <entry>
         <base>FM_IP_NUMBER2</base>
-        <trans>Not enough octets (expected X.X.X.X)</trans>
+        <trans>没有足够的单位（预期为X.X.X.X）</trans>
     </entry>
     <entry>
         <base>FM_IP_NUMBER3</base>
-        <trans>{$octet} is more than 255</trans>
+        <trans>{$octet}已大于255</trans>
     </entry>
     <entry>
         <base>FM_USERNAME</base>
-        <trans>This field must look like a valid username (3 to 8 letters and numbers)</trans>
+        <trans>此字段必须看上去像一个合法的用户名称（3到8个字母和数字）</trans>
     </entry>
     <entry>
         <base>FM_PASSWORD1</base>
-        <trans>You must provide a password.</trans>
+        <trans>您必须提供一个密码。</trans>
     </entry>
     <entry>
         <base>FM_PASSWORD2</base>
-        <trans>The password you provided was not a good password. A good password must contain all of the following: upper case letter, lower case letter, number, non-alphanumeric character, be at least 7 characters long.</trans>
+        <trans>您提供的密码不是一个良好的密码，一个良好的密码必须包含以下这些：大写字母、小写字母、数字、非字母数字字符，至少7个字符长度。</trans>
     </entry>
     <entry>
         <base>FM_MAC_ADDRESS1</base>
-        <trans>You must provide a MAC address.</trans>
+        <trans>您必须提供一个MAC地址。</trans>
     </entry>
     <entry>
         <base>FM_MAC_ADDRESS2</base>
-        <trans>The MAC address you provided was not valid.</trans>
+        <trans>您提供的MAC地址不合法。</trans>
     </entry>
     <entry>
        <base>FM_ERR_UNEXPECTED_DESC</base>
-       <trans>Error: unexpected or missing characters in description</trans>
+       <trans>错误：非预期的或者描述中缺少字符。</trans>
     </entry>
 </lexicon>
--- smeserver-locale-2.2.0/po/da/server-console.po      2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/po/da/server-console.po       2010-04-29 07:59:57.000000000 -0600
@@ -725,7 +725,7 @@
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:940
 msgid "Invalid address ranges"
-msgstr "Ugyldig IP adresse"
+msgstr "Ugyldig adresse interval"
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:942
 msgid ""
@@ -736,6 +736,12 @@
 "\n"
 "Please review your settings."
 msgstr ""
+"Intern adresse interval lapper over ekstern adresse interval\n"
+"\n"
+"Intern netværk: %s/%s\n"
+"Ekstern netværk: %s/%s\n"
+"\n"
+"Kontroller venligst din opsætning."
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:968
 msgid "Invalid external subnet mask"
--- smeserver-locale-2.2.0/po/es/server-console.po      2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/po/es/server-console.po       2010-04-29 07:59:57.000000000 -0600
@@ -725,7 +725,7 @@
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:940
 msgid "Invalid address ranges"
-msgstr "Dirección IP no válida"
+msgstr "Rangos de direcciones inválidos"
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:942
 msgid ""
@@ -736,6 +736,12 @@
 "\n"
 "Please review your settings."
 msgstr ""
+"El rango interno de direcciones solapa el rango externo\n"
+"\n"
+"Interfaz local: %s/%s\n"
+"Interfaz externa: %s/%s\n"
+"\n"
+"Por favor verifique sus ajustes."
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:968
 msgid "Invalid external subnet mask"
--- smeserver-locale-2.2.0/po/fr/server-console.po      2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/po/fr/server-console.po       2010-04-29 07:59:57.000000000 -0600
@@ -725,7 +725,7 @@
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:940
 msgid "Invalid address ranges"
-msgstr "Adresse IP non valide."
+msgstr "Plage d'adresses non valide"
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:942
 msgid ""
@@ -736,6 +736,12 @@
 "\n"
 "Please review your settings."
 msgstr ""
+"La plage d'adresses internes empiète sur la plage d'adresses externes.\n"
+"\n"
+"Interface locale : %s/%s\n"
+"Interface externe : %s/%s\n"
+"\n"
+"Veuillez vérifier vos paramètres."
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:968
 msgid "Invalid external subnet mask"
--- smeserver-locale-2.2.0/po/hu/server-console.po      2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/po/hu/server-console.po       2010-04-29 07:59:57.000000000 -0600
@@ -4,7 +4,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: root/sbin/e-smith/console:88
 msgid "Server console"
@@ -414,11 +414,11 @@
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:107
 msgid "internal"
-msgstr "Nyomtató név"
+msgstr "belső"
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:108
 msgid "external"
-msgstr "Nyomtató név"
+msgstr "külső"
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:113
 msgid "Select %s network ethernet driver"
@@ -725,7 +725,7 @@
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:940
 msgid "Invalid address ranges"
-msgstr "Érvénytelen IP cím"
+msgstr "Érvénytelen címtartomány"
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:942
 msgid ""
@@ -736,6 +736,12 @@
 "\n"
 "Please review your settings."
 msgstr ""
+"A belső címtartomány átfedi a külső címtartományt\n"
+"\n"
+"Belső hálózati csatoló: %s/%s\n"
+"Külső hálózati csatoló: %s/%s\n"
+"\n"
+"Kérem ellenőrizze a beállításokat."
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:968
 msgid "Invalid external subnet mask"
--- smeserver-locale-2.2.0/po/it/server-console.po      2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/po/it/server-console.po       2010-04-29 07:59:57.000000000 -0600
@@ -725,7 +725,7 @@
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:940
 msgid "Invalid address ranges"
-msgstr "Indirizzo IP non valido"
+msgstr "Range indirizzi IP non validi"
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:942
 msgid ""
@@ -736,6 +736,12 @@
 "\n"
 "Please review your settings."
 msgstr ""
+"Intervallo di IP interni sovrapposto al quelli esterni\n"
+"\n"
+"Interfaccia locale: %s/%s\n"
+"Interfaccia esterna: %s/%s\n"
+"\n"
+"Ricontrolla le impostazioni."
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:968
 msgid "Invalid external subnet mask"
--- smeserver-locale-2.2.0/po/pl/adminQuotaSummary.tmpl.po      2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/po/pl/adminQuotaSummary.tmpl.po       2010-04-29 07:54:12.000000000 -0600
@@ -36,7 +36,7 @@
 
 #: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:30
 msgid "Limit with grace period"
-msgstr ""
+msgstr "Limit okresu karencji"
 
 #: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:31
 msgid "Absolute limit"
--- smeserver-locale-2.2.0/po/pt_BR/server-console.po   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/po/pt_BR/server-console.po    2010-04-29 07:59:57.000000000 -0600
@@ -725,7 +725,7 @@
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:940
 msgid "Invalid address ranges"
-msgstr "Endereço IP inválido"
+msgstr "Região de endereço IP inválida"
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:942
 msgid ""
@@ -736,6 +736,12 @@
 "\n"
 "Please review your settings."
 msgstr ""
+"A região de endereços interno se sobrepõe a região de endereços externos\n"
+"\n"
+"Interface Local = LAN: %s/%s\n"
+"Interface External = WAN: %s/%s\n"
+"\n"
+"Por favor corrija esse erro garantindo que as regiões são distintas."
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:968
 msgid "Invalid external subnet mask"
--- smeserver-locale-2.2.0/po/sv/server-console.po      2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/po/sv/server-console.po       2010-04-29 07:59:57.000000000 -0600
@@ -725,7 +725,7 @@
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:940
 msgid "Invalid address ranges"
-msgstr "Ogiltig IP-adress"
+msgstr "Ogiltigt IP-intervall"
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:942
 msgid ""
@@ -736,6 +736,12 @@
 "\n"
 "Please review your settings."
 msgstr ""
+"Interna adressintervallet överlappar det externa adressintervallet\n"
+"\n"
+"Lokalt interface: %s/%s\n"
+"Externt interface: %s/%s\n"
+"\n"
+"Kontrollera dina inställningar."
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:968
 msgid "Invalid external subnet mask"
--- smeserver-locale-2.2.0/po/th/server-console.po      2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/po/th/server-console.po       2010-04-29 07:59:57.000000000 -0600
@@ -8,7 +8,7 @@
 
 #: root/sbin/e-smith/console:88
 msgid "Server console"
-msgstr "โหมดของเซอร์ฟเวอร์"
+msgstr "Server console"
 
 #: root/sbin/e-smith/console:91
 msgid "** unsaved changes **"
@@ -37,7 +37,7 @@
 
 #: root/sbin/e-smith/console-menu-items/manageRAID.pl:40
 msgid "Current RAID status:"
-msgstr "การตั้งค่าปัจจุบัน"
+msgstr "สถานะของ RAID:"
 
 #: root/sbin/e-smith/console-menu-items/manageRAID.pl:50
 msgid "There are no RAID devices configured"
--- smeserver-locale-2.2.0/po/zh_CN/adminQuotaSummary.tmpl.po   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/po/zh_CN/adminQuotaSummary.tmpl.po    2010-04-29 07:54:12.000000000 -0600
@@ -10,19 +10,19 @@
 
 #: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:13
 msgid "Automated quota report"
-msgstr ""
+msgstr "自动配额报告"
 
 #: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:16
 msgid "One or more users have exceeded their disk quota"
-msgstr ""
+msgstr "一个或多个用户已超过他们的磁盘配额"
 
 #: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:23
 msgid "The following users have exceeded their disk quota on the server called"
-msgstr ""
+msgstr "以下用户已超出他们的磁盘配额"
 
 #: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:24
 msgid "All values are in megabytes."
-msgstr ""
+msgstr "所有数值的单位为兆"
 
 #: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:28
 msgid "Account"
@@ -34,8 +34,8 @@
 
 #: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:30
 msgid "Limit with grace period"
-msgstr ""
+msgstr "有宽限期的限制"
 
 #: root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl:31
 msgid "Absolute limit"
-msgstr ""
+msgstr "绝对限制"
--- smeserver-locale-2.2.0/po/zh_CN/backup.po   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/po/zh_CN/backup.po    2010-04-29 07:54:51.000000000 -0600
@@ -6,9 +6,9 @@
 
 #: root/etc/e-smith/templates/etc/crontab/backup:16
 msgid "Backup task is disabled"
-msgstr ""
+msgstr "备份任务被禁用"
 
 #: root/etc/e-smith/templates/etc/crontab/backup:33
 #: root/etc/e-smith/templates/etc/crontab/backup:34
 msgid "Remember to load the backup tape!"
-msgstr ""
+msgstr "记住要加载备份磁带！"
--- smeserver-locale-2.2.0/po/zh_CN/foot.tmpl.po        2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/po/zh_CN/foot.tmpl.po 2010-04-29 07:56:23.000000000 -0600
@@ -6,4 +6,4 @@
 
 #: root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/25Copyright:7
 msgid "All rights reserved."
-msgstr ""
+msgstr "版权所有"
--- smeserver-locale-2.2.0/po/zh_CN/server-console.po   2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/po/zh_CN/server-console.po    2010-04-29 07:59:57.000000000 -0600
@@ -128,7 +128,7 @@
 #: root/sbin/e-smith/console-menu-items/reboot.pl:37
 #: root/sbin/e-smith/console-menu-items/reboot.pl:67
 msgid "Reconfigure"
-msgstr ""
+msgstr "重新配置"
 
 #: root/sbin/e-smith/console-menu-items/reboot.pl:37
 msgid "Reconfigure this server"
@@ -137,7 +137,7 @@
 #: root/sbin/e-smith/console-menu-items/reboot.pl:38
 #: root/sbin/e-smith/console-menu-items/reboot.pl:57
 msgid "Shutdown"
-msgstr ""
+msgstr "关机"
 
 #: root/sbin/e-smith/console-menu-items/reboot.pl:38
 msgid "Shutdown this server"
@@ -957,13 +957,13 @@
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:1707
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:1728
 msgid "Off"
-msgstr ""
+msgstr "Off"
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:1702
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:1706
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:1723
 msgid "On"
-msgstr ""
+msgstr "On"
 
 #: root/usr/lib/perl5/site_perl/esmith/console/configure.pm:1706
 msgid "Provide DHCP service to local network"
@@ -1130,7 +1130,7 @@
 
 #: root/usr/lib/perl5/site_perl/esmith/console/perform_backup.pm:122
 msgid "Success"
-msgstr ""
+msgstr "成功"
 
 #: root/usr/lib/perl5/site_perl/esmith/console/perform_backup.pm:136
 msgid "Create Backup to USB disk"
--- smeserver-locale-2.2.0/po/zh_CN/userOverQuota.tmpl.po       2010-04-29 07:53:48.000000000 -0600
+++ smeserver-locale-2.2.0.update/po/zh_CN/userOverQuota.tmpl.po        2010-04-29 08:00:55.000000000 -0600
@@ -6,7 +6,7 @@
 
 #: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:15
 msgid "Automated quota report"
-msgstr ""
+msgstr "自动配额报告"
 
 #: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:17
 msgid "You have exceeded your disk quota"
@@ -20,7 +20,7 @@
 #: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:23
 #: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:25
 msgid "Mb"
-msgstr ""
+msgstr "Mb"
 
 #: root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl:21
 msgid "Your maximum usage:"