smeserver-fetchmail/contribs7/smeserver-fetchmail-1.3.6-duplocale.patch

diff -ruN smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail       2008-04-21 00:28:49.000000000 -0600
+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail    2008-04-24 09:57:39.000000000 -0600
@@ -1,9 +1,5 @@
 <lexicon lang="de">
     <entry>
-        <base>Collaboration</base>
-        <trans> Zusammenarbeit </trans>
-    </entry>
-    <entry>
         <base>FORM_TITLE</base>
         <trans><![CDATA[
                Einstellungen für den Empfang externer Mailboxen
@@ -253,6 +249,14 @@
         <trans>Imap</trans>
     </entry>
     <entry>
+        <base>SPOP3</base>
+        <trans>SSL Pop (Experimental)</trans>
+    </entry>
+    <entry>
+        <base>SIMAP</base>
+        <trans>SSL Imap (Experimental)</trans>
+    </entry>
+    <entry>
         <base>SHOW_FETCHMAIL_ACCOUNTS</base>
         <trans><![CDATA[
                <p>
@@ -309,8 +313,8 @@
         <trans>Server Mailbox Password</trans>
     </entry>
     <entry>
-        <base>Konfiguration</base>
-        <trans>Konfiguration</trans>
+        <base>Collaboration</base>
+        <trans> Zusammenarbeit </trans>
     </entry>
     <entry>
         <base>fetchmail</base>
@@ -337,12 +341,6 @@
         <trans><![CDATA[&nbsp;]]></trans>
     </entry>
     <entry>
-        <base>SUCCESS</base>
-        <trans>Änderungen der FetchMail-Konfiguration wurden erfolgreich
-        gespeichert.
-        </trans>
-    </entry>
-    <entry>
         <base>SUCCESSFULLY_CHANGED_CONF</base>
         <trans>Änderungen der FetchMail-Konfiguration wurden erfolgreich
         gespeichert.
@@ -396,12 +394,6 @@
         </trans>
     </entry>
     <entry>
-        <base>ERROR_WHILE_MODIFYING_ROUTINGNNTP</base>
-        <trans>Die Änderungen für die SME SMTP Proxy Einstellungen
-        konnten nicht gespeichert werden.
-        </trans>
-    </entry>
-    <entry>
         <base>CREATE</base>
         <trans>Erstellen</trans>
     </entry>
diff -ruN smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail    2008-04-21 00:28:40.000000000 -0600
+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail 2008-04-24 09:57:23.000000000 -0600
@@ -349,12 +349,6 @@
         <trans><![CDATA[&nbsp;]]></trans>
     </entry>
     <entry>
-        <base>SUCCESS</base>
-        <trans>Your changes to the Fetchmail configuration have been
-        saved successfully.
-        </trans>
-    </entry>
-    <entry>
         <base>SUCCESSFULLY_CHANGED_CONF</base>
         <trans>Your changes to the Fetchmail configuration have been
         saved successfully.
@@ -408,12 +402,6 @@
         </trans>
     </entry>
     <entry>
-        <base>ERROR_WHILE_MODIFYING_ROUTINGNNTP</base>
-        <trans>Unable to apply the changes to the SME SMTP
-               Proxy configuration.
-        </trans>
-    </entry>
-    <entry>
         <base>CREATE</base>
         <trans>Create</trans>
     </entry>
diff -ruN smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail       2008-04-21 00:28:45.000000000 -0600
+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail    2008-04-24 09:57:34.000000000 -0600
@@ -1,10 +1,4 @@
 <lexicon lang="fr">
-  <entry>
-    <base>Collaboration</base>
-    <trans>
-      Collaboration
-    </trans>
-  </entry>
     <entry>
         <base>FORM_TITLE</base>
         <trans>Configuration de la récupération de BALs externes</trans>
@@ -333,6 +327,12 @@
         <base>MAIL_PASSWORD</base>
         <trans>mot de passe sur le serveur</trans>
     </entry>
+  <entry>
+    <base>Collaboration</base>
+    <trans>
+      Collaboration
+    </trans>
+  </entry>
     <entry>
         <base>fetchmail</base>
         <trans>Récupération de mails</trans>
@@ -358,12 +358,6 @@
         <trans><![CDATA[&nbsp;]]></trans>
     </entry>
     <entry>
-        <base>SUCCESS</base>
-        <trans>Vos changements à la configuration de la récupération de 
-               messages ont bien étés appliqués.
-        </trans>
-    </entry>
-    <entry>
         <base>SUCCESSFULLY_CHANGED_CONF</base>
         <trans>Vos changements à la configuration de la récupération de 
                messages ont bien étés appliqués.
@@ -400,18 +394,6 @@
         </trans>
     </entry>
     <entry>
-        <base>SUCCESSFULLY_MODIFIED_SMTPPROXY</base>
-        <trans>Vos changements de configuration du Proxy SMTP ont
-               bien étés pris en compte.
-        </trans>
-    </entry>
-    <entry>
-        <base>ERROR_WHILE_MODIFYING_ROUTINGSMTP</base>
-        <trans>Impossible d'appliquer les changements de configuration
-               du proxy SMTP.
-        </trans>
-    </entry>
-    <entry>
         <base>SUCCESSFULLY_MODIFIED_ROUTINGNNTP</base>
         <trans>Vos changements de mode d'accès NNTP ont
                bien étés pris en compte.
@@ -424,6 +406,12 @@
         </trans>
     </entry>
     <entry>
+        <base>SUCCESSFULLY_MODIFIED_SMTPPROXY</base>
+        <trans>Vos changements de configuration du Proxy SMTP ont
+               bien étés pris en compte.
+        </trans>
+    </entry>
+    <entry>
         <base>CREATE</base>
         <trans>Créer</trans>
     </entry>
diff -ruN smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail       2008-04-21 00:28:42.000000000 -0600
+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail    2008-04-24 09:57:28.000000000 -0600
@@ -246,6 +246,14 @@
         <trans>Imap</trans>
     </entry>
     <entry>
+        <base>SPOP3</base>
+        <trans>SSL Pop (Experimental)</trans>
+    </entry>
+    <entry>
+        <base>SIMAP</base>
+        <trans>SSL Imap (Experimental)</trans>
+    </entry>
+    <entry>
         <base>SHOW_FETCHMAIL_ACCOUNTS</base>
         <trans><![CDATA[
                <p>
@@ -330,11 +338,6 @@
         <trans><![CDATA[&nbsp;]]></trans>
     </entry>
     <entry>
-        <base>SUCCESS</base>
-        <trans>I tuoi cambiamenti alla configurazione di scaricamento posta sono stati salvati con successo.
-        </trans>
-    </entry>
-    <entry>
         <base>SUCCESSFULLY_CHANGED_CONF</base>
         <trans>I tuoi cambiamenti alla configurazione di scaricamento posta sono stati salvati con successo.
         </trans>
@@ -380,11 +383,6 @@
         </trans>
     </entry>
     <entry>
-        <base>ERROR_WHILE_MODIFYING_ROUTINGNNTP</base>
-        <trans>Impossibile applicare i cambiamenti alla configurazione del Proxy SMTP.
-        </trans>
-    </entry>
-    <entry>
         <base>CREATE</base>
         <trans>Crea</trans>
     </entry>
1	diff -ruN smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail
2	--- smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail 2008-04-21 00:28:49.000000000 -0600
3	+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail 2008-04-24 09:57:39.000000000 -0600
4	@@ -1,9 +1,5 @@
5	<lexicon lang="de">
6	<entry>
7	- <base>Collaboration</base>
8	- <trans> Zusammenarbeit </trans>
9	- </entry>
10	- <entry>
11	<base>FORM_TITLE</base>
12	<trans><![CDATA[
13	Einstellungen für den Empfang externer Mailboxen
14	@@ -253,6 +249,14 @@
15	<trans>Imap</trans>
16	</entry>
17	<entry>
18	+ <base>SPOP3</base>
19	+ <trans>SSL Pop (Experimental)</trans>
20	+ </entry>
21	+ <entry>
22	+ <base>SIMAP</base>
23	+ <trans>SSL Imap (Experimental)</trans>
24	+ </entry>
25	+ <entry>
26	<base>SHOW_FETCHMAIL_ACCOUNTS</base>
27	<trans><![CDATA[
28	<p>
29	@@ -309,8 +313,8 @@
30	<trans>Server Mailbox Password</trans>
31	</entry>
32	<entry>
33	- <base>Konfiguration</base>
34	- <trans>Konfiguration</trans>
35	+ <base>Collaboration</base>
36	+ <trans> Zusammenarbeit </trans>
37	</entry>
38	<entry>
39	<base>fetchmail</base>
40	@@ -337,12 +341,6 @@
41	<trans><![CDATA[ ]]></trans>
42	</entry>
43	<entry>
44	- <base>SUCCESS</base>
45	- <trans>Änderungen der FetchMail-Konfiguration wurden erfolgreich
46	- gespeichert.
47	- </trans>
48	- </entry>
49	- <entry>
50	<base>SUCCESSFULLY_CHANGED_CONF</base>
51	<trans>Änderungen der FetchMail-Konfiguration wurden erfolgreich
52	gespeichert.
53	@@ -396,12 +394,6 @@
54	</trans>
55	</entry>
56	<entry>
57	- <base>ERROR_WHILE_MODIFYING_ROUTINGNNTP</base>
58	- <trans>Die Änderungen für die SME SMTP Proxy Einstellungen
59	- konnten nicht gespeichert werden.
60	- </trans>
61	- </entry>
62	- <entry>
63	<base>CREATE</base>
64	<trans>Erstellen</trans>
65	</entry>
66	diff -ruN smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail
67	--- smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail 2008-04-21 00:28:40.000000000 -0600
68	+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail 2008-04-24 09:57:23.000000000 -0600
69	@@ -349,12 +349,6 @@
70	<trans><![CDATA[ ]]></trans>
71	</entry>
72	<entry>
73	- <base>SUCCESS</base>
74	- <trans>Your changes to the Fetchmail configuration have been
75	- saved successfully.
76	- </trans>
77	- </entry>
78	- <entry>
79	<base>SUCCESSFULLY_CHANGED_CONF</base>
80	<trans>Your changes to the Fetchmail configuration have been
81	saved successfully.
82	@@ -408,12 +402,6 @@
83	</trans>
84	</entry>
85	<entry>
86	- <base>ERROR_WHILE_MODIFYING_ROUTINGNNTP</base>
87	- <trans>Unable to apply the changes to the SME SMTP
88	- Proxy configuration.
89	- </trans>
90	- </entry>
91	- <entry>
92	<base>CREATE</base>
93	<trans>Create</trans>
94	</entry>
95	diff -ruN smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail
96	--- smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail 2008-04-21 00:28:45.000000000 -0600
97	+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail 2008-04-24 09:57:34.000000000 -0600
98	@@ -1,10 +1,4 @@
99	<lexicon lang="fr">
100	- <entry>
101	- <base>Collaboration</base>
102	- <trans>
103	- Collaboration
104	- </trans>
105	- </entry>
106	<entry>
107	<base>FORM_TITLE</base>
108	<trans>Configuration de la récupération de BALs externes</trans>
109	@@ -333,6 +327,12 @@
110	<base>MAIL_PASSWORD</base>
111	<trans>mot de passe sur le serveur</trans>
112	</entry>
113	+ <entry>
114	+ <base>Collaboration</base>
115	+ <trans>
116	+ Collaboration
117	+ </trans>
118	+ </entry>
119	<entry>
120	<base>fetchmail</base>
121	<trans>Récupération de mails</trans>
122	@@ -358,12 +358,6 @@
123	<trans><![CDATA[ ]]></trans>
124	</entry>
125	<entry>
126	- <base>SUCCESS</base>
127	- <trans>Vos changements à la configuration de la récupération de
128	- messages ont bien étés appliqués.
129	- </trans>
130	- </entry>
131	- <entry>
132	<base>SUCCESSFULLY_CHANGED_CONF</base>
133	<trans>Vos changements à la configuration de la récupération de
134	messages ont bien étés appliqués.
135	@@ -400,18 +394,6 @@
136	</trans>
137	</entry>
138	<entry>
139	- <base>SUCCESSFULLY_MODIFIED_SMTPPROXY</base>
140	- <trans>Vos changements de configuration du Proxy SMTP ont
141	- bien étés pris en compte.
142	- </trans>
143	- </entry>
144	- <entry>
145	- <base>ERROR_WHILE_MODIFYING_ROUTINGSMTP</base>
146	- <trans>Impossible d'appliquer les changements de configuration
147	- du proxy SMTP.
148	- </trans>
149	- </entry>
150	- <entry>
151	<base>SUCCESSFULLY_MODIFIED_ROUTINGNNTP</base>
152	<trans>Vos changements de mode d'accès NNTP ont
153	bien étés pris en compte.
154	@@ -424,6 +406,12 @@
155	</trans>
156	</entry>
157	<entry>
158	+ <base>SUCCESSFULLY_MODIFIED_SMTPPROXY</base>
159	+ <trans>Vos changements de configuration du Proxy SMTP ont
160	+ bien étés pris en compte.
161	+ </trans>
162	+ </entry>
163	+ <entry>
164	<base>CREATE</base>
165	<trans>Créer</trans>
166	</entry>
167	diff -ruN smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail
168	--- smeserver-fetchmail-1.3.6.dups/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail 2008-04-21 00:28:42.000000000 -0600
169	+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail 2008-04-24 09:57:28.000000000 -0600
170	@@ -246,6 +246,14 @@
171	<trans>Imap</trans>
172	</entry>
173	<entry>
174	+ <base>SPOP3</base>
175	+ <trans>SSL Pop (Experimental)</trans>
176	+ </entry>
177	+ <entry>
178	+ <base>SIMAP</base>
179	+ <trans>SSL Imap (Experimental)</trans>
180	+ </entry>
181	+ <entry>
182	<base>SHOW_FETCHMAIL_ACCOUNTS</base>
183	<trans><![CDATA[
184	<p>
185	@@ -330,11 +338,6 @@
186	<trans><![CDATA[ ]]></trans>
187	</entry>
188	<entry>
189	- <base>SUCCESS</base>
190	- <trans>I tuoi cambiamenti alla configurazione di scaricamento posta sono stati salvati con successo.
191	- </trans>
192	- </entry>
193	- <entry>
194	<base>SUCCESSFULLY_CHANGED_CONF</base>
195	<trans>I tuoi cambiamenti alla configurazione di scaricamento posta sono stati salvati con successo.
196	</trans>
197	@@ -380,11 +383,6 @@
198	</trans>
199	</entry>
200	<entry>
201	- <base>ERROR_WHILE_MODIFYING_ROUTINGNNTP</base>
202	- <trans>Impossibile applicare i cambiamenti alla configurazione del Proxy SMTP.
203	- </trans>
204	- </entry>
205	- <entry>
206	<base>CREATE</base>
207	<trans>Crea</trans>
208	</entry>