/[smecontribs]/rpms/smeserver-xt_geoip/contribs10/smeserver-xt_geoip-1.3.1-comp_e-smith-manager.patch
ViewVC logotype

Annotation of /rpms/smeserver-xt_geoip/contribs10/smeserver-xt_geoip-1.3.1-comp_e-smith-manager.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Wed Jan 6 14:35:30 2021 UTC (3 years, 9 months ago) by michel
Branch: MAIN
CVS Tags: smeserver-xt_geoip-1_3_1-03_el7_sme, smeserver-xt_geoip-1_3_1-08_el7_sme, smeserver-xt_geoip-1_3_1-10_el7_sme, smeserver-xt_geoip-1_3_1-20_el7_sme, smeserver-xt_geoip-1_3_1-06_el7_sme, smeserver-xt_geoip-1_3_1-21_el7_sme, smeserver-xt_geoip-1_3_1-16_el7_sme, smeserver-xt_geoip-1_3_1-13_el7_sme, smeserver-xt_geoip-1_3_1-18_el7_sme, smeserver-xt_geoip-1_3_1-15_el7_sme, smeserver-xt_geoip-1_3_1-12_el7_sme, smeserver-xt_geoip-1_3_1-14_el7_sme, smeserver-xt_geoip-1_3_1-11_el7_sme, smeserver-xt_geoip-1_3_1-09_el7_sme, smeserver-xt_geoip-1_3_1-05_el7_sme, smeserver-xt_geoip-1_3_1-4_el7_sme, smeserver-xt_geoip-1_3_1-07_el7_sme, smeserver-xt_geoip-1_3_1-17_el7_sme, smeserver-xt_geoip-1_3_1-19_el7_sme, HEAD 
make: « clog » est à jour.
1 michel 1.1 diff -urN smeserver-xt_geoip-1.3.1.old/createlinks smeserver-xt_geoip-1.3.1/createlinks
2     --- smeserver-xt_geoip-1.3.1.old/createlinks 2020-07-31 22:41:26.000000000 +0400
3     +++ smeserver-xt_geoip-1.3.1/createlinks 2021-01-06 12:48:17.737000000 +0400
4     @@ -9,20 +9,22 @@
5     # links to add
6    
7     # templates to expand
8     -for my $event (qw(xt_geoip-modify xt_geoip-update xt_geoip-service bootstrap-console-save console-save))
9     +for my $event (qw(xt_geoip-modify xt_geoip-update xt_geoip-service
10     + bootstrap-console-save console-save smeserver-xt_geoip-update))
11     {
12     templates2events("/etc/rc.d/init.d/masq", $event);
13     templates2events("/etc/crontab", $event);
14     templates2events("/usr/share/xt_geoip/update_base", $event);
15     }
16    
17     -for my $event (qw(xt_geoip-update bootstrap-console-save console-save))
18     +for my $event (qw(xt_geoip-update bootstrap-console-save
19     + console-save smeserver-xt_geoip-update))
20     {
21     event_link("smeserver-xt_geoip-download-action", $event, "10");
22     }
23    
24     # services to launch on event
25     -for my $event (qw(xt_geoip-modify xt_geoip-update))
26     +for my $event (qw(xt_geoip-modify xt_geoip-update smeserver-xt_geoip-update))
27     {
28     safe_symlink("restart",
29     "root/etc/e-smith/events/$event/services2adjust/masq");
30     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/db/configuration/defaults/masq/XtServices smeserver-xt_geoip-1.3.1/root/etc/e-smith/db/configuration/defaults/masq/XtServices
31     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/db/configuration/defaults/masq/XtServices 2020-06-07 23:12:41.000000000 +0400
32     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/db/configuration/defaults/masq/XtServices 2021-01-06 18:07:24.531000000 +0400
33     @@ -1 +1 @@
34     -imaps,pop3s,sshd,ftp,ssmtpd
35     +imaps,pop3s,sshd,ftp,sqpsmtpd
36     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/db/configuration/migrate/20xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/db/configuration/migrate/20xt_geoip
37     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/db/configuration/migrate/20xt_geoip 2020-06-07 23:12:41.000000000 +0400
38     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/db/configuration/migrate/20xt_geoip 2021-01-06 18:07:54.579000000 +0400
39     @@ -1,5 +1,5 @@
40     {
41     -my @addexclude = split(/,/,"imap,imaps,pop3,pop3s,pptpd,sshd,ftp,smtpd,ssmtpd");
42     +my @addexclude = split(/,/,"imap,imaps,pop3,pop3s,pptpd,sshd,ftp,qpsmtpd,sqpsmtpd");
43     my $masq = $DB->get('masq') or return;
44    
45     my @exclude = split(/,/, $masq->prop('XtServices') || '');
46     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/bg/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/bg/etc/e-smith/web/functions/xt_geoip
47     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/bg/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
48     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/bg/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
49     @@ -0,0 +1,262 @@
50     +<lexicon lang="bg">
51     +
52     + <entry>
53     + <base>FORM_TITLE</base>
54     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
55     + </entry>
56     +
57     + <entry>
58     + <base>ERROR_UPDATING</base>
59     + <trans>There was an error while updating xt_geoip.</trans>
60     + </entry>
61     +
62     + <entry>
63     + <base>SUCCESS</base>
64     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
65     +
66     + </entry>
67     +
68     + <entry>
69     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
70     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
71     + </entry>
72     +
73     + <entry>
74     + <base>NO_CHANGE</base>
75     + <trans>No change... no update !</trans>
76     + </entry>
77     +
78     + <entry>
79     + <base>LABEL_GEOIP_STATUS</base>
80     + <trans>Current GEOIP filtering :</trans>
81     + </entry>
82     +
83     + <entry>
84     + <base>LABEL_GEOIP</base>
85     + <trans>GEOIP filtering desired :</trans>
86     + </entry>
87     +
88     + <entry>
89     + <base>DESC_GEOIP</base>
90     + <trans>Should filtering by country of origin be activated ?</trans>
91     + </entry>
92     +
93     + <entry>
94     + <base>ERROR_STATUS_GEOIP</base>
95     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
96     + </entry>
97     +
98     + <entry>
99     + <base>LABEL_BADCOUNTRIES_STATUS</base>
100     + <trans>Current list of banished country codes :</trans>
101     + </entry>
102     +
103     + <entry>
104     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
105     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
106     + </entry>
107     +
108     + <entry>
109     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
110     + <trans>Country code(s) maximum reached: {$ctr}</trans>
111     + </entry>
112     +
113     + <entry>
114     + <base>LABEL_BADCOUNTRIES</base>
115     + <trans>New country codes to be used :</trans>
116     + </entry>
117     +
118     + <entry>
119     + <base>DESC_BADCOUNTRIES</base>
120     + <trans>List of country codes (uppercase et comma-separated).</trans>
121     + </entry>
122     +
123     + <entry>
124     + <base>LABEL_DATE_UPDATE_STATUS</base>
125     + <trans>Last update of GeoIP table :</trans>
126     + </entry>
127     +
128     + <entry>
129     + <base>LABEL_UPDATE</base>
130     + <trans>Force the update of GeoIP table :</trans>
131     + </entry>
132     +
133     + <entry>
134     + <base>DESC_UPDATE</base>
135     + <trans>GeoIP table is updated every week, but you can ...</trans>
136     + </entry>
137     +
138     + <entry>
139     + <base>IPT_LIST_DESCRIPTION</base>
140     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
141     + </entry>
142     + <entry>
143     + <base>IPT_LIST</base>
144     + <trans>филтър</trans>
145     + </entry>
146     +
147     + <entry>
148     + <base>SSH_LIST_DESCRIPTION</base>
149     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
150     + </entry>
151     + <entry>
152     + <base>SSH_LIST</base>
153     + <trans>грешка</trans>
154     + </entry>
155     +
156     + <entry>
157     + <base>STATS_GENERATED</base>
158     + <trans>Статистика</trans>
159     + </entry>
160     +
161     + <entry>
162     + <base>END_OF_STATS</base>
163     + <trans>Показване на статистика</trans>
164     + </entry>
165     +
166     + <entry>
167     + <base>INVALID_STATS_TYPE</base>
168     + <trans>Статистика по изпращач</trans>
169     + </entry>
170     +
171     + <entry>
172     + <base>STATS_DESCRIPTION</base>
173     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
174     + </entry>
175     +
176     + <entry>
177     + <base>COUNTRY_LIST_DESCRIPTION</base>
178     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
179     + </entry>
180     +
181     + <entry>
182     + <base>LABEL_COUNTRY_LIST</base>
183     + <trans>Country codes :</trans>
184     + </entry>
185     + <entry>
186     + <base>COUNTRY_LIST</base>
187     + <trans>Country codes</trans>
188     + </entry>
189     +
190     + <entry>
191     + <base>CNTRY_LIST</base>
192     + <trans>List</trans>
193     + </entry>
194     +
195     + <entry>
196     + <base>END_OF_CODES</base>
197     + <trans>Край на отчета</trans>
198     + </entry>
199     +
200     + <entry>
201     + <base>SERVICE_DESCRIPTION</base>
202     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
203     + </entry>
204     +
205     + <entry>
206     + <base>LABEL_SERVICE</base>
207     + <trans>Service name :</trans>
208     + </entry>
209     +
210     + <entry>
211     + <base>PER_SERVICE_GEOIP</base>
212     + <trans>الجهاز</trans>
213     + </entry>
214     +
215     + <entry>
216     + <base>ADD_SERVICE</base>
217     + <trans>Add or modify a per service filtering</trans>
218     + </entry>
219     +
220     + <entry>
221     + <base>ADD_DESC</base>
222     + <trans>You are choosing a particular country filtering for this service</trans>
223     + </entry>
224     +
225     + <entry>
226     + <base>REMOVE_SERVICE</base>
227     + <trans>Delete a per service filtering</trans>
228     + </entry>
229     +
230     + <entry>
231     + <base>REMOVE_DESC</base>
232     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
233     + </entry>
234     +
235     + <entry>
236     + <base>SERV_NOT_BAN</base>
237     + <trans>Unfiltered service.</trans>
238     + </entry>
239     +
240     + <entry>
241     + <base>NO_SERVICES</base>
242     + <trans>No services.</trans>
243     + </entry>
244     +
245     + <entry>
246     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
247     + <trans>List of rejected country codes for the service :</trans>
248     + </entry>
249     +
250     + <entry>
251     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
252     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
253     + </entry>
254     +
255     + <entry>
256     + <base>BADCOUNTRIES</base>
257     + <trans>списък</trans>
258     + </entry>
259     +
260     + <entry>
261     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
262     + <trans>Too many countries chosen: {$ctr}</trans>
263     + </entry>
264     +
265     + <entry>
266     + <base>LABEL_REVERSE_MATCH</base>
267     + <trans>Отказване</trans>
268     + </entry>
269     +
270     + <entry>
271     + <base>DESC_REVERSE_MATCH</base>
272     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
273     + </entry>
274     +
275     + <entry>
276     + <base>LABEL_OTHERS</base>
277     + <trans>General filter only for services without rules</trans>
278     + </entry>
279     +
280     + <entry>
281     + <base>DESC_OTHERS</base>
282     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
283     + </entry>
284     +
285     + <entry>
286     + <base>SERVICE_LIST_DESCRIPTION</base>
287     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
288     + </entry>
289     +
290     + <entry>
291     + <base>LABEL_SERVICE_LIST</base>
292     + <trans>الجهاز</trans>
293     + </entry>
294     +
295     + <entry>
296     + <base>SERV_LIST</base>
297     + <trans>List</trans>
298     + </entry>
299     +
300     + <entry>
301     + <base>DESC_AVAILABLE_SERVICES</base>
302     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
303     + </entry>
304     +
305     + <entry>
306     + <base>LABEL_AVAILABLE_SERVICES</base>
307     + <trans>Налични пакети</trans>
308     + </entry>
309     +
310     +
311     +</lexicon>
312     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/da/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/da/etc/e-smith/web/functions/xt_geoip
313     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/da/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
314     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/da/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
315     @@ -0,0 +1,262 @@
316     +<lexicon lang="da">
317     +
318     + <entry>
319     + <base>FORM_TITLE</base>
320     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
321     + </entry>
322     +
323     + <entry>
324     + <base>ERROR_UPDATING</base>
325     + <trans>There was an error while updating xt_geoip.</trans>
326     + </entry>
327     +
328     + <entry>
329     + <base>SUCCESS</base>
330     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
331     +
332     + </entry>
333     +
334     + <entry>
335     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
336     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
337     + </entry>
338     +
339     + <entry>
340     + <base>NO_CHANGE</base>
341     + <trans>No change... no update !</trans>
342     + </entry>
343     +
344     + <entry>
345     + <base>LABEL_GEOIP_STATUS</base>
346     + <trans>Current GEOIP filtering :</trans>
347     + </entry>
348     +
349     + <entry>
350     + <base>LABEL_GEOIP</base>
351     + <trans>GEOIP filtering desired :</trans>
352     + </entry>
353     +
354     + <entry>
355     + <base>DESC_GEOIP</base>
356     + <trans>Should filtering by country of origin be activated ?</trans>
357     + </entry>
358     +
359     + <entry>
360     + <base>ERROR_STATUS_GEOIP</base>
361     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
362     + </entry>
363     +
364     + <entry>
365     + <base>LABEL_BADCOUNTRIES_STATUS</base>
366     + <trans>Current list of banished country codes :</trans>
367     + </entry>
368     +
369     + <entry>
370     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
371     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
372     + </entry>
373     +
374     + <entry>
375     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
376     + <trans>Country code(s) maximum reached: {$ctr}</trans>
377     + </entry>
378     +
379     + <entry>
380     + <base>LABEL_BADCOUNTRIES</base>
381     + <trans>New country codes to be used :</trans>
382     + </entry>
383     +
384     + <entry>
385     + <base>DESC_BADCOUNTRIES</base>
386     + <trans>List of country codes (uppercase et comma-separated).</trans>
387     + </entry>
388     +
389     + <entry>
390     + <base>LABEL_DATE_UPDATE_STATUS</base>
391     + <trans>Last update of GeoIP table :</trans>
392     + </entry>
393     +
394     + <entry>
395     + <base>LABEL_UPDATE</base>
396     + <trans>Force the update of GeoIP table :</trans>
397     + </entry>
398     +
399     + <entry>
400     + <base>DESC_UPDATE</base>
401     + <trans>GeoIP table is updated every week, but you can ...</trans>
402     + </entry>
403     +
404     + <entry>
405     + <base>IPT_LIST_DESCRIPTION</base>
406     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
407     + </entry>
408     + <entry>
409     + <base>IPT_LIST</base>
410     + <trans>filtreret</trans>
411     + </entry>
412     +
413     + <entry>
414     + <base>SSH_LIST_DESCRIPTION</base>
415     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
416     + </entry>
417     + <entry>
418     + <base>SSH_LIST</base>
419     + <trans>fejl</trans>
420     + </entry>
421     +
422     + <entry>
423     + <base>STATS_GENERATED</base>
424     + <trans>Statistik</trans>
425     + </entry>
426     +
427     + <entry>
428     + <base>END_OF_STATS</base>
429     + <trans>Vis statistik</trans>
430     + </entry>
431     +
432     + <entry>
433     + <base>INVALID_STATS_TYPE</base>
434     + <trans>Afsenderstatistik</trans>
435     + </entry>
436     +
437     + <entry>
438     + <base>STATS_DESCRIPTION</base>
439     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
440     + </entry>
441     +
442     + <entry>
443     + <base>COUNTRY_LIST_DESCRIPTION</base>
444     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
445     + </entry>
446     +
447     + <entry>
448     + <base>LABEL_COUNTRY_LIST</base>
449     + <trans>Kildekode</trans>
450     + </entry>
451     + <entry>
452     + <base>COUNTRY_LIST</base>
453     + <trans>Kildekode</trans>
454     + </entry>
455     +
456     + <entry>
457     + <base>CNTRY_LIST</base>
458     + <trans>List</trans>
459     + </entry>
460     +
461     + <entry>
462     + <base>END_OF_CODES</base>
463     + <trans>Slutning på rapporten</trans>
464     + </entry>
465     +
466     + <entry>
467     + <base>SERVICE_DESCRIPTION</base>
468     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
469     + </entry>
470     +
471     + <entry>
472     + <base>LABEL_SERVICE</base>
473     + <trans>Tjeneste</trans>
474     + </entry>
475     +
476     + <entry>
477     + <base>PER_SERVICE_GEOIP</base>
478     + <trans>Tjeneste</trans>
479     + </entry>
480     +
481     + <entry>
482     + <base>ADD_SERVICE</base>
483     + <trans>Tilføj eller ændre en post.</trans>
484     + </entry>
485     +
486     + <entry>
487     + <base>ADD_DESC</base>
488     + <trans>You are choosing a particular country filtering for this service</trans>
489     + </entry>
490     +
491     + <entry>
492     + <base>REMOVE_SERVICE</base>
493     + <trans>Delete a per service filtering</trans>
494     + </entry>
495     +
496     + <entry>
497     + <base>REMOVE_DESC</base>
498     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
499     + </entry>
500     +
501     + <entry>
502     + <base>SERV_NOT_BAN</base>
503     + <trans>ufiltreret</trans>
504     + </entry>
505     +
506     + <entry>
507     + <base>NO_SERVICES</base>
508     + <trans>DNS tjenester</trans>
509     + </entry>
510     +
511     + <entry>
512     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
513     + <trans>List of rejected country codes for the service :</trans>
514     + </entry>
515     +
516     + <entry>
517     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
518     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
519     + </entry>
520     +
521     + <entry>
522     + <base>BADCOUNTRIES</base>
523     + <trans>Sortlistet</trans>
524     + </entry>
525     +
526     + <entry>
527     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
528     + <trans>Too many countries chosen: {$ctr}</trans>
529     + </entry>
530     +
531     + <entry>
532     + <base>LABEL_REVERSE_MATCH</base>
533     + <trans>Afvis</trans>
534     + </entry>
535     +
536     + <entry>
537     + <base>DESC_REVERSE_MATCH</base>
538     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
539     + </entry>
540     +
541     + <entry>
542     + <base>LABEL_OTHERS</base>
543     + <trans>General filter only for services without rules</trans>
544     + </entry>
545     +
546     + <entry>
547     + <base>DESC_OTHERS</base>
548     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
549     + </entry>
550     +
551     + <entry>
552     + <base>SERVICE_LIST_DESCRIPTION</base>
553     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
554     + </entry>
555     +
556     + <entry>
557     + <base>LABEL_SERVICE_LIST</base>
558     + <trans>Tjeneste</trans>
559     + </entry>
560     +
561     + <entry>
562     + <base>SERV_LIST</base>
563     + <trans>List</trans>
564     + </entry>
565     +
566     + <entry>
567     + <base>DESC_AVAILABLE_SERVICES</base>
568     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
569     + </entry>
570     +
571     + <entry>
572     + <base>LABEL_AVAILABLE_SERVICES</base>
573     + <trans>Tilgængelige pakker</trans>
574     + </entry>
575     +
576     +
577     +</lexicon>
578     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/de/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/de/etc/e-smith/web/functions/xt_geoip
579     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/de/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
580     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/de/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
581     @@ -0,0 +1,262 @@
582     +<lexicon lang="de">
583     +
584     + <entry>
585     + <base>FORM_TITLE</base>
586     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
587     + </entry>
588     +
589     + <entry>
590     + <base>ERROR_UPDATING</base>
591     + <trans>There was an error while updating xt_geoip.</trans>
592     + </entry>
593     +
594     + <entry>
595     + <base>SUCCESS</base>
596     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
597     +
598     + </entry>
599     +
600     + <entry>
601     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
602     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
603     + </entry>
604     +
605     + <entry>
606     + <base>NO_CHANGE</base>
607     + <trans>No change... no update !</trans>
608     + </entry>
609     +
610     + <entry>
611     + <base>LABEL_GEOIP_STATUS</base>
612     + <trans>Current GEOIP filtering :</trans>
613     + </entry>
614     +
615     + <entry>
616     + <base>LABEL_GEOIP</base>
617     + <trans>GEOIP filtering desired :</trans>
618     + </entry>
619     +
620     + <entry>
621     + <base>DESC_GEOIP</base>
622     + <trans>Should filtering by country of origin be activated ?</trans>
623     + </entry>
624     +
625     + <entry>
626     + <base>ERROR_STATUS_GEOIP</base>
627     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
628     + </entry>
629     +
630     + <entry>
631     + <base>LABEL_BADCOUNTRIES_STATUS</base>
632     + <trans>Current list of banished country codes :</trans>
633     + </entry>
634     +
635     + <entry>
636     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
637     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
638     + </entry>
639     +
640     + <entry>
641     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
642     + <trans>Country code(s) maximum reached: {$ctr}</trans>
643     + </entry>
644     +
645     + <entry>
646     + <base>LABEL_BADCOUNTRIES</base>
647     + <trans>New country codes to be used :</trans>
648     + </entry>
649     +
650     + <entry>
651     + <base>DESC_BADCOUNTRIES</base>
652     + <trans>List of country codes (uppercase et comma-separated).</trans>
653     + </entry>
654     +
655     + <entry>
656     + <base>LABEL_DATE_UPDATE_STATUS</base>
657     + <trans>Last update of GeoIP table :</trans>
658     + </entry>
659     +
660     + <entry>
661     + <base>LABEL_UPDATE</base>
662     + <trans>Force the update of GeoIP table :</trans>
663     + </entry>
664     +
665     + <entry>
666     + <base>DESC_UPDATE</base>
667     + <trans>GeoIP table is updated every week, but you can ...</trans>
668     + </entry>
669     +
670     + <entry>
671     + <base>IPT_LIST_DESCRIPTION</base>
672     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
673     + </entry>
674     + <entry>
675     + <base>IPT_LIST</base>
676     + <trans>gefiltert</trans>
677     + </entry>
678     +
679     + <entry>
680     + <base>SSH_LIST_DESCRIPTION</base>
681     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
682     + </entry>
683     + <entry>
684     + <base>SSH_LIST</base>
685     + <trans>Fehler</trans>
686     + </entry>
687     +
688     + <entry>
689     + <base>STATS_GENERATED</base>
690     + <trans>Statistiken</trans>
691     + </entry>
692     +
693     + <entry>
694     + <base>END_OF_STATS</base>
695     + <trans>Statistik anzeigen</trans>
696     + </entry>
697     +
698     + <entry>
699     + <base>INVALID_STATS_TYPE</base>
700     + <trans>Senderstatistik</trans>
701     + </entry>
702     +
703     + <entry>
704     + <base>STATS_DESCRIPTION</base>
705     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
706     + </entry>
707     +
708     + <entry>
709     + <base>COUNTRY_LIST_DESCRIPTION</base>
710     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
711     + </entry>
712     +
713     + <entry>
714     + <base>LABEL_COUNTRY_LIST</base>
715     + <trans>Country codes :</trans>
716     + </entry>
717     + <entry>
718     + <base>COUNTRY_LIST</base>
719     + <trans>Country codes</trans>
720     + </entry>
721     +
722     + <entry>
723     + <base>CNTRY_LIST</base>
724     + <trans>Liste</trans>
725     + </entry>
726     +
727     + <entry>
728     + <base>END_OF_CODES</base>
729     + <trans>Ende der Resultate.</trans>
730     + </entry>
731     +
732     + <entry>
733     + <base>SERVICE_DESCRIPTION</base>
734     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
735     + </entry>
736     +
737     + <entry>
738     + <base>LABEL_SERVICE</base>
739     + <trans>Dienst</trans>
740     + </entry>
741     +
742     + <entry>
743     + <base>PER_SERVICE_GEOIP</base>
744     + <trans>Dienst</trans>
745     + </entry>
746     +
747     + <entry>
748     + <base>ADD_SERVICE</base>
749     + <trans>Erzeuge oder ändere einen Datensatz.</trans>
750     + </entry>
751     +
752     + <entry>
753     + <base>ADD_DESC</base>
754     + <trans>You are choosing a particular country filtering for this service</trans>
755     + </entry>
756     +
757     + <entry>
758     + <base>REMOVE_SERVICE</base>
759     + <trans>Delete a per service filtering</trans>
760     + </entry>
761     +
762     + <entry>
763     + <base>REMOVE_DESC</base>
764     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
765     + </entry>
766     +
767     + <entry>
768     + <base>SERV_NOT_BAN</base>
769     + <trans>ungefiltert</trans>
770     + </entry>
771     +
772     + <entry>
773     + <base>NO_SERVICES</base>
774     + <trans>DNS Dienste</trans>
775     + </entry>
776     +
777     + <entry>
778     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
779     + <trans>List of rejected country codes for the service :</trans>
780     + </entry>
781     +
782     + <entry>
783     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
784     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
785     + </entry>
786     +
787     + <entry>
788     + <base>BADCOUNTRIES</base>
789     + <trans>Blacklisten</trans>
790     + </entry>
791     +
792     + <entry>
793     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
794     + <trans>Too many countries chosen: {$ctr}</trans>
795     + </entry>
796     +
797     + <entry>
798     + <base>LABEL_REVERSE_MATCH</base>
799     + <trans>Ablehnen</trans>
800     + </entry>
801     +
802     + <entry>
803     + <base>DESC_REVERSE_MATCH</base>
804     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
805     + </entry>
806     +
807     + <entry>
808     + <base>LABEL_OTHERS</base>
809     + <trans>General filter only for services without rules</trans>
810     + </entry>
811     +
812     + <entry>
813     + <base>DESC_OTHERS</base>
814     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
815     + </entry>
816     +
817     + <entry>
818     + <base>SERVICE_LIST_DESCRIPTION</base>
819     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
820     + </entry>
821     +
822     + <entry>
823     + <base>LABEL_SERVICE_LIST</base>
824     + <trans>Dienst</trans>
825     + </entry>
826     +
827     + <entry>
828     + <base>SERV_LIST</base>
829     + <trans>Liste</trans>
830     + </entry>
831     +
832     + <entry>
833     + <base>DESC_AVAILABLE_SERVICES</base>
834     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
835     + </entry>
836     +
837     + <entry>
838     + <base>LABEL_AVAILABLE_SERVICES</base>
839     + <trans>Jabber services</trans>
840     + </entry>
841     +
842     +
843     +</lexicon>
844     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/el/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/el/etc/e-smith/web/functions/xt_geoip
845     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/el/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
846     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/el/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
847     @@ -0,0 +1,262 @@
848     +<lexicon lang="el">
849     +
850     + <entry>
851     + <base>FORM_TITLE</base>
852     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
853     + </entry>
854     +
855     + <entry>
856     + <base>ERROR_UPDATING</base>
857     + <trans>There was an error while updating xt_geoip.</trans>
858     + </entry>
859     +
860     + <entry>
861     + <base>SUCCESS</base>
862     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
863     +
864     + </entry>
865     +
866     + <entry>
867     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
868     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
869     + </entry>
870     +
871     + <entry>
872     + <base>NO_CHANGE</base>
873     + <trans>No change... no update !</trans>
874     + </entry>
875     +
876     + <entry>
877     + <base>LABEL_GEOIP_STATUS</base>
878     + <trans>Current GEOIP filtering :</trans>
879     + </entry>
880     +
881     + <entry>
882     + <base>LABEL_GEOIP</base>
883     + <trans>GEOIP filtering desired :</trans>
884     + </entry>
885     +
886     + <entry>
887     + <base>DESC_GEOIP</base>
888     + <trans>Should filtering by country of origin be activated ?</trans>
889     + </entry>
890     +
891     + <entry>
892     + <base>ERROR_STATUS_GEOIP</base>
893     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
894     + </entry>
895     +
896     + <entry>
897     + <base>LABEL_BADCOUNTRIES_STATUS</base>
898     + <trans>Current list of banished country codes :</trans>
899     + </entry>
900     +
901     + <entry>
902     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
903     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
904     + </entry>
905     +
906     + <entry>
907     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
908     + <trans>Country code(s) maximum reached: {$ctr}</trans>
909     + </entry>
910     +
911     + <entry>
912     + <base>LABEL_BADCOUNTRIES</base>
913     + <trans>New country codes to be used :</trans>
914     + </entry>
915     +
916     + <entry>
917     + <base>DESC_BADCOUNTRIES</base>
918     + <trans>List of country codes (uppercase et comma-separated).</trans>
919     + </entry>
920     +
921     + <entry>
922     + <base>LABEL_DATE_UPDATE_STATUS</base>
923     + <trans>Last update of GeoIP table :</trans>
924     + </entry>
925     +
926     + <entry>
927     + <base>LABEL_UPDATE</base>
928     + <trans>Force the update of GeoIP table :</trans>
929     + </entry>
930     +
931     + <entry>
932     + <base>DESC_UPDATE</base>
933     + <trans>GeoIP table is updated every week, but you can ...</trans>
934     + </entry>
935     +
936     + <entry>
937     + <base>IPT_LIST_DESCRIPTION</base>
938     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
939     + </entry>
940     + <entry>
941     + <base>IPT_LIST</base>
942     + <trans>Filtered</trans>
943     + </entry>
944     +
945     + <entry>
946     + <base>SSH_LIST_DESCRIPTION</base>
947     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
948     + </entry>
949     + <entry>
950     + <base>SSH_LIST</base>
951     + <trans>Κλείδες SSH</trans>
952     + </entry>
953     +
954     + <entry>
955     + <base>STATS_GENERATED</base>
956     + <trans>Statistics generated</trans>
957     + </entry>
958     +
959     + <entry>
960     + <base>END_OF_STATS</base>
961     + <trans>Προβολή στατιστικών</trans>
962     + </entry>
963     +
964     + <entry>
965     + <base>INVALID_STATS_TYPE</base>
966     + <trans>Στατιστικά αποστολέων</trans>
967     + </entry>
968     +
969     + <entry>
970     + <base>STATS_DESCRIPTION</base>
971     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
972     + </entry>
973     +
974     + <entry>
975     + <base>COUNTRY_LIST_DESCRIPTION</base>
976     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
977     + </entry>
978     +
979     + <entry>
980     + <base>LABEL_COUNTRY_LIST</base>
981     + <trans>Country codes :</trans>
982     + </entry>
983     + <entry>
984     + <base>COUNTRY_LIST</base>
985     + <trans>Country codes</trans>
986     + </entry>
987     +
988     + <entry>
989     + <base>CNTRY_LIST</base>
990     + <trans>List</trans>
991     + </entry>
992     +
993     + <entry>
994     + <base>END_OF_CODES</base>
995     + <trans>Τέλος Αναφοράς</trans>
996     + </entry>
997     +
998     + <entry>
999     + <base>SERVICE_DESCRIPTION</base>
1000     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
1001     + </entry>
1002     +
1003     + <entry>
1004     + <base>LABEL_SERVICE</base>
1005     + <trans>Service name :</trans>
1006     + </entry>
1007     +
1008     + <entry>
1009     + <base>PER_SERVICE_GEOIP</base>
1010     + <trans>Επισκόπηση</trans>
1011     + </entry>
1012     +
1013     + <entry>
1014     + <base>ADD_SERVICE</base>
1015     + <trans>Add or modify a per service filtering</trans>
1016     + </entry>
1017     +
1018     + <entry>
1019     + <base>ADD_DESC</base>
1020     + <trans>You are choosing a particular country filtering for this service</trans>
1021     + </entry>
1022     +
1023     + <entry>
1024     + <base>REMOVE_SERVICE</base>
1025     + <trans>Delete a per service filtering</trans>
1026     + </entry>
1027     +
1028     + <entry>
1029     + <base>REMOVE_DESC</base>
1030     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
1031     + </entry>
1032     +
1033     + <entry>
1034     + <base>SERV_NOT_BAN</base>
1035     + <trans>Unfiltered service.</trans>
1036     + </entry>
1037     +
1038     + <entry>
1039     + <base>NO_SERVICES</base>
1040     + <trans>No services.</trans>
1041     + </entry>
1042     +
1043     + <entry>
1044     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
1045     + <trans>List of rejected country codes for the service :</trans>
1046     + </entry>
1047     +
1048     + <entry>
1049     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
1050     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
1051     + </entry>
1052     +
1053     + <entry>
1054     + <base>BADCOUNTRIES</base>
1055     + <trans>Blacklist</trans>
1056     + </entry>
1057     +
1058     + <entry>
1059     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
1060     + <trans>Too many countries chosen: {$ctr}</trans>
1061     + </entry>
1062     +
1063     + <entry>
1064     + <base>LABEL_REVERSE_MATCH</base>
1065     + <trans>Απόρριψη</trans>
1066     + </entry>
1067     +
1068     + <entry>
1069     + <base>DESC_REVERSE_MATCH</base>
1070     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
1071     + </entry>
1072     +
1073     + <entry>
1074     + <base>LABEL_OTHERS</base>
1075     + <trans>General filter only for services without rules</trans>
1076     + </entry>
1077     +
1078     + <entry>
1079     + <base>DESC_OTHERS</base>
1080     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
1081     + </entry>
1082     +
1083     + <entry>
1084     + <base>SERVICE_LIST_DESCRIPTION</base>
1085     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
1086     + </entry>
1087     +
1088     + <entry>
1089     + <base>LABEL_SERVICE_LIST</base>
1090     + <trans>Επισκόπηση</trans>
1091     + </entry>
1092     +
1093     + <entry>
1094     + <base>SERV_LIST</base>
1095     + <trans>List</trans>
1096     + </entry>
1097     +
1098     + <entry>
1099     + <base>DESC_AVAILABLE_SERVICES</base>
1100     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
1101     + </entry>
1102     +
1103     + <entry>
1104     + <base>LABEL_AVAILABLE_SERVICES</base>
1105     + <trans>Διαθέσιμα πακέτα</trans>
1106     + </entry>
1107     +
1108     +
1109     +</lexicon>
1110     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/xt_geoip
1111     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
1112     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
1113     @@ -0,0 +1,294 @@
1114     +<lexicon lang="en-us">
1115     +
1116     + <entry>
1117     + <base>FORM_TITLE</base>
1118     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]> </trans>
1119     + </entry>
1120     +
1121     + <entry>
1122     + <base>ERROR_UPDATING</base>
1123     + <trans>There was an error while updating xt_geoip.</trans>
1124     + </entry>
1125     +
1126     + <entry>
1127     + <base>SUCCESS</base>
1128     + <trans>
1129     + Successful change... Now IP filtering takes into account the countries entered.
1130     + </trans>
1131     +
1132     + </entry>
1133     +
1134     + <entry>
1135     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
1136     + <trans><![CDATA[ <ul>
1137     + <li>IP filtering can be enabled or disabled with the appropriate button</li>
1138     + <li>Codes of the countries to be banished can be entered in the corresponding field</li>
1139     + <li>An immediate update of the table can be requested here</li></ul>
1140     + <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]>
1141     + </trans>
1142     + </entry>
1143     +
1144     + <entry>
1145     + <base>NO_CHANGE</base>
1146     + <trans>No change... no update !
1147     + </trans>
1148     + </entry>
1149     +
1150     + <entry>
1151     + <base>LABEL_GEOIP_STATUS</base>
1152     + <trans>Current GEOIP filtering : </trans>
1153     + </entry>
1154     +
1155     + <entry>
1156     + <base>LABEL_GEOIP</base>
1157     + <trans>GEOIP filtering desired : </trans>
1158     + </entry>
1159     +
1160     + <entry>
1161     + <base>DESC_GEOIP</base>
1162     + <trans>Should filtering by country of origin be activated ?</trans>
1163     + </entry>
1164     +
1165     + <entry>
1166     + <base>ERROR_STATUS_GEOIP</base>
1167     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
1168     + </entry>
1169     +
1170     + <entry>
1171     + <base>LABEL_BADCOUNTRIES_STATUS</base>
1172     + <trans>Current list of banished country codes : </trans>
1173     + </entry>
1174     +
1175     + <entry>
1176     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
1177     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
1178     + </entry>
1179     +
1180     + <entry>
1181     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
1182     + <trans>Country code(s) maximum reached: {$ctr}</trans>
1183     + </entry>
1184     +
1185     + <entry>
1186     + <base>LABEL_BADCOUNTRIES</base>
1187     + <trans>New country codes to be used :</trans>
1188     + </entry>
1189     +
1190     + <entry>
1191     + <base>DESC_BADCOUNTRIES</base>
1192     + <trans>List of country codes (uppercase et comma-separated).</trans>
1193     + </entry>
1194     +
1195     + <entry>
1196     + <base>LABEL_DATE_UPDATE_STATUS</base>
1197     + <trans>Last update of GeoIP table :</trans>
1198     + </entry>
1199     +
1200     + <entry>
1201     + <base>LABEL_UPDATE</base>
1202     + <trans>Force the update of GeoIP table :</trans>
1203     + </entry>
1204     +
1205     + <entry>
1206     + <base>DESC_UPDATE</base>
1207     + <trans>GeoIP table is updated every week, but you can ...</trans>
1208     + </entry>
1209     +
1210     + <entry>
1211     + <base>IPT_LIST_DESCRIPTION</base>
1212     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]>
1213     + </trans>
1214     + </entry>
1215     + <entry>
1216     + <base>IPT_LIST</base>
1217     + <trans>Filtered</trans>
1218     + </entry>
1219     +
1220     + <entry>
1221     + <base>SSH_LIST_DESCRIPTION</base>
1222     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]>
1223     + </trans>
1224     + </entry>
1225     + <entry>
1226     + <base>SSH_LIST</base>
1227     + <trans>SSH errors</trans>
1228     + </entry>
1229     +
1230     + <entry>
1231     + <base>STATS_GENERATED</base>
1232     + <trans>Statistics generated</trans>
1233     + </entry>
1234     +
1235     + <entry>
1236     + <base>END_OF_STATS</base>
1237     + <trans>End of Statistics</trans>
1238     + </entry>
1239     +
1240     + <entry>
1241     + <base>INVALID_STATS_TYPE</base>
1242     + <trans>Invalid type of statistics</trans>
1243     + </entry>
1244     +
1245     + <entry>
1246     + <base>STATS_DESCRIPTION</base>
1247     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul>
1248     + <li>For 3 periods : Day, Week and Month</li>
1249     + <li>Banned Ips by country sorted by number</li>
1250     + <li>Ssh errors by country sorted by number</li>
1251     + </ul><p><i>XX means Country not found !</i></p> ]]>
1252     + </trans>
1253     + </entry>
1254     +
1255     + <entry>
1256     + <base>COUNTRY_LIST_DESCRIPTION</base>
1257     + <trans><![CDATA[<ul>
1258     + <li>Click here to see a <b>list of available country codes</b></li>
1259     + </ul> ]]>
1260     + </trans>
1261     + </entry>
1262     +
1263     + <entry>
1264     + <base>LABEL_COUNTRY_LIST</base>
1265     + <trans>Country codes : </trans>
1266     + </entry>
1267     + <entry>
1268     + <base>COUNTRY_LIST</base>
1269     + <trans>Country codes</trans>
1270     + </entry>
1271     +
1272     + <entry>
1273     + <base>CNTRY_LIST</base>
1274     + <trans>List</trans>
1275     + </entry>
1276     +
1277     + <entry>
1278     + <base>END_OF_CODES</base>
1279     + <trans>End of code list</trans>
1280     + </entry>
1281     +
1282     + <entry>
1283     + <base>SERVICE_DESCRIPTION</base>
1284     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul>
1285     + <li>If you want different filtering based on services</li>
1286     + </ul><p><i></i></p> ]]>
1287     + </trans>
1288     + </entry>
1289     +
1290     + <entry>
1291     + <base>LABEL_SERVICE</base>
1292     + <trans>Service name : </trans>
1293     + </entry>
1294     +
1295     + <entry>
1296     + <base>PER_SERVICE_GEOIP</base>
1297     + <trans>Services</trans>
1298     + </entry>
1299     +
1300     + <entry>
1301     + <base>ADD_SERVICE</base>
1302     + <trans>Add or modify a per service filtering</trans>
1303     + </entry>
1304     +
1305     + <entry>
1306     + <base>ADD_DESC</base>
1307     + <trans>You are choosing a particular country filtering for this service</trans>
1308     + </entry>
1309     +
1310     + <entry>
1311     + <base>REMOVE_SERVICE</base>
1312     + <trans>Delete a per service filtering</trans>
1313     + </entry>
1314     +
1315     + <entry>
1316     + <base>REMOVE_DESC</base>
1317     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
1318     + </entry>
1319     +
1320     + <entry>
1321     + <base>SERV_NOT_BAN</base>
1322     + <trans>Unfiltered service.</trans>
1323     + </entry>
1324     +
1325     + <entry>
1326     + <base>NO_SERVICES</base>
1327     + <trans>No services.</trans>
1328     + </entry>
1329     +
1330     + <entry>
1331     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
1332     + <trans>List of rejected country codes for the service : </trans>
1333     + </entry>
1334     +
1335     + <entry>
1336     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
1337     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
1338     + </entry>
1339     +
1340     + <entry>
1341     + <base>BADCOUNTRIES</base>
1342     + <trans>Blacklist</trans>
1343     + </entry>
1344     +
1345     + <entry>
1346     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
1347     + <trans>Too many countries chosen: {$ctr}</trans>
1348     + </entry>
1349     +
1350     + <entry>
1351     + <base>LABEL_REVERSE_MATCH</base>
1352     + <trans>Reject if</trans>
1353     + </entry>
1354     +
1355     + <entry>
1356     + <base>DESC_REVERSE_MATCH</base>
1357     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
1358     + </entry>
1359     +
1360     + <entry>
1361     + <base>LABEL_OTHERS</base>
1362     + <trans>General filter only for services without rules</trans>
1363     + </entry>
1364     +
1365     + <entry>
1366     + <base>DESC_OTHERS</base>
1367     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
1368     + </entry>
1369     +
1370     + <entry>
1371     + <base>SERVICE_LIST_DESCRIPTION</base>
1372     + <trans><![CDATA[<ul>
1373     + <li>Click here to select <b>new </b>services among an <b>available services list</b></li>
1374     + </ul> ]]>
1375     + </trans>
1376     + </entry>
1377     +
1378     + <entry>
1379     + <base>LABEL_SERVICE_LIST</base>
1380     + <trans>Service codes : </trans>
1381     + </entry>
1382     +
1383     + <entry>
1384     + <base>SERV_LIST</base>
1385     + <trans>List</trans>
1386     + </entry>
1387     +
1388     + <entry>
1389     + <base>DESC_AVAILABLE_SERVICES</base>
1390     + <trans><![CDATA[ <h2> New Services selection</h2>
1391     + <ul><li>Select here among the other services not yet managed individually.
1392     + </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones.
1393     + </li></ul> ]]>
1394     + </trans>
1395     + </entry>
1396     +
1397     + <entry>
1398     + <base>LABEL_AVAILABLE_SERVICES</base>
1399     + <trans>Available Services</trans>
1400     + </entry>
1401     +
1402     + <entry>
1403     + <base>ERROR_LICENSE_KEY</base>
1404     + <trans><![CDATA[ <font color="red">GEOIP license key unavailable. Downloading is <b>inactive</b></font> ]]></trans>
1405     + </entry>
1406     +
1407     +</lexicon>
1408     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/es/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/es/etc/e-smith/web/functions/xt_geoip
1409     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/es/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
1410     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/es/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
1411     @@ -0,0 +1,262 @@
1412     +<lexicon lang="es">
1413     +
1414     + <entry>
1415     + <base>FORM_TITLE</base>
1416     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
1417     + </entry>
1418     +
1419     + <entry>
1420     + <base>ERROR_UPDATING</base>
1421     + <trans>There was an error while updating xt_geoip.</trans>
1422     + </entry>
1423     +
1424     + <entry>
1425     + <base>SUCCESS</base>
1426     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
1427     +
1428     + </entry>
1429     +
1430     + <entry>
1431     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
1432     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
1433     + </entry>
1434     +
1435     + <entry>
1436     + <base>NO_CHANGE</base>
1437     + <trans>No change... no update !</trans>
1438     + </entry>
1439     +
1440     + <entry>
1441     + <base>LABEL_GEOIP_STATUS</base>
1442     + <trans>Current GEOIP filtering :</trans>
1443     + </entry>
1444     +
1445     + <entry>
1446     + <base>LABEL_GEOIP</base>
1447     + <trans>GEOIP filtering desired :</trans>
1448     + </entry>
1449     +
1450     + <entry>
1451     + <base>DESC_GEOIP</base>
1452     + <trans>Should filtering by country of origin be activated ?</trans>
1453     + </entry>
1454     +
1455     + <entry>
1456     + <base>ERROR_STATUS_GEOIP</base>
1457     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
1458     + </entry>
1459     +
1460     + <entry>
1461     + <base>LABEL_BADCOUNTRIES_STATUS</base>
1462     + <trans>Current list of banished country codes :</trans>
1463     + </entry>
1464     +
1465     + <entry>
1466     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
1467     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
1468     + </entry>
1469     +
1470     + <entry>
1471     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
1472     + <trans>Country code(s) maximum reached: {$ctr}</trans>
1473     + </entry>
1474     +
1475     + <entry>
1476     + <base>LABEL_BADCOUNTRIES</base>
1477     + <trans>New country codes to be used :</trans>
1478     + </entry>
1479     +
1480     + <entry>
1481     + <base>DESC_BADCOUNTRIES</base>
1482     + <trans>List of country codes (uppercase et comma-separated).</trans>
1483     + </entry>
1484     +
1485     + <entry>
1486     + <base>LABEL_DATE_UPDATE_STATUS</base>
1487     + <trans>Last update of GeoIP table :</trans>
1488     + </entry>
1489     +
1490     + <entry>
1491     + <base>LABEL_UPDATE</base>
1492     + <trans>Force the update of GeoIP table :</trans>
1493     + </entry>
1494     +
1495     + <entry>
1496     + <base>DESC_UPDATE</base>
1497     + <trans>GeoIP table is updated every week, but you can ...</trans>
1498     + </entry>
1499     +
1500     + <entry>
1501     + <base>IPT_LIST_DESCRIPTION</base>
1502     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
1503     + </entry>
1504     + <entry>
1505     + <base>IPT_LIST</base>
1506     + <trans>Filtro</trans>
1507     + </entry>
1508     +
1509     + <entry>
1510     + <base>SSH_LIST_DESCRIPTION</base>
1511     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
1512     + </entry>
1513     + <entry>
1514     + <base>SSH_LIST</base>
1515     + <trans>error</trans>
1516     + </entry>
1517     +
1518     + <entry>
1519     + <base>STATS_GENERATED</base>
1520     + <trans>Estadísticas</trans>
1521     + </entry>
1522     +
1523     + <entry>
1524     + <base>END_OF_STATS</base>
1525     + <trans>Mostrar estadísticas</trans>
1526     + </entry>
1527     +
1528     + <entry>
1529     + <base>INVALID_STATS_TYPE</base>
1530     + <trans>Estadísticas del remitente</trans>
1531     + </entry>
1532     +
1533     + <entry>
1534     + <base>STATS_DESCRIPTION</base>
1535     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
1536     + </entry>
1537     +
1538     + <entry>
1539     + <base>COUNTRY_LIST_DESCRIPTION</base>
1540     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
1541     + </entry>
1542     +
1543     + <entry>
1544     + <base>LABEL_COUNTRY_LIST</base>
1545     + <trans>Código fuente</trans>
1546     + </entry>
1547     + <entry>
1548     + <base>COUNTRY_LIST</base>
1549     + <trans>Código fuente</trans>
1550     + </entry>
1551     +
1552     + <entry>
1553     + <base>CNTRY_LIST</base>
1554     + <trans>Lista Cosas por hacer</trans>
1555     + </entry>
1556     +
1557     + <entry>
1558     + <base>END_OF_CODES</base>
1559     + <trans>Fin de los resultados.</trans>
1560     + </entry>
1561     +
1562     + <entry>
1563     + <base>SERVICE_DESCRIPTION</base>
1564     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
1565     + </entry>
1566     +
1567     + <entry>
1568     + <base>LABEL_SERVICE</base>
1569     + <trans>Estado del Servicio</trans>
1570     + </entry>
1571     +
1572     + <entry>
1573     + <base>PER_SERVICE_GEOIP</base>
1574     + <trans>Estado del Servicio</trans>
1575     + </entry>
1576     +
1577     + <entry>
1578     + <base>ADD_SERVICE</base>
1579     + <trans>Add or modify a per service filtering</trans>
1580     + </entry>
1581     +
1582     + <entry>
1583     + <base>ADD_DESC</base>
1584     + <trans>You are choosing a particular country filtering for this service</trans>
1585     + </entry>
1586     +
1587     + <entry>
1588     + <base>REMOVE_SERVICE</base>
1589     + <trans>Delete a per service filtering</trans>
1590     + </entry>
1591     +
1592     + <entry>
1593     + <base>REMOVE_DESC</base>
1594     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
1595     + </entry>
1596     +
1597     + <entry>
1598     + <base>SERV_NOT_BAN</base>
1599     + <trans>servicio gratuito</trans>
1600     + </entry>
1601     +
1602     + <entry>
1603     + <base>NO_SERVICES</base>
1604     + <trans>Servicios Jabber</trans>
1605     + </entry>
1606     +
1607     + <entry>
1608     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
1609     + <trans>List of rejected country codes for the service :</trans>
1610     + </entry>
1611     +
1612     + <entry>
1613     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
1614     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
1615     + </entry>
1616     +
1617     + <entry>
1618     + <base>BADCOUNTRIES</base>
1619     + <trans>lista</trans>
1620     + </entry>
1621     +
1622     + <entry>
1623     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
1624     + <trans>Too many countries chosen: {$ctr}</trans>
1625     + </entry>
1626     +
1627     + <entry>
1628     + <base>LABEL_REVERSE_MATCH</base>
1629     + <trans>Rechazar</trans>
1630     + </entry>
1631     +
1632     + <entry>
1633     + <base>DESC_REVERSE_MATCH</base>
1634     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
1635     + </entry>
1636     +
1637     + <entry>
1638     + <base>LABEL_OTHERS</base>
1639     + <trans>General filter only for services without rules</trans>
1640     + </entry>
1641     +
1642     + <entry>
1643     + <base>DESC_OTHERS</base>
1644     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
1645     + </entry>
1646     +
1647     + <entry>
1648     + <base>SERVICE_LIST_DESCRIPTION</base>
1649     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
1650     + </entry>
1651     +
1652     + <entry>
1653     + <base>LABEL_SERVICE_LIST</base>
1654     + <trans>Estado del Servicio</trans>
1655     + </entry>
1656     +
1657     + <entry>
1658     + <base>SERV_LIST</base>
1659     + <trans>Lista Cosas por hacer</trans>
1660     + </entry>
1661     +
1662     + <entry>
1663     + <base>DESC_AVAILABLE_SERVICES</base>
1664     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
1665     + </entry>
1666     +
1667     + <entry>
1668     + <base>LABEL_AVAILABLE_SERVICES</base>
1669     + <trans>Paquetes disponibles</trans>
1670     + </entry>
1671     +
1672     +
1673     +</lexicon>
1674     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/et/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/et/etc/e-smith/web/functions/xt_geoip
1675     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/et/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
1676     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/et/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
1677     @@ -0,0 +1,262 @@
1678     +<lexicon lang="et">
1679     +
1680     + <entry>
1681     + <base>FORM_TITLE</base>
1682     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
1683     + </entry>
1684     +
1685     + <entry>
1686     + <base>ERROR_UPDATING</base>
1687     + <trans>There was an error while updating xt_geoip.</trans>
1688     + </entry>
1689     +
1690     + <entry>
1691     + <base>SUCCESS</base>
1692     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
1693     +
1694     + </entry>
1695     +
1696     + <entry>
1697     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
1698     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
1699     + </entry>
1700     +
1701     + <entry>
1702     + <base>NO_CHANGE</base>
1703     + <trans>No change... no update !</trans>
1704     + </entry>
1705     +
1706     + <entry>
1707     + <base>LABEL_GEOIP_STATUS</base>
1708     + <trans>Current GEOIP filtering :</trans>
1709     + </entry>
1710     +
1711     + <entry>
1712     + <base>LABEL_GEOIP</base>
1713     + <trans>GEOIP filtering desired :</trans>
1714     + </entry>
1715     +
1716     + <entry>
1717     + <base>DESC_GEOIP</base>
1718     + <trans>Should filtering by country of origin be activated ?</trans>
1719     + </entry>
1720     +
1721     + <entry>
1722     + <base>ERROR_STATUS_GEOIP</base>
1723     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
1724     + </entry>
1725     +
1726     + <entry>
1727     + <base>LABEL_BADCOUNTRIES_STATUS</base>
1728     + <trans>Current list of banished country codes :</trans>
1729     + </entry>
1730     +
1731     + <entry>
1732     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
1733     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
1734     + </entry>
1735     +
1736     + <entry>
1737     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
1738     + <trans>Country code(s) maximum reached: {$ctr}</trans>
1739     + </entry>
1740     +
1741     + <entry>
1742     + <base>LABEL_BADCOUNTRIES</base>
1743     + <trans>New country codes to be used :</trans>
1744     + </entry>
1745     +
1746     + <entry>
1747     + <base>DESC_BADCOUNTRIES</base>
1748     + <trans>List of country codes (uppercase et comma-separated).</trans>
1749     + </entry>
1750     +
1751     + <entry>
1752     + <base>LABEL_DATE_UPDATE_STATUS</base>
1753     + <trans>Last update of GeoIP table :</trans>
1754     + </entry>
1755     +
1756     + <entry>
1757     + <base>LABEL_UPDATE</base>
1758     + <trans>Force the update of GeoIP table :</trans>
1759     + </entry>
1760     +
1761     + <entry>
1762     + <base>DESC_UPDATE</base>
1763     + <trans>GeoIP table is updated every week, but you can ...</trans>
1764     + </entry>
1765     +
1766     + <entry>
1767     + <base>IPT_LIST_DESCRIPTION</base>
1768     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
1769     + </entry>
1770     + <entry>
1771     + <base>IPT_LIST</base>
1772     + <trans>Filtered</trans>
1773     + </entry>
1774     +
1775     + <entry>
1776     + <base>SSH_LIST_DESCRIPTION</base>
1777     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
1778     + </entry>
1779     + <entry>
1780     + <base>SSH_LIST</base>
1781     + <trans>SSH Keys</trans>
1782     + </entry>
1783     +
1784     + <entry>
1785     + <base>STATS_GENERATED</base>
1786     + <trans>Statistics generated</trans>
1787     + </entry>
1788     +
1789     + <entry>
1790     + <base>END_OF_STATS</base>
1791     + <trans>Näita statistikat</trans>
1792     + </entry>
1793     +
1794     + <entry>
1795     + <base>INVALID_STATS_TYPE</base>
1796     + <trans>Saatjate statistika</trans>
1797     + </entry>
1798     +
1799     + <entry>
1800     + <base>STATS_DESCRIPTION</base>
1801     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
1802     + </entry>
1803     +
1804     + <entry>
1805     + <base>COUNTRY_LIST_DESCRIPTION</base>
1806     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
1807     + </entry>
1808     +
1809     + <entry>
1810     + <base>LABEL_COUNTRY_LIST</base>
1811     + <trans>Country codes :</trans>
1812     + </entry>
1813     + <entry>
1814     + <base>COUNTRY_LIST</base>
1815     + <trans>Country codes</trans>
1816     + </entry>
1817     +
1818     + <entry>
1819     + <base>CNTRY_LIST</base>
1820     + <trans>List</trans>
1821     + </entry>
1822     +
1823     + <entry>
1824     + <base>END_OF_CODES</base>
1825     + <trans>Raporti lõpp</trans>
1826     + </entry>
1827     +
1828     + <entry>
1829     + <base>SERVICE_DESCRIPTION</base>
1830     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
1831     + </entry>
1832     +
1833     + <entry>
1834     + <base>LABEL_SERVICE</base>
1835     + <trans>Service name :</trans>
1836     + </entry>
1837     +
1838     + <entry>
1839     + <base>PER_SERVICE_GEOIP</base>
1840     + <trans>tasuta teenus</trans>
1841     + </entry>
1842     +
1843     + <entry>
1844     + <base>ADD_SERVICE</base>
1845     + <trans>Add or modify a per service filtering</trans>
1846     + </entry>
1847     +
1848     + <entry>
1849     + <base>ADD_DESC</base>
1850     + <trans>You are choosing a particular country filtering for this service</trans>
1851     + </entry>
1852     +
1853     + <entry>
1854     + <base>REMOVE_SERVICE</base>
1855     + <trans>Delete a per service filtering</trans>
1856     + </entry>
1857     +
1858     + <entry>
1859     + <base>REMOVE_DESC</base>
1860     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
1861     + </entry>
1862     +
1863     + <entry>
1864     + <base>SERV_NOT_BAN</base>
1865     + <trans>tasuta teenus</trans>
1866     + </entry>
1867     +
1868     + <entry>
1869     + <base>NO_SERVICES</base>
1870     + <trans>tasuta teenus</trans>
1871     + </entry>
1872     +
1873     + <entry>
1874     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
1875     + <trans>List of rejected country codes for the service :</trans>
1876     + </entry>
1877     +
1878     + <entry>
1879     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
1880     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
1881     + </entry>
1882     +
1883     + <entry>
1884     + <base>BADCOUNTRIES</base>
1885     + <trans>Blacklist</trans>
1886     + </entry>
1887     +
1888     + <entry>
1889     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
1890     + <trans>Too many countries chosen: {$ctr}</trans>
1891     + </entry>
1892     +
1893     + <entry>
1894     + <base>LABEL_REVERSE_MATCH</base>
1895     + <trans>Keeldu</trans>
1896     + </entry>
1897     +
1898     + <entry>
1899     + <base>DESC_REVERSE_MATCH</base>
1900     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
1901     + </entry>
1902     +
1903     + <entry>
1904     + <base>LABEL_OTHERS</base>
1905     + <trans>General filter only for services without rules</trans>
1906     + </entry>
1907     +
1908     + <entry>
1909     + <base>DESC_OTHERS</base>
1910     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
1911     + </entry>
1912     +
1913     + <entry>
1914     + <base>SERVICE_LIST_DESCRIPTION</base>
1915     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
1916     + </entry>
1917     +
1918     + <entry>
1919     + <base>LABEL_SERVICE_LIST</base>
1920     + <trans>tasuta teenus</trans>
1921     + </entry>
1922     +
1923     + <entry>
1924     + <base>SERV_LIST</base>
1925     + <trans>List</trans>
1926     + </entry>
1927     +
1928     + <entry>
1929     + <base>DESC_AVAILABLE_SERVICES</base>
1930     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
1931     + </entry>
1932     +
1933     + <entry>
1934     + <base>LABEL_AVAILABLE_SERVICES</base>
1935     + <trans>Saadolevad pakid</trans>
1936     + </entry>
1937     +
1938     +
1939     +</lexicon>
1940     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/xt_geoip
1941     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
1942     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
1943     @@ -0,0 +1,262 @@
1944     +<lexicon lang="fr">
1945     +
1946     + <entry>
1947     + <base>FORM_TITLE</base>
1948     + <trans><![CDATA[Administration XTABLES-ADDONS <br>GeoIP ]]></trans>
1949     + </entry>
1950     +
1951     + <entry>
1952     + <base>ERROR_UPDATING</base>
1953     + <trans>Il y a eu une erreur en mettant à jour xt_geoip.</trans>
1954     + </entry>
1955     +
1956     + <entry>
1957     + <base>SUCCESS</base>
1958     + <trans>Modifié avec succès... Maintenant le filtrage IP prend en compte les pays entrés.</trans>
1959     +
1960     + </entry>
1961     +
1962     + <entry>
1963     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
1964     + <trans><![CDATA[ <ul> <li>Le filtrage IP peut être activé ou désactivé avec le bouton approprié</li> <li>LEs codes de pays à banir peuvent être entrés dans le champs correspondant</li> <li>Une mise à jour immédiate de la table peut être demandée ici</li></ul> <p><i>Faites attention de ne pas bannir d'IP ou de régions qui sont nécessaire pour le bon fonctionnement de votre serveur !</i></p> ]]></trans>
1965     + </entry>
1966     +
1967     + <entry>
1968     + <base>NO_CHANGE</base>
1969     + <trans>Pas de changement... Pas de mise à jour !</trans>
1970     + </entry>
1971     +
1972     + <entry>
1973     + <base>LABEL_GEOIP_STATUS</base>
1974     + <trans>Filtrage GeoIP courant:</trans>
1975     + </entry>
1976     +
1977     + <entry>
1978     + <base>LABEL_GEOIP</base>
1979     + <trans>Filtrage GeoIP désiré :</trans>
1980     + </entry>
1981     +
1982     + <entry>
1983     + <base>DESC_GEOIP</base>
1984     + <trans>Le filtrage par pays d'origine doit-il être activé ?</trans>
1985     + </entry>
1986     +
1987     + <entry>
1988     + <base>ERROR_STATUS_GEOIP</base>
1989     + <trans><![CDATA[ <font color="red">Le filtrage GeoIP est <b>inactive</b></font> (iptables) ]]></trans>
1990     + </entry>
1991     +
1992     + <entry>
1993     + <base>LABEL_BADCOUNTRIES_STATUS</base>
1994     + <trans>Liste des pays actuellement bannis :</trans>
1995     + </entry>
1996     +
1997     + <entry>
1998     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
1999     + <trans>Le(s) code(s) de pays n'existe(nt) pas sur le serveur: {$listerr}</trans>
2000     + </entry>
2001     +
2002     + <entry>
2003     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
2004     + <trans>Country code(s) maximum reached: {$ctr}</trans>
2005     + </entry>
2006     +
2007     + <entry>
2008     + <base>LABEL_BADCOUNTRIES</base>
2009     + <trans>Nouveau code de pays à utiliser :</trans>
2010     + </entry>
2011     +
2012     + <entry>
2013     + <base>DESC_BADCOUNTRIES</base>
2014     + <trans>Liste des codes de pays (en majuscule et séparé par des virgules).</trans>
2015     + </entry>
2016     +
2017     + <entry>
2018     + <base>LABEL_DATE_UPDATE_STATUS</base>
2019     + <trans>Dernière mise à jour de la table GeoIP</trans>
2020     + </entry>
2021     +
2022     + <entry>
2023     + <base>LABEL_UPDATE</base>
2024     + <trans>Forcer la mise à jour de la table GeoIP</trans>
2025     + </entry>
2026     +
2027     + <entry>
2028     + <base>DESC_UPDATE</base>
2029     + <trans>La table GeoIP est mise à jour chaque semaine, mais vous pouvez...</trans>
2030     + </entry>
2031     +
2032     + <entry>
2033     + <base>IPT_LIST_DESCRIPTION</base>
2034     + <trans><![CDATA[<ul><li>Cliquer ici pour voir les statistiques des connexions refusées</li></ul> ]]></trans>
2035     + </entry>
2036     + <entry>
2037     + <base>IPT_LIST</base>
2038     + <trans>filtré</trans>
2039     + </entry>
2040     +
2041     + <entry>
2042     + <base>SSH_LIST_DESCRIPTION</base>
2043     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
2044     + </entry>
2045     + <entry>
2046     + <base>SSH_LIST</base>
2047     + <trans>Erreur de syntaxe</trans>
2048     + </entry>
2049     +
2050     + <entry>
2051     + <base>STATS_GENERATED</base>
2052     + <trans>Statistiques</trans>
2053     + </entry>
2054     +
2055     + <entry>
2056     + <base>END_OF_STATS</base>
2057     + <trans>Afficher les statistiques</trans>
2058     + </entry>
2059     +
2060     + <entry>
2061     + <base>INVALID_STATS_TYPE</base>
2062     + <trans>Statistiques relatives à l'expéditeur</trans>
2063     + </entry>
2064     +
2065     + <entry>
2066     + <base>STATS_DESCRIPTION</base>
2067     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
2068     + </entry>
2069     +
2070     + <entry>
2071     + <base>COUNTRY_LIST_DESCRIPTION</base>
2072     + <trans><![CDATA[<ul> <li>Cliquer ici pour avoir une<b>liste des codes pays disponibles</b></li> </ul> ]]></trans>
2073     + </entry>
2074     +
2075     + <entry>
2076     + <base>LABEL_COUNTRY_LIST</base>
2077     + <trans>Nouveau code de pays à utiliser :</trans>
2078     + </entry>
2079     + <entry>
2080     + <base>COUNTRY_LIST</base>
2081     + <trans>Code source</trans>
2082     + </entry>
2083     +
2084     + <entry>
2085     + <base>CNTRY_LIST</base>
2086     + <trans>Liste</trans>
2087     + </entry>
2088     +
2089     + <entry>
2090     + <base>END_OF_CODES</base>
2091     + <trans>Fin des résultats.</trans>
2092     + </entry>
2093     +
2094     + <entry>
2095     + <base>SERVICE_DESCRIPTION</base>
2096     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
2097     + </entry>
2098     +
2099     + <entry>
2100     + <base>LABEL_SERVICE</base>
2101     + <trans>Service</trans>
2102     + </entry>
2103     +
2104     + <entry>
2105     + <base>PER_SERVICE_GEOIP</base>
2106     + <trans>Service</trans>
2107     + </entry>
2108     +
2109     + <entry>
2110     + <base>ADD_SERVICE</base>
2111     + <trans>Ajouter ou modifier un enregistrement.</trans>
2112     + </entry>
2113     +
2114     + <entry>
2115     + <base>ADD_DESC</base>
2116     + <trans>You are choosing a particular country filtering for this service</trans>
2117     + </entry>
2118     +
2119     + <entry>
2120     + <base>REMOVE_SERVICE</base>
2121     + <trans>Delete a per service filtering</trans>
2122     + </entry>
2123     +
2124     + <entry>
2125     + <base>REMOVE_DESC</base>
2126     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
2127     + </entry>
2128     +
2129     + <entry>
2130     + <base>SERV_NOT_BAN</base>
2131     + <trans>non filtré</trans>
2132     + </entry>
2133     +
2134     + <entry>
2135     + <base>NO_SERVICES</base>
2136     + <trans>Services DNS</trans>
2137     + </entry>
2138     +
2139     + <entry>
2140     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
2141     + <trans>Nouveau code de pays à utiliser :</trans>
2142     + </entry>
2143     +
2144     + <entry>
2145     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
2146     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
2147     + </entry>
2148     +
2149     + <entry>
2150     + <base>BADCOUNTRIES</base>
2151     + <trans>Listes noires</trans>
2152     + </entry>
2153     +
2154     + <entry>
2155     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
2156     + <trans>Too many countries chosen: {$ctr}</trans>
2157     + </entry>
2158     +
2159     + <entry>
2160     + <base>LABEL_REVERSE_MATCH</base>
2161     + <trans>Refuser les courriels</trans>
2162     + </entry>
2163     +
2164     + <entry>
2165     + <base>DESC_REVERSE_MATCH</base>
2166     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
2167     + </entry>
2168     +
2169     + <entry>
2170     + <base>LABEL_OTHERS</base>
2171     + <trans>General filter only for services without rules</trans>
2172     + </entry>
2173     +
2174     + <entry>
2175     + <base>DESC_OTHERS</base>
2176     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
2177     + </entry>
2178     +
2179     + <entry>
2180     + <base>SERVICE_LIST_DESCRIPTION</base>
2181     + <trans><![CDATA[<ul> <li>Cliquer ici pour avoir une<b>liste des codes pays disponibles</b></li> </ul> ]]></trans>
2182     + </entry>
2183     +
2184     + <entry>
2185     + <base>LABEL_SERVICE_LIST</base>
2186     + <trans>Service</trans>
2187     + </entry>
2188     +
2189     + <entry>
2190     + <base>SERV_LIST</base>
2191     + <trans>Liste</trans>
2192     + </entry>
2193     +
2194     + <entry>
2195     + <base>DESC_AVAILABLE_SERVICES</base>
2196     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
2197     + </entry>
2198     +
2199     + <entry>
2200     + <base>LABEL_AVAILABLE_SERVICES</base>
2201     + <trans>Paquetages disponibles</trans>
2202     + </entry>
2203     +
2204     +
2205     +</lexicon>
2206     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/he/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/he/etc/e-smith/web/functions/xt_geoip
2207     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/he/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
2208     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/he/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
2209     @@ -0,0 +1,262 @@
2210     +<lexicon lang="he">
2211     +
2212     + <entry>
2213     + <base>FORM_TITLE</base>
2214     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
2215     + </entry>
2216     +
2217     + <entry>
2218     + <base>ERROR_UPDATING</base>
2219     + <trans>There was an error while updating xt_geoip.</trans>
2220     + </entry>
2221     +
2222     + <entry>
2223     + <base>SUCCESS</base>
2224     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
2225     +
2226     + </entry>
2227     +
2228     + <entry>
2229     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
2230     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
2231     + </entry>
2232     +
2233     + <entry>
2234     + <base>NO_CHANGE</base>
2235     + <trans>No change... no update !</trans>
2236     + </entry>
2237     +
2238     + <entry>
2239     + <base>LABEL_GEOIP_STATUS</base>
2240     + <trans>Current GEOIP filtering :</trans>
2241     + </entry>
2242     +
2243     + <entry>
2244     + <base>LABEL_GEOIP</base>
2245     + <trans>GEOIP filtering desired :</trans>
2246     + </entry>
2247     +
2248     + <entry>
2249     + <base>DESC_GEOIP</base>
2250     + <trans>Should filtering by country of origin be activated ?</trans>
2251     + </entry>
2252     +
2253     + <entry>
2254     + <base>ERROR_STATUS_GEOIP</base>
2255     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
2256     + </entry>
2257     +
2258     + <entry>
2259     + <base>LABEL_BADCOUNTRIES_STATUS</base>
2260     + <trans>Current list of banished country codes :</trans>
2261     + </entry>
2262     +
2263     + <entry>
2264     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
2265     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
2266     + </entry>
2267     +
2268     + <entry>
2269     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
2270     + <trans>Country code(s) maximum reached: {$ctr}</trans>
2271     + </entry>
2272     +
2273     + <entry>
2274     + <base>LABEL_BADCOUNTRIES</base>
2275     + <trans>New country codes to be used :</trans>
2276     + </entry>
2277     +
2278     + <entry>
2279     + <base>DESC_BADCOUNTRIES</base>
2280     + <trans>List of country codes (uppercase et comma-separated).</trans>
2281     + </entry>
2282     +
2283     + <entry>
2284     + <base>LABEL_DATE_UPDATE_STATUS</base>
2285     + <trans>Last update of GeoIP table :</trans>
2286     + </entry>
2287     +
2288     + <entry>
2289     + <base>LABEL_UPDATE</base>
2290     + <trans>Force the update of GeoIP table :</trans>
2291     + </entry>
2292     +
2293     + <entry>
2294     + <base>DESC_UPDATE</base>
2295     + <trans>GeoIP table is updated every week, but you can ...</trans>
2296     + </entry>
2297     +
2298     + <entry>
2299     + <base>IPT_LIST_DESCRIPTION</base>
2300     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
2301     + </entry>
2302     + <entry>
2303     + <base>IPT_LIST</base>
2304     + <trans>Filtered</trans>
2305     + </entry>
2306     +
2307     + <entry>
2308     + <base>SSH_LIST_DESCRIPTION</base>
2309     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
2310     + </entry>
2311     + <entry>
2312     + <base>SSH_LIST</base>
2313     + <trans>SSH errors</trans>
2314     + </entry>
2315     +
2316     + <entry>
2317     + <base>STATS_GENERATED</base>
2318     + <trans>Statistics generated</trans>
2319     + </entry>
2320     +
2321     + <entry>
2322     + <base>END_OF_STATS</base>
2323     + <trans>הצג סטטיסטיקות</trans>
2324     + </entry>
2325     +
2326     + <entry>
2327     + <base>INVALID_STATS_TYPE</base>
2328     + <trans>סטטיסטיקת שולחים</trans>
2329     + </entry>
2330     +
2331     + <entry>
2332     + <base>STATS_DESCRIPTION</base>
2333     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
2334     + </entry>
2335     +
2336     + <entry>
2337     + <base>COUNTRY_LIST_DESCRIPTION</base>
2338     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
2339     + </entry>
2340     +
2341     + <entry>
2342     + <base>LABEL_COUNTRY_LIST</base>
2343     + <trans>Country codes :</trans>
2344     + </entry>
2345     + <entry>
2346     + <base>COUNTRY_LIST</base>
2347     + <trans>Country codes</trans>
2348     + </entry>
2349     +
2350     + <entry>
2351     + <base>CNTRY_LIST</base>
2352     + <trans>List</trans>
2353     + </entry>
2354     +
2355     + <entry>
2356     + <base>END_OF_CODES</base>
2357     + <trans>סוף הדוח</trans>
2358     + </entry>
2359     +
2360     + <entry>
2361     + <base>SERVICE_DESCRIPTION</base>
2362     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
2363     + </entry>
2364     +
2365     + <entry>
2366     + <base>LABEL_SERVICE</base>
2367     + <trans>שם מערכת:</trans>
2368     + </entry>
2369     +
2370     + <entry>
2371     + <base>PER_SERVICE_GEOIP</base>
2372     + <trans>שם מערכת:</trans>
2373     + </entry>
2374     +
2375     + <entry>
2376     + <base>ADD_SERVICE</base>
2377     + <trans>Add or modify a per service filtering</trans>
2378     + </entry>
2379     +
2380     + <entry>
2381     + <base>ADD_DESC</base>
2382     + <trans>You are choosing a particular country filtering for this service</trans>
2383     + </entry>
2384     +
2385     + <entry>
2386     + <base>REMOVE_SERVICE</base>
2387     + <trans>Delete a per service filtering</trans>
2388     + </entry>
2389     +
2390     + <entry>
2391     + <base>REMOVE_DESC</base>
2392     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
2393     + </entry>
2394     +
2395     + <entry>
2396     + <base>SERV_NOT_BAN</base>
2397     + <trans>Unfiltered service.</trans>
2398     + </entry>
2399     +
2400     + <entry>
2401     + <base>NO_SERVICES</base>
2402     + <trans>No services.</trans>
2403     + </entry>
2404     +
2405     + <entry>
2406     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
2407     + <trans>List of rejected country codes for the service :</trans>
2408     + </entry>
2409     +
2410     + <entry>
2411     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
2412     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
2413     + </entry>
2414     +
2415     + <entry>
2416     + <base>BADCOUNTRIES</base>
2417     + <trans>Blacklist</trans>
2418     + </entry>
2419     +
2420     + <entry>
2421     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
2422     + <trans>Too many countries chosen: {$ctr}</trans>
2423     + </entry>
2424     +
2425     + <entry>
2426     + <base>LABEL_REVERSE_MATCH</base>
2427     + <trans>דחיה</trans>
2428     + </entry>
2429     +
2430     + <entry>
2431     + <base>DESC_REVERSE_MATCH</base>
2432     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
2433     + </entry>
2434     +
2435     + <entry>
2436     + <base>LABEL_OTHERS</base>
2437     + <trans>General filter only for services without rules</trans>
2438     + </entry>
2439     +
2440     + <entry>
2441     + <base>DESC_OTHERS</base>
2442     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
2443     + </entry>
2444     +
2445     + <entry>
2446     + <base>SERVICE_LIST_DESCRIPTION</base>
2447     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
2448     + </entry>
2449     +
2450     + <entry>
2451     + <base>LABEL_SERVICE_LIST</base>
2452     + <trans>שם מערכת:</trans>
2453     + </entry>
2454     +
2455     + <entry>
2456     + <base>SERV_LIST</base>
2457     + <trans>List</trans>
2458     + </entry>
2459     +
2460     + <entry>
2461     + <base>DESC_AVAILABLE_SERVICES</base>
2462     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
2463     + </entry>
2464     +
2465     + <entry>
2466     + <base>LABEL_AVAILABLE_SERVICES</base>
2467     + <trans>שם מערכת:</trans>
2468     + </entry>
2469     +
2470     +
2471     +</lexicon>
2472     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/xt_geoip
2473     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
2474     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
2475     @@ -0,0 +1,262 @@
2476     +<lexicon lang="hu">
2477     +
2478     + <entry>
2479     + <base>FORM_TITLE</base>
2480     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
2481     + </entry>
2482     +
2483     + <entry>
2484     + <base>ERROR_UPDATING</base>
2485     + <trans>There was an error while updating xt_geoip.</trans>
2486     + </entry>
2487     +
2488     + <entry>
2489     + <base>SUCCESS</base>
2490     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
2491     +
2492     + </entry>
2493     +
2494     + <entry>
2495     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
2496     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
2497     + </entry>
2498     +
2499     + <entry>
2500     + <base>NO_CHANGE</base>
2501     + <trans>No change... no update !</trans>
2502     + </entry>
2503     +
2504     + <entry>
2505     + <base>LABEL_GEOIP_STATUS</base>
2506     + <trans>Current GEOIP filtering :</trans>
2507     + </entry>
2508     +
2509     + <entry>
2510     + <base>LABEL_GEOIP</base>
2511     + <trans>GEOIP filtering desired :</trans>
2512     + </entry>
2513     +
2514     + <entry>
2515     + <base>DESC_GEOIP</base>
2516     + <trans>Should filtering by country of origin be activated ?</trans>
2517     + </entry>
2518     +
2519     + <entry>
2520     + <base>ERROR_STATUS_GEOIP</base>
2521     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
2522     + </entry>
2523     +
2524     + <entry>
2525     + <base>LABEL_BADCOUNTRIES_STATUS</base>
2526     + <trans>Current list of banished country codes :</trans>
2527     + </entry>
2528     +
2529     + <entry>
2530     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
2531     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
2532     + </entry>
2533     +
2534     + <entry>
2535     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
2536     + <trans>Country code(s) maximum reached: {$ctr}</trans>
2537     + </entry>
2538     +
2539     + <entry>
2540     + <base>LABEL_BADCOUNTRIES</base>
2541     + <trans>New country codes to be used :</trans>
2542     + </entry>
2543     +
2544     + <entry>
2545     + <base>DESC_BADCOUNTRIES</base>
2546     + <trans>List of country codes (uppercase et comma-separated).</trans>
2547     + </entry>
2548     +
2549     + <entry>
2550     + <base>LABEL_DATE_UPDATE_STATUS</base>
2551     + <trans>Last update of GeoIP table :</trans>
2552     + </entry>
2553     +
2554     + <entry>
2555     + <base>LABEL_UPDATE</base>
2556     + <trans>Force the update of GeoIP table :</trans>
2557     + </entry>
2558     +
2559     + <entry>
2560     + <base>DESC_UPDATE</base>
2561     + <trans>GeoIP table is updated every week, but you can ...</trans>
2562     + </entry>
2563     +
2564     + <entry>
2565     + <base>IPT_LIST_DESCRIPTION</base>
2566     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
2567     + </entry>
2568     + <entry>
2569     + <base>IPT_LIST</base>
2570     + <trans>Szűrő</trans>
2571     + </entry>
2572     +
2573     + <entry>
2574     + <base>SSH_LIST_DESCRIPTION</base>
2575     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
2576     + </entry>
2577     + <entry>
2578     + <base>SSH_LIST</base>
2579     + <trans>Szintaktikai hiba</trans>
2580     + </entry>
2581     +
2582     + <entry>
2583     + <base>STATS_GENERATED</base>
2584     + <trans>Statisztika</trans>
2585     + </entry>
2586     +
2587     + <entry>
2588     + <base>END_OF_STATS</base>
2589     + <trans>Statisztika mutatása</trans>
2590     + </entry>
2591     +
2592     + <entry>
2593     + <base>INVALID_STATS_TYPE</base>
2594     + <trans>Feladó statisztikák</trans>
2595     + </entry>
2596     +
2597     + <entry>
2598     + <base>STATS_DESCRIPTION</base>
2599     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
2600     + </entry>
2601     +
2602     + <entry>
2603     + <base>COUNTRY_LIST_DESCRIPTION</base>
2604     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
2605     + </entry>
2606     +
2607     + <entry>
2608     + <base>LABEL_COUNTRY_LIST</base>
2609     + <trans>Forráskód</trans>
2610     + </entry>
2611     + <entry>
2612     + <base>COUNTRY_LIST</base>
2613     + <trans>Forráskód</trans>
2614     + </entry>
2615     +
2616     + <entry>
2617     + <base>CNTRY_LIST</base>
2618     + <trans>List</trans>
2619     + </entry>
2620     +
2621     + <entry>
2622     + <base>END_OF_CODES</base>
2623     + <trans>Keresési eredmények vége.</trans>
2624     + </entry>
2625     +
2626     + <entry>
2627     + <base>SERVICE_DESCRIPTION</base>
2628     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
2629     + </entry>
2630     +
2631     + <entry>
2632     + <base>LABEL_SERVICE</base>
2633     + <trans>Service name :</trans>
2634     + </entry>
2635     +
2636     + <entry>
2637     + <base>PER_SERVICE_GEOIP</base>
2638     + <trans>ingyenes szolgáltatás</trans>
2639     + </entry>
2640     +
2641     + <entry>
2642     + <base>ADD_SERVICE</base>
2643     + <trans>Add or modify a per service filtering</trans>
2644     + </entry>
2645     +
2646     + <entry>
2647     + <base>ADD_DESC</base>
2648     + <trans>You are choosing a particular country filtering for this service</trans>
2649     + </entry>
2650     +
2651     + <entry>
2652     + <base>REMOVE_SERVICE</base>
2653     + <trans>Delete a per service filtering</trans>
2654     + </entry>
2655     +
2656     + <entry>
2657     + <base>REMOVE_DESC</base>
2658     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
2659     + </entry>
2660     +
2661     + <entry>
2662     + <base>SERV_NOT_BAN</base>
2663     + <trans>ingyenes szolgáltatás</trans>
2664     + </entry>
2665     +
2666     + <entry>
2667     + <base>NO_SERVICES</base>
2668     + <trans>ingyenes szolgáltatás</trans>
2669     + </entry>
2670     +
2671     + <entry>
2672     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
2673     + <trans>List of rejected country codes for the service :</trans>
2674     + </entry>
2675     +
2676     + <entry>
2677     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
2678     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
2679     + </entry>
2680     +
2681     + <entry>
2682     + <base>BADCOUNTRIES</base>
2683     + <trans>Blacklist</trans>
2684     + </entry>
2685     +
2686     + <entry>
2687     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
2688     + <trans>Too many countries chosen: {$ctr}</trans>
2689     + </entry>
2690     +
2691     + <entry>
2692     + <base>LABEL_REVERSE_MATCH</base>
2693     + <trans>Eldobás</trans>
2694     + </entry>
2695     +
2696     + <entry>
2697     + <base>DESC_REVERSE_MATCH</base>
2698     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
2699     + </entry>
2700     +
2701     + <entry>
2702     + <base>LABEL_OTHERS</base>
2703     + <trans>General filter only for services without rules</trans>
2704     + </entry>
2705     +
2706     + <entry>
2707     + <base>DESC_OTHERS</base>
2708     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
2709     + </entry>
2710     +
2711     + <entry>
2712     + <base>SERVICE_LIST_DESCRIPTION</base>
2713     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
2714     + </entry>
2715     +
2716     + <entry>
2717     + <base>LABEL_SERVICE_LIST</base>
2718     + <trans>ingyenes szolgáltatás</trans>
2719     + </entry>
2720     +
2721     + <entry>
2722     + <base>SERV_LIST</base>
2723     + <trans>List</trans>
2724     + </entry>
2725     +
2726     + <entry>
2727     + <base>DESC_AVAILABLE_SERVICES</base>
2728     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
2729     + </entry>
2730     +
2731     + <entry>
2732     + <base>LABEL_AVAILABLE_SERVICES</base>
2733     + <trans>Elérhető szoftvercsomagok</trans>
2734     + </entry>
2735     +
2736     +
2737     +</lexicon>
2738     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/id/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/id/etc/e-smith/web/functions/xt_geoip
2739     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/id/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
2740     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/id/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
2741     @@ -0,0 +1,262 @@
2742     +<lexicon lang="id">
2743     +
2744     + <entry>
2745     + <base>FORM_TITLE</base>
2746     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
2747     + </entry>
2748     +
2749     + <entry>
2750     + <base>ERROR_UPDATING</base>
2751     + <trans>There was an error while updating xt_geoip.</trans>
2752     + </entry>
2753     +
2754     + <entry>
2755     + <base>SUCCESS</base>
2756     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
2757     +
2758     + </entry>
2759     +
2760     + <entry>
2761     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
2762     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
2763     + </entry>
2764     +
2765     + <entry>
2766     + <base>NO_CHANGE</base>
2767     + <trans>No change... no update !</trans>
2768     + </entry>
2769     +
2770     + <entry>
2771     + <base>LABEL_GEOIP_STATUS</base>
2772     + <trans>Current GEOIP filtering :</trans>
2773     + </entry>
2774     +
2775     + <entry>
2776     + <base>LABEL_GEOIP</base>
2777     + <trans>GEOIP filtering desired :</trans>
2778     + </entry>
2779     +
2780     + <entry>
2781     + <base>DESC_GEOIP</base>
2782     + <trans>Should filtering by country of origin be activated ?</trans>
2783     + </entry>
2784     +
2785     + <entry>
2786     + <base>ERROR_STATUS_GEOIP</base>
2787     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
2788     + </entry>
2789     +
2790     + <entry>
2791     + <base>LABEL_BADCOUNTRIES_STATUS</base>
2792     + <trans>Current list of banished country codes :</trans>
2793     + </entry>
2794     +
2795     + <entry>
2796     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
2797     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
2798     + </entry>
2799     +
2800     + <entry>
2801     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
2802     + <trans>Country code(s) maximum reached: {$ctr}</trans>
2803     + </entry>
2804     +
2805     + <entry>
2806     + <base>LABEL_BADCOUNTRIES</base>
2807     + <trans>New country codes to be used :</trans>
2808     + </entry>
2809     +
2810     + <entry>
2811     + <base>DESC_BADCOUNTRIES</base>
2812     + <trans>List of country codes (uppercase et comma-separated).</trans>
2813     + </entry>
2814     +
2815     + <entry>
2816     + <base>LABEL_DATE_UPDATE_STATUS</base>
2817     + <trans>Last update of GeoIP table :</trans>
2818     + </entry>
2819     +
2820     + <entry>
2821     + <base>LABEL_UPDATE</base>
2822     + <trans>Force the update of GeoIP table :</trans>
2823     + </entry>
2824     +
2825     + <entry>
2826     + <base>DESC_UPDATE</base>
2827     + <trans>GeoIP table is updated every week, but you can ...</trans>
2828     + </entry>
2829     +
2830     + <entry>
2831     + <base>IPT_LIST_DESCRIPTION</base>
2832     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
2833     + </entry>
2834     + <entry>
2835     + <base>IPT_LIST</base>
2836     + <trans>Filtered</trans>
2837     + </entry>
2838     +
2839     + <entry>
2840     + <base>SSH_LIST_DESCRIPTION</base>
2841     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
2842     + </entry>
2843     + <entry>
2844     + <base>SSH_LIST</base>
2845     + <trans>SSH errors</trans>
2846     + </entry>
2847     +
2848     + <entry>
2849     + <base>STATS_GENERATED</base>
2850     + <trans>Statistics generated</trans>
2851     + </entry>
2852     +
2853     + <entry>
2854     + <base>END_OF_STATS</base>
2855     + <trans>Perlihatkan Statistik</trans>
2856     + </entry>
2857     +
2858     + <entry>
2859     + <base>INVALID_STATS_TYPE</base>
2860     + <trans>Statistik pengirim</trans>
2861     + </entry>
2862     +
2863     + <entry>
2864     + <base>STATS_DESCRIPTION</base>
2865     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
2866     + </entry>
2867     +
2868     + <entry>
2869     + <base>COUNTRY_LIST_DESCRIPTION</base>
2870     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
2871     + </entry>
2872     +
2873     + <entry>
2874     + <base>LABEL_COUNTRY_LIST</base>
2875     + <trans>Country codes :</trans>
2876     + </entry>
2877     + <entry>
2878     + <base>COUNTRY_LIST</base>
2879     + <trans>Country codes</trans>
2880     + </entry>
2881     +
2882     + <entry>
2883     + <base>CNTRY_LIST</base>
2884     + <trans>List</trans>
2885     + </entry>
2886     +
2887     + <entry>
2888     + <base>END_OF_CODES</base>
2889     + <trans>Akhir dari laporan</trans>
2890     + </entry>
2891     +
2892     + <entry>
2893     + <base>SERVICE_DESCRIPTION</base>
2894     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
2895     + </entry>
2896     +
2897     + <entry>
2898     + <base>LABEL_SERVICE</base>
2899     + <trans>Service name :</trans>
2900     + </entry>
2901     +
2902     + <entry>
2903     + <base>PER_SERVICE_GEOIP</base>
2904     + <trans>layanan bebas</trans>
2905     + </entry>
2906     +
2907     + <entry>
2908     + <base>ADD_SERVICE</base>
2909     + <trans>Add or modify a per service filtering</trans>
2910     + </entry>
2911     +
2912     + <entry>
2913     + <base>ADD_DESC</base>
2914     + <trans>You are choosing a particular country filtering for this service</trans>
2915     + </entry>
2916     +
2917     + <entry>
2918     + <base>REMOVE_SERVICE</base>
2919     + <trans>Delete a per service filtering</trans>
2920     + </entry>
2921     +
2922     + <entry>
2923     + <base>REMOVE_DESC</base>
2924     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
2925     + </entry>
2926     +
2927     + <entry>
2928     + <base>SERV_NOT_BAN</base>
2929     + <trans>layanan bebas</trans>
2930     + </entry>
2931     +
2932     + <entry>
2933     + <base>NO_SERVICES</base>
2934     + <trans>layanan bebas</trans>
2935     + </entry>
2936     +
2937     + <entry>
2938     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
2939     + <trans>List of rejected country codes for the service :</trans>
2940     + </entry>
2941     +
2942     + <entry>
2943     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
2944     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
2945     + </entry>
2946     +
2947     + <entry>
2948     + <base>BADCOUNTRIES</base>
2949     + <trans>Blacklist</trans>
2950     + </entry>
2951     +
2952     + <entry>
2953     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
2954     + <trans>Too many countries chosen: {$ctr}</trans>
2955     + </entry>
2956     +
2957     + <entry>
2958     + <base>LABEL_REVERSE_MATCH</base>
2959     + <trans>Tolak</trans>
2960     + </entry>
2961     +
2962     + <entry>
2963     + <base>DESC_REVERSE_MATCH</base>
2964     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
2965     + </entry>
2966     +
2967     + <entry>
2968     + <base>LABEL_OTHERS</base>
2969     + <trans>General filter only for services without rules</trans>
2970     + </entry>
2971     +
2972     + <entry>
2973     + <base>DESC_OTHERS</base>
2974     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
2975     + </entry>
2976     +
2977     + <entry>
2978     + <base>SERVICE_LIST_DESCRIPTION</base>
2979     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
2980     + </entry>
2981     +
2982     + <entry>
2983     + <base>LABEL_SERVICE_LIST</base>
2984     + <trans>layanan bebas</trans>
2985     + </entry>
2986     +
2987     + <entry>
2988     + <base>SERV_LIST</base>
2989     + <trans>List</trans>
2990     + </entry>
2991     +
2992     + <entry>
2993     + <base>DESC_AVAILABLE_SERVICES</base>
2994     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
2995     + </entry>
2996     +
2997     + <entry>
2998     + <base>LABEL_AVAILABLE_SERVICES</base>
2999     + <trans>Paket tersedia</trans>
3000     + </entry>
3001     +
3002     +
3003     +</lexicon>
3004     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/it/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/it/etc/e-smith/web/functions/xt_geoip
3005     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/it/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
3006     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/it/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
3007     @@ -0,0 +1,262 @@
3008     +<lexicon lang="it">
3009     +
3010     + <entry>
3011     + <base>FORM_TITLE</base>
3012     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
3013     + </entry>
3014     +
3015     + <entry>
3016     + <base>ERROR_UPDATING</base>
3017     + <trans>There was an error while updating xt_geoip.</trans>
3018     + </entry>
3019     +
3020     + <entry>
3021     + <base>SUCCESS</base>
3022     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
3023     +
3024     + </entry>
3025     +
3026     + <entry>
3027     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
3028     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
3029     + </entry>
3030     +
3031     + <entry>
3032     + <base>NO_CHANGE</base>
3033     + <trans>No change... no update !</trans>
3034     + </entry>
3035     +
3036     + <entry>
3037     + <base>LABEL_GEOIP_STATUS</base>
3038     + <trans>Current GEOIP filtering :</trans>
3039     + </entry>
3040     +
3041     + <entry>
3042     + <base>LABEL_GEOIP</base>
3043     + <trans>GEOIP filtering desired :</trans>
3044     + </entry>
3045     +
3046     + <entry>
3047     + <base>DESC_GEOIP</base>
3048     + <trans>Should filtering by country of origin be activated ?</trans>
3049     + </entry>
3050     +
3051     + <entry>
3052     + <base>ERROR_STATUS_GEOIP</base>
3053     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
3054     + </entry>
3055     +
3056     + <entry>
3057     + <base>LABEL_BADCOUNTRIES_STATUS</base>
3058     + <trans>Current list of banished country codes :</trans>
3059     + </entry>
3060     +
3061     + <entry>
3062     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
3063     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
3064     + </entry>
3065     +
3066     + <entry>
3067     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
3068     + <trans>Country code(s) maximum reached: {$ctr}</trans>
3069     + </entry>
3070     +
3071     + <entry>
3072     + <base>LABEL_BADCOUNTRIES</base>
3073     + <trans>New country codes to be used :</trans>
3074     + </entry>
3075     +
3076     + <entry>
3077     + <base>DESC_BADCOUNTRIES</base>
3078     + <trans>List of country codes (uppercase et comma-separated).</trans>
3079     + </entry>
3080     +
3081     + <entry>
3082     + <base>LABEL_DATE_UPDATE_STATUS</base>
3083     + <trans>Last update of GeoIP table :</trans>
3084     + </entry>
3085     +
3086     + <entry>
3087     + <base>LABEL_UPDATE</base>
3088     + <trans>Force the update of GeoIP table :</trans>
3089     + </entry>
3090     +
3091     + <entry>
3092     + <base>DESC_UPDATE</base>
3093     + <trans>GeoIP table is updated every week, but you can ...</trans>
3094     + </entry>
3095     +
3096     + <entry>
3097     + <base>IPT_LIST_DESCRIPTION</base>
3098     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
3099     + </entry>
3100     + <entry>
3101     + <base>IPT_LIST</base>
3102     + <trans>Filtro</trans>
3103     + </entry>
3104     +
3105     + <entry>
3106     + <base>SSH_LIST_DESCRIPTION</base>
3107     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
3108     + </entry>
3109     + <entry>
3110     + <base>SSH_LIST</base>
3111     + <trans>Errore di sintassi</trans>
3112     + </entry>
3113     +
3114     + <entry>
3115     + <base>STATS_GENERATED</base>
3116     + <trans>Statistica</trans>
3117     + </entry>
3118     +
3119     + <entry>
3120     + <base>END_OF_STATS</base>
3121     + <trans>Mostra statistiche</trans>
3122     + </entry>
3123     +
3124     + <entry>
3125     + <base>INVALID_STATS_TYPE</base>
3126     + <trans>Statistiche mittenti</trans>
3127     + </entry>
3128     +
3129     + <entry>
3130     + <base>STATS_DESCRIPTION</base>
3131     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
3132     + </entry>
3133     +
3134     + <entry>
3135     + <base>COUNTRY_LIST_DESCRIPTION</base>
3136     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
3137     + </entry>
3138     +
3139     + <entry>
3140     + <base>LABEL_COUNTRY_LIST</base>
3141     + <trans>Codice sorgente</trans>
3142     + </entry>
3143     + <entry>
3144     + <base>COUNTRY_LIST</base>
3145     + <trans>Codice sorgente</trans>
3146     + </entry>
3147     +
3148     + <entry>
3149     + <base>CNTRY_LIST</base>
3150     + <trans>elenco TODO</trans>
3151     + </entry>
3152     +
3153     + <entry>
3154     + <base>END_OF_CODES</base>
3155     + <trans>Fine dei risultati.</trans>
3156     + </entry>
3157     +
3158     + <entry>
3159     + <base>SERVICE_DESCRIPTION</base>
3160     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
3161     + </entry>
3162     +
3163     + <entry>
3164     + <base>LABEL_SERVICE</base>
3165     + <trans>Stato servizio</trans>
3166     + </entry>
3167     +
3168     + <entry>
3169     + <base>PER_SERVICE_GEOIP</base>
3170     + <trans>Stato servizio</trans>
3171     + </entry>
3172     +
3173     + <entry>
3174     + <base>ADD_SERVICE</base>
3175     + <trans>Crea o modifica una condivisione</trans>
3176     + </entry>
3177     +
3178     + <entry>
3179     + <base>ADD_DESC</base>
3180     + <trans>You are choosing a particular country filtering for this service</trans>
3181     + </entry>
3182     +
3183     + <entry>
3184     + <base>REMOVE_SERVICE</base>
3185     + <trans>Delete a per service filtering</trans>
3186     + </entry>
3187     +
3188     + <entry>
3189     + <base>REMOVE_DESC</base>
3190     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
3191     + </entry>
3192     +
3193     + <entry>
3194     + <base>SERV_NOT_BAN</base>
3195     + <trans>servizio gratuito</trans>
3196     + </entry>
3197     +
3198     + <entry>
3199     + <base>NO_SERVICES</base>
3200     + <trans>Servizi Jabber</trans>
3201     + </entry>
3202     +
3203     + <entry>
3204     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
3205     + <trans>List of rejected country codes for the service :</trans>
3206     + </entry>
3207     +
3208     + <entry>
3209     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
3210     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
3211     + </entry>
3212     +
3213     + <entry>
3214     + <base>BADCOUNTRIES</base>
3215     + <trans>elenco attività</trans>
3216     + </entry>
3217     +
3218     + <entry>
3219     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
3220     + <trans>Too many countries chosen: {$ctr}</trans>
3221     + </entry>
3222     +
3223     + <entry>
3224     + <base>LABEL_REVERSE_MATCH</base>
3225     + <trans>Rifiuta</trans>
3226     + </entry>
3227     +
3228     + <entry>
3229     + <base>DESC_REVERSE_MATCH</base>
3230     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
3231     + </entry>
3232     +
3233     + <entry>
3234     + <base>LABEL_OTHERS</base>
3235     + <trans>General filter only for services without rules</trans>
3236     + </entry>
3237     +
3238     + <entry>
3239     + <base>DESC_OTHERS</base>
3240     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
3241     + </entry>
3242     +
3243     + <entry>
3244     + <base>SERVICE_LIST_DESCRIPTION</base>
3245     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
3246     + </entry>
3247     +
3248     + <entry>
3249     + <base>LABEL_SERVICE_LIST</base>
3250     + <trans>Stato servizio</trans>
3251     + </entry>
3252     +
3253     + <entry>
3254     + <base>SERV_LIST</base>
3255     + <trans>elenco TODO</trans>
3256     + </entry>
3257     +
3258     + <entry>
3259     + <base>DESC_AVAILABLE_SERVICES</base>
3260     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
3261     + </entry>
3262     +
3263     + <entry>
3264     + <base>LABEL_AVAILABLE_SERVICES</base>
3265     + <trans>Pacchetti disponibili</trans>
3266     + </entry>
3267     +
3268     +
3269     +</lexicon>
3270     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/ja/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/ja/etc/e-smith/web/functions/xt_geoip
3271     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/ja/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
3272     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/ja/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
3273     @@ -0,0 +1,262 @@
3274     +<lexicon lang="ja">
3275     +
3276     + <entry>
3277     + <base>FORM_TITLE</base>
3278     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
3279     + </entry>
3280     +
3281     + <entry>
3282     + <base>ERROR_UPDATING</base>
3283     + <trans>There was an error while updating xt_geoip.</trans>
3284     + </entry>
3285     +
3286     + <entry>
3287     + <base>SUCCESS</base>
3288     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
3289     +
3290     + </entry>
3291     +
3292     + <entry>
3293     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
3294     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
3295     + </entry>
3296     +
3297     + <entry>
3298     + <base>NO_CHANGE</base>
3299     + <trans>No change... no update !</trans>
3300     + </entry>
3301     +
3302     + <entry>
3303     + <base>LABEL_GEOIP_STATUS</base>
3304     + <trans>Current GEOIP filtering :</trans>
3305     + </entry>
3306     +
3307     + <entry>
3308     + <base>LABEL_GEOIP</base>
3309     + <trans>GEOIP filtering desired :</trans>
3310     + </entry>
3311     +
3312     + <entry>
3313     + <base>DESC_GEOIP</base>
3314     + <trans>Should filtering by country of origin be activated ?</trans>
3315     + </entry>
3316     +
3317     + <entry>
3318     + <base>ERROR_STATUS_GEOIP</base>
3319     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
3320     + </entry>
3321     +
3322     + <entry>
3323     + <base>LABEL_BADCOUNTRIES_STATUS</base>
3324     + <trans>Current list of banished country codes :</trans>
3325     + </entry>
3326     +
3327     + <entry>
3328     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
3329     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
3330     + </entry>
3331     +
3332     + <entry>
3333     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
3334     + <trans>Country code(s) maximum reached: {$ctr}</trans>
3335     + </entry>
3336     +
3337     + <entry>
3338     + <base>LABEL_BADCOUNTRIES</base>
3339     + <trans>New country codes to be used :</trans>
3340     + </entry>
3341     +
3342     + <entry>
3343     + <base>DESC_BADCOUNTRIES</base>
3344     + <trans>List of country codes (uppercase et comma-separated).</trans>
3345     + </entry>
3346     +
3347     + <entry>
3348     + <base>LABEL_DATE_UPDATE_STATUS</base>
3349     + <trans>Last update of GeoIP table :</trans>
3350     + </entry>
3351     +
3352     + <entry>
3353     + <base>LABEL_UPDATE</base>
3354     + <trans>Force the update of GeoIP table :</trans>
3355     + </entry>
3356     +
3357     + <entry>
3358     + <base>DESC_UPDATE</base>
3359     + <trans>GeoIP table is updated every week, but you can ...</trans>
3360     + </entry>
3361     +
3362     + <entry>
3363     + <base>IPT_LIST_DESCRIPTION</base>
3364     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
3365     + </entry>
3366     + <entry>
3367     + <base>IPT_LIST</base>
3368     + <trans>フィルター</trans>
3369     + </entry>
3370     +
3371     + <entry>
3372     + <base>SSH_LIST_DESCRIPTION</base>
3373     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
3374     + </entry>
3375     + <entry>
3376     + <base>SSH_LIST</base>
3377     + <trans>構文エラー</trans>
3378     + </entry>
3379     +
3380     + <entry>
3381     + <base>STATS_GENERATED</base>
3382     + <trans>統計</trans>
3383     + </entry>
3384     +
3385     + <entry>
3386     + <base>END_OF_STATS</base>
3387     + <trans>統計表示</trans>
3388     + </entry>
3389     +
3390     + <entry>
3391     + <base>INVALID_STATS_TYPE</base>
3392     + <trans>Invalid type of statistics</trans>
3393     + </entry>
3394     +
3395     + <entry>
3396     + <base>STATS_DESCRIPTION</base>
3397     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
3398     + </entry>
3399     +
3400     + <entry>
3401     + <base>COUNTRY_LIST_DESCRIPTION</base>
3402     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
3403     + </entry>
3404     +
3405     + <entry>
3406     + <base>LABEL_COUNTRY_LIST</base>
3407     + <trans>ソースコード</trans>
3408     + </entry>
3409     + <entry>
3410     + <base>COUNTRY_LIST</base>
3411     + <trans>ソースコード</trans>
3412     + </entry>
3413     +
3414     + <entry>
3415     + <base>CNTRY_LIST</base>
3416     + <trans>やること一覧</trans>
3417     + </entry>
3418     +
3419     + <entry>
3420     + <base>END_OF_CODES</base>
3421     + <trans>検索結果は以上です。</trans>
3422     + </entry>
3423     +
3424     + <entry>
3425     + <base>SERVICE_DESCRIPTION</base>
3426     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
3427     + </entry>
3428     +
3429     + <entry>
3430     + <base>LABEL_SERVICE</base>
3431     + <trans>Service name :</trans>
3432     + </entry>
3433     +
3434     + <entry>
3435     + <base>PER_SERVICE_GEOIP</base>
3436     + <trans>装置</trans>
3437     + </entry>
3438     +
3439     + <entry>
3440     + <base>ADD_SERVICE</base>
3441     + <trans>Add or modify a per service filtering</trans>
3442     + </entry>
3443     +
3444     + <entry>
3445     + <base>ADD_DESC</base>
3446     + <trans>You are choosing a particular country filtering for this service</trans>
3447     + </entry>
3448     +
3449     + <entry>
3450     + <base>REMOVE_SERVICE</base>
3451     + <trans>Delete a per service filtering</trans>
3452     + </entry>
3453     +
3454     + <entry>
3455     + <base>REMOVE_DESC</base>
3456     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
3457     + </entry>
3458     +
3459     + <entry>
3460     + <base>SERV_NOT_BAN</base>
3461     + <trans>Unfiltered service.</trans>
3462     + </entry>
3463     +
3464     + <entry>
3465     + <base>NO_SERVICES</base>
3466     + <trans>No services.</trans>
3467     + </entry>
3468     +
3469     + <entry>
3470     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
3471     + <trans>List of rejected country codes for the service :</trans>
3472     + </entry>
3473     +
3474     + <entry>
3475     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
3476     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
3477     + </entry>
3478     +
3479     + <entry>
3480     + <base>BADCOUNTRIES</base>
3481     + <trans>Blacklist</trans>
3482     + </entry>
3483     +
3484     + <entry>
3485     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
3486     + <trans>Too many countries chosen: {$ctr}</trans>
3487     + </entry>
3488     +
3489     + <entry>
3490     + <base>LABEL_REVERSE_MATCH</base>
3491     + <trans>拒絶</trans>
3492     + </entry>
3493     +
3494     + <entry>
3495     + <base>DESC_REVERSE_MATCH</base>
3496     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
3497     + </entry>
3498     +
3499     + <entry>
3500     + <base>LABEL_OTHERS</base>
3501     + <trans>General filter only for services without rules</trans>
3502     + </entry>
3503     +
3504     + <entry>
3505     + <base>DESC_OTHERS</base>
3506     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
3507     + </entry>
3508     +
3509     + <entry>
3510     + <base>SERVICE_LIST_DESCRIPTION</base>
3511     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
3512     + </entry>
3513     +
3514     + <entry>
3515     + <base>LABEL_SERVICE_LIST</base>
3516     + <trans>装置</trans>
3517     + </entry>
3518     +
3519     + <entry>
3520     + <base>SERV_LIST</base>
3521     + <trans>やること一覧</trans>
3522     + </entry>
3523     +
3524     + <entry>
3525     + <base>DESC_AVAILABLE_SERVICES</base>
3526     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
3527     + </entry>
3528     +
3529     + <entry>
3530     + <base>LABEL_AVAILABLE_SERVICES</base>
3531     + <trans>装置</trans>
3532     + </entry>
3533     +
3534     +
3535     +</lexicon>
3536     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/nb/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/nb/etc/e-smith/web/functions/xt_geoip
3537     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/nb/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
3538     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/nb/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
3539     @@ -0,0 +1,262 @@
3540     +<lexicon lang="nb">
3541     +
3542     + <entry>
3543     + <base>FORM_TITLE</base>
3544     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
3545     + </entry>
3546     +
3547     + <entry>
3548     + <base>ERROR_UPDATING</base>
3549     + <trans>There was an error while updating xt_geoip.</trans>
3550     + </entry>
3551     +
3552     + <entry>
3553     + <base>SUCCESS</base>
3554     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
3555     +
3556     + </entry>
3557     +
3558     + <entry>
3559     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
3560     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
3561     + </entry>
3562     +
3563     + <entry>
3564     + <base>NO_CHANGE</base>
3565     + <trans>No change... no update !</trans>
3566     + </entry>
3567     +
3568     + <entry>
3569     + <base>LABEL_GEOIP_STATUS</base>
3570     + <trans>Current GEOIP filtering :</trans>
3571     + </entry>
3572     +
3573     + <entry>
3574     + <base>LABEL_GEOIP</base>
3575     + <trans>GEOIP filtering desired :</trans>
3576     + </entry>
3577     +
3578     + <entry>
3579     + <base>DESC_GEOIP</base>
3580     + <trans>Should filtering by country of origin be activated ?</trans>
3581     + </entry>
3582     +
3583     + <entry>
3584     + <base>ERROR_STATUS_GEOIP</base>
3585     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
3586     + </entry>
3587     +
3588     + <entry>
3589     + <base>LABEL_BADCOUNTRIES_STATUS</base>
3590     + <trans>Current list of banished country codes :</trans>
3591     + </entry>
3592     +
3593     + <entry>
3594     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
3595     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
3596     + </entry>
3597     +
3598     + <entry>
3599     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
3600     + <trans>Country code(s) maximum reached: {$ctr}</trans>
3601     + </entry>
3602     +
3603     + <entry>
3604     + <base>LABEL_BADCOUNTRIES</base>
3605     + <trans>New country codes to be used :</trans>
3606     + </entry>
3607     +
3608     + <entry>
3609     + <base>DESC_BADCOUNTRIES</base>
3610     + <trans>List of country codes (uppercase et comma-separated).</trans>
3611     + </entry>
3612     +
3613     + <entry>
3614     + <base>LABEL_DATE_UPDATE_STATUS</base>
3615     + <trans>Last update of GeoIP table :</trans>
3616     + </entry>
3617     +
3618     + <entry>
3619     + <base>LABEL_UPDATE</base>
3620     + <trans>Force the update of GeoIP table :</trans>
3621     + </entry>
3622     +
3623     + <entry>
3624     + <base>DESC_UPDATE</base>
3625     + <trans>GeoIP table is updated every week, but you can ...</trans>
3626     + </entry>
3627     +
3628     + <entry>
3629     + <base>IPT_LIST_DESCRIPTION</base>
3630     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
3631     + </entry>
3632     + <entry>
3633     + <base>IPT_LIST</base>
3634     + <trans>Filtrer</trans>
3635     + </entry>
3636     +
3637     + <entry>
3638     + <base>SSH_LIST_DESCRIPTION</base>
3639     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
3640     + </entry>
3641     + <entry>
3642     + <base>SSH_LIST</base>
3643     + <trans>Syntaksfeil</trans>
3644     + </entry>
3645     +
3646     + <entry>
3647     + <base>STATS_GENERATED</base>
3648     + <trans>Statistikk</trans>
3649     + </entry>
3650     +
3651     + <entry>
3652     + <base>END_OF_STATS</base>
3653     + <trans>Vis statistikk</trans>
3654     + </entry>
3655     +
3656     + <entry>
3657     + <base>INVALID_STATS_TYPE</base>
3658     + <trans>Avsender statistikk</trans>
3659     + </entry>
3660     +
3661     + <entry>
3662     + <base>STATS_DESCRIPTION</base>
3663     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
3664     + </entry>
3665     +
3666     + <entry>
3667     + <base>COUNTRY_LIST_DESCRIPTION</base>
3668     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
3669     + </entry>
3670     +
3671     + <entry>
3672     + <base>LABEL_COUNTRY_LIST</base>
3673     + <trans>Kildekode</trans>
3674     + </entry>
3675     + <entry>
3676     + <base>COUNTRY_LIST</base>
3677     + <trans>Kildekode</trans>
3678     + </entry>
3679     +
3680     + <entry>
3681     + <base>CNTRY_LIST</base>
3682     + <trans>Oppgaveliste</trans>
3683     + </entry>
3684     +
3685     + <entry>
3686     + <base>END_OF_CODES</base>
3687     + <trans>Slutten av resultater.</trans>
3688     + </entry>
3689     +
3690     + <entry>
3691     + <base>SERVICE_DESCRIPTION</base>
3692     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
3693     + </entry>
3694     +
3695     + <entry>
3696     + <base>LABEL_SERVICE</base>
3697     + <trans>Service name :</trans>
3698     + </entry>
3699     +
3700     + <entry>
3701     + <base>PER_SERVICE_GEOIP</base>
3702     + <trans>gratis service</trans>
3703     + </entry>
3704     +
3705     + <entry>
3706     + <base>ADD_SERVICE</base>
3707     + <trans>Add or modify a per service filtering</trans>
3708     + </entry>
3709     +
3710     + <entry>
3711     + <base>ADD_DESC</base>
3712     + <trans>You are choosing a particular country filtering for this service</trans>
3713     + </entry>
3714     +
3715     + <entry>
3716     + <base>REMOVE_SERVICE</base>
3717     + <trans>Delete a per service filtering</trans>
3718     + </entry>
3719     +
3720     + <entry>
3721     + <base>REMOVE_DESC</base>
3722     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
3723     + </entry>
3724     +
3725     + <entry>
3726     + <base>SERV_NOT_BAN</base>
3727     + <trans>gratis service</trans>
3728     + </entry>
3729     +
3730     + <entry>
3731     + <base>NO_SERVICES</base>
3732     + <trans>gratis service</trans>
3733     + </entry>
3734     +
3735     + <entry>
3736     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
3737     + <trans>List of rejected country codes for the service :</trans>
3738     + </entry>
3739     +
3740     + <entry>
3741     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
3742     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
3743     + </entry>
3744     +
3745     + <entry>
3746     + <base>BADCOUNTRIES</base>
3747     + <trans>Blacklist</trans>
3748     + </entry>
3749     +
3750     + <entry>
3751     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
3752     + <trans>Too many countries chosen: {$ctr}</trans>
3753     + </entry>
3754     +
3755     + <entry>
3756     + <base>LABEL_REVERSE_MATCH</base>
3757     + <trans>Avvis</trans>
3758     + </entry>
3759     +
3760     + <entry>
3761     + <base>DESC_REVERSE_MATCH</base>
3762     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
3763     + </entry>
3764     +
3765     + <entry>
3766     + <base>LABEL_OTHERS</base>
3767     + <trans>General filter only for services without rules</trans>
3768     + </entry>
3769     +
3770     + <entry>
3771     + <base>DESC_OTHERS</base>
3772     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
3773     + </entry>
3774     +
3775     + <entry>
3776     + <base>SERVICE_LIST_DESCRIPTION</base>
3777     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
3778     + </entry>
3779     +
3780     + <entry>
3781     + <base>LABEL_SERVICE_LIST</base>
3782     + <trans>gratis service</trans>
3783     + </entry>
3784     +
3785     + <entry>
3786     + <base>SERV_LIST</base>
3787     + <trans>Oppgaveliste</trans>
3788     + </entry>
3789     +
3790     + <entry>
3791     + <base>DESC_AVAILABLE_SERVICES</base>
3792     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
3793     + </entry>
3794     +
3795     + <entry>
3796     + <base>LABEL_AVAILABLE_SERVICES</base>
3797     + <trans>Tilgjenglige pakker</trans>
3798     + </entry>
3799     +
3800     +
3801     +</lexicon>
3802     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/xt_geoip
3803     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
3804     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
3805     @@ -0,0 +1,262 @@
3806     +<lexicon lang="nl">
3807     +
3808     + <entry>
3809     + <base>FORM_TITLE</base>
3810     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
3811     + </entry>
3812     +
3813     + <entry>
3814     + <base>ERROR_UPDATING</base>
3815     + <trans>There was an error while updating xt_geoip.</trans>
3816     + </entry>
3817     +
3818     + <entry>
3819     + <base>SUCCESS</base>
3820     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
3821     +
3822     + </entry>
3823     +
3824     + <entry>
3825     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
3826     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
3827     + </entry>
3828     +
3829     + <entry>
3830     + <base>NO_CHANGE</base>
3831     + <trans>No change... no update !</trans>
3832     + </entry>
3833     +
3834     + <entry>
3835     + <base>LABEL_GEOIP_STATUS</base>
3836     + <trans>Current GEOIP filtering :</trans>
3837     + </entry>
3838     +
3839     + <entry>
3840     + <base>LABEL_GEOIP</base>
3841     + <trans>GEOIP filtering desired :</trans>
3842     + </entry>
3843     +
3844     + <entry>
3845     + <base>DESC_GEOIP</base>
3846     + <trans>Should filtering by country of origin be activated ?</trans>
3847     + </entry>
3848     +
3849     + <entry>
3850     + <base>ERROR_STATUS_GEOIP</base>
3851     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
3852     + </entry>
3853     +
3854     + <entry>
3855     + <base>LABEL_BADCOUNTRIES_STATUS</base>
3856     + <trans>Current list of banished country codes :</trans>
3857     + </entry>
3858     +
3859     + <entry>
3860     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
3861     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
3862     + </entry>
3863     +
3864     + <entry>
3865     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
3866     + <trans>Country code(s) maximum reached: {$ctr}</trans>
3867     + </entry>
3868     +
3869     + <entry>
3870     + <base>LABEL_BADCOUNTRIES</base>
3871     + <trans>New country codes to be used :</trans>
3872     + </entry>
3873     +
3874     + <entry>
3875     + <base>DESC_BADCOUNTRIES</base>
3876     + <trans>List of country codes (uppercase et comma-separated).</trans>
3877     + </entry>
3878     +
3879     + <entry>
3880     + <base>LABEL_DATE_UPDATE_STATUS</base>
3881     + <trans>Last update of GeoIP table :</trans>
3882     + </entry>
3883     +
3884     + <entry>
3885     + <base>LABEL_UPDATE</base>
3886     + <trans>Force the update of GeoIP table :</trans>
3887     + </entry>
3888     +
3889     + <entry>
3890     + <base>DESC_UPDATE</base>
3891     + <trans>GeoIP table is updated every week, but you can ...</trans>
3892     + </entry>
3893     +
3894     + <entry>
3895     + <base>IPT_LIST_DESCRIPTION</base>
3896     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
3897     + </entry>
3898     + <entry>
3899     + <base>IPT_LIST</base>
3900     + <trans>gefiltert</trans>
3901     + </entry>
3902     +
3903     + <entry>
3904     + <base>SSH_LIST_DESCRIPTION</base>
3905     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
3906     + </entry>
3907     + <entry>
3908     + <base>SSH_LIST</base>
3909     + <trans>Syntaxfout</trans>
3910     + </entry>
3911     +
3912     + <entry>
3913     + <base>STATS_GENERATED</base>
3914     + <trans>Statistieken</trans>
3915     + </entry>
3916     +
3917     + <entry>
3918     + <base>END_OF_STATS</base>
3919     + <trans>Statistieken tonen</trans>
3920     + </entry>
3921     +
3922     + <entry>
3923     + <base>INVALID_STATS_TYPE</base>
3924     + <trans>Verzend statistieken</trans>
3925     + </entry>
3926     +
3927     + <entry>
3928     + <base>STATS_DESCRIPTION</base>
3929     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
3930     + </entry>
3931     +
3932     + <entry>
3933     + <base>COUNTRY_LIST_DESCRIPTION</base>
3934     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
3935     + </entry>
3936     +
3937     + <entry>
3938     + <base>LABEL_COUNTRY_LIST</base>
3939     + <trans>Broncode</trans>
3940     + </entry>
3941     + <entry>
3942     + <base>COUNTRY_LIST</base>
3943     + <trans>Broncode</trans>
3944     + </entry>
3945     +
3946     + <entry>
3947     + <base>CNTRY_LIST</base>
3948     + <trans>Lijst</trans>
3949     + </entry>
3950     +
3951     + <entry>
3952     + <base>END_OF_CODES</base>
3953     + <trans>Einde resultaten.</trans>
3954     + </entry>
3955     +
3956     + <entry>
3957     + <base>SERVICE_DESCRIPTION</base>
3958     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
3959     + </entry>
3960     +
3961     + <entry>
3962     + <base>LABEL_SERVICE</base>
3963     + <trans>Dienst</trans>
3964     + </entry>
3965     +
3966     + <entry>
3967     + <base>PER_SERVICE_GEOIP</base>
3968     + <trans>Dienst</trans>
3969     + </entry>
3970     +
3971     + <entry>
3972     + <base>ADD_SERVICE</base>
3973     + <trans>Voeg toe of wijzig een instelling.</trans>
3974     + </entry>
3975     +
3976     + <entry>
3977     + <base>ADD_DESC</base>
3978     + <trans>You are choosing a particular country filtering for this service</trans>
3979     + </entry>
3980     +
3981     + <entry>
3982     + <base>REMOVE_SERVICE</base>
3983     + <trans>Delete a per service filtering</trans>
3984     + </entry>
3985     +
3986     + <entry>
3987     + <base>REMOVE_DESC</base>
3988     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
3989     + </entry>
3990     +
3991     + <entry>
3992     + <base>SERV_NOT_BAN</base>
3993     + <trans>ongefiltert</trans>
3994     + </entry>
3995     +
3996     + <entry>
3997     + <base>NO_SERVICES</base>
3998     + <trans>DNS diensten</trans>
3999     + </entry>
4000     +
4001     + <entry>
4002     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
4003     + <trans>List of rejected country codes for the service :</trans>
4004     + </entry>
4005     +
4006     + <entry>
4007     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
4008     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
4009     + </entry>
4010     +
4011     + <entry>
4012     + <base>BADCOUNTRIES</base>
4013     + <trans>Zwartelijst</trans>
4014     + </entry>
4015     +
4016     + <entry>
4017     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
4018     + <trans>Too many countries chosen: {$ctr}</trans>
4019     + </entry>
4020     +
4021     + <entry>
4022     + <base>LABEL_REVERSE_MATCH</base>
4023     + <trans>Weigeren</trans>
4024     + </entry>
4025     +
4026     + <entry>
4027     + <base>DESC_REVERSE_MATCH</base>
4028     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
4029     + </entry>
4030     +
4031     + <entry>
4032     + <base>LABEL_OTHERS</base>
4033     + <trans>General filter only for services without rules</trans>
4034     + </entry>
4035     +
4036     + <entry>
4037     + <base>DESC_OTHERS</base>
4038     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
4039     + </entry>
4040     +
4041     + <entry>
4042     + <base>SERVICE_LIST_DESCRIPTION</base>
4043     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
4044     + </entry>
4045     +
4046     + <entry>
4047     + <base>LABEL_SERVICE_LIST</base>
4048     + <trans>Dienst</trans>
4049     + </entry>
4050     +
4051     + <entry>
4052     + <base>SERV_LIST</base>
4053     + <trans>Lijst</trans>
4054     + </entry>
4055     +
4056     + <entry>
4057     + <base>DESC_AVAILABLE_SERVICES</base>
4058     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
4059     + </entry>
4060     +
4061     + <entry>
4062     + <base>LABEL_AVAILABLE_SERVICES</base>
4063     + <trans>Beschikbare pakketten</trans>
4064     + </entry>
4065     +
4066     +
4067     +</lexicon>
4068     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/xt_geoip
4069     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
4070     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
4071     @@ -0,0 +1,262 @@
4072     +<lexicon lang="pl">
4073     +
4074     + <entry>
4075     + <base>FORM_TITLE</base>
4076     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
4077     + </entry>
4078     +
4079     + <entry>
4080     + <base>ERROR_UPDATING</base>
4081     + <trans>There was an error while updating xt_geoip.</trans>
4082     + </entry>
4083     +
4084     + <entry>
4085     + <base>SUCCESS</base>
4086     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
4087     +
4088     + </entry>
4089     +
4090     + <entry>
4091     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
4092     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
4093     + </entry>
4094     +
4095     + <entry>
4096     + <base>NO_CHANGE</base>
4097     + <trans>No change... no update !</trans>
4098     + </entry>
4099     +
4100     + <entry>
4101     + <base>LABEL_GEOIP_STATUS</base>
4102     + <trans>Current GEOIP filtering :</trans>
4103     + </entry>
4104     +
4105     + <entry>
4106     + <base>LABEL_GEOIP</base>
4107     + <trans>GEOIP filtering desired :</trans>
4108     + </entry>
4109     +
4110     + <entry>
4111     + <base>DESC_GEOIP</base>
4112     + <trans>Should filtering by country of origin be activated ?</trans>
4113     + </entry>
4114     +
4115     + <entry>
4116     + <base>ERROR_STATUS_GEOIP</base>
4117     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
4118     + </entry>
4119     +
4120     + <entry>
4121     + <base>LABEL_BADCOUNTRIES_STATUS</base>
4122     + <trans>Current list of banished country codes :</trans>
4123     + </entry>
4124     +
4125     + <entry>
4126     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
4127     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
4128     + </entry>
4129     +
4130     + <entry>
4131     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
4132     + <trans>Country code(s) maximum reached: {$ctr}</trans>
4133     + </entry>
4134     +
4135     + <entry>
4136     + <base>LABEL_BADCOUNTRIES</base>
4137     + <trans>New country codes to be used :</trans>
4138     + </entry>
4139     +
4140     + <entry>
4141     + <base>DESC_BADCOUNTRIES</base>
4142     + <trans>List of country codes (uppercase et comma-separated).</trans>
4143     + </entry>
4144     +
4145     + <entry>
4146     + <base>LABEL_DATE_UPDATE_STATUS</base>
4147     + <trans>Last update of GeoIP table :</trans>
4148     + </entry>
4149     +
4150     + <entry>
4151     + <base>LABEL_UPDATE</base>
4152     + <trans>Force the update of GeoIP table :</trans>
4153     + </entry>
4154     +
4155     + <entry>
4156     + <base>DESC_UPDATE</base>
4157     + <trans>GeoIP table is updated every week, but you can ...</trans>
4158     + </entry>
4159     +
4160     + <entry>
4161     + <base>IPT_LIST_DESCRIPTION</base>
4162     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
4163     + </entry>
4164     + <entry>
4165     + <base>IPT_LIST</base>
4166     + <trans>Filtr</trans>
4167     + </entry>
4168     +
4169     + <entry>
4170     + <base>SSH_LIST_DESCRIPTION</base>
4171     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
4172     + </entry>
4173     + <entry>
4174     + <base>SSH_LIST</base>
4175     + <trans>Błąd składniowy</trans>
4176     + </entry>
4177     +
4178     + <entry>
4179     + <base>STATS_GENERATED</base>
4180     + <trans>Statystyka</trans>
4181     + </entry>
4182     +
4183     + <entry>
4184     + <base>END_OF_STATS</base>
4185     + <trans>Pokaż statystyki</trans>
4186     + </entry>
4187     +
4188     + <entry>
4189     + <base>INVALID_STATS_TYPE</base>
4190     + <trans>Podstawowe statystyki</trans>
4191     + </entry>
4192     +
4193     + <entry>
4194     + <base>STATS_DESCRIPTION</base>
4195     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
4196     + </entry>
4197     +
4198     + <entry>
4199     + <base>COUNTRY_LIST_DESCRIPTION</base>
4200     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
4201     + </entry>
4202     +
4203     + <entry>
4204     + <base>LABEL_COUNTRY_LIST</base>
4205     + <trans>Kod źródłowy</trans>
4206     + </entry>
4207     + <entry>
4208     + <base>COUNTRY_LIST</base>
4209     + <trans>Kod źródłowy</trans>
4210     + </entry>
4211     +
4212     + <entry>
4213     + <base>CNTRY_LIST</base>
4214     + <trans>Lista zadań</trans>
4215     + </entry>
4216     +
4217     + <entry>
4218     + <base>END_OF_CODES</base>
4219     + <trans>Koniec wyników.</trans>
4220     + </entry>
4221     +
4222     + <entry>
4223     + <base>SERVICE_DESCRIPTION</base>
4224     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
4225     + </entry>
4226     +
4227     + <entry>
4228     + <base>LABEL_SERVICE</base>
4229     + <trans>Serwery nazw (DNS)</trans>
4230     + </entry>
4231     +
4232     + <entry>
4233     + <base>PER_SERVICE_GEOIP</base>
4234     + <trans>Urządzenie</trans>
4235     + </entry>
4236     +
4237     + <entry>
4238     + <base>ADD_SERVICE</base>
4239     + <trans>Add or modify a per service filtering</trans>
4240     + </entry>
4241     +
4242     + <entry>
4243     + <base>ADD_DESC</base>
4244     + <trans>You are choosing a particular country filtering for this service</trans>
4245     + </entry>
4246     +
4247     + <entry>
4248     + <base>REMOVE_SERVICE</base>
4249     + <trans>Delete a per service filtering</trans>
4250     + </entry>
4251     +
4252     + <entry>
4253     + <base>REMOVE_DESC</base>
4254     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
4255     + </entry>
4256     +
4257     + <entry>
4258     + <base>SERV_NOT_BAN</base>
4259     + <trans>Unfiltered service.</trans>
4260     + </entry>
4261     +
4262     + <entry>
4263     + <base>NO_SERVICES</base>
4264     + <trans>No services.</trans>
4265     + </entry>
4266     +
4267     + <entry>
4268     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
4269     + <trans>List of rejected country codes for the service :</trans>
4270     + </entry>
4271     +
4272     + <entry>
4273     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
4274     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
4275     + </entry>
4276     +
4277     + <entry>
4278     + <base>BADCOUNTRIES</base>
4279     + <trans>Blacklist</trans>
4280     + </entry>
4281     +
4282     + <entry>
4283     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
4284     + <trans>Too many countries chosen: {$ctr}</trans>
4285     + </entry>
4286     +
4287     + <entry>
4288     + <base>LABEL_REVERSE_MATCH</base>
4289     + <trans>Odrzuć</trans>
4290     + </entry>
4291     +
4292     + <entry>
4293     + <base>DESC_REVERSE_MATCH</base>
4294     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
4295     + </entry>
4296     +
4297     + <entry>
4298     + <base>LABEL_OTHERS</base>
4299     + <trans>General filter only for services without rules</trans>
4300     + </entry>
4301     +
4302     + <entry>
4303     + <base>DESC_OTHERS</base>
4304     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
4305     + </entry>
4306     +
4307     + <entry>
4308     + <base>SERVICE_LIST_DESCRIPTION</base>
4309     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
4310     + </entry>
4311     +
4312     + <entry>
4313     + <base>LABEL_SERVICE_LIST</base>
4314     + <trans>Serwery nazw (DNS)</trans>
4315     + </entry>
4316     +
4317     + <entry>
4318     + <base>SERV_LIST</base>
4319     + <trans>Lista zadań</trans>
4320     + </entry>
4321     +
4322     + <entry>
4323     + <base>DESC_AVAILABLE_SERVICES</base>
4324     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
4325     + </entry>
4326     +
4327     + <entry>
4328     + <base>LABEL_AVAILABLE_SERVICES</base>
4329     + <trans>Dostępne paczki</trans>
4330     + </entry>
4331     +
4332     +
4333     +</lexicon>
4334     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/pt/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/pt/etc/e-smith/web/functions/xt_geoip
4335     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/pt/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
4336     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/pt/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
4337     @@ -0,0 +1,262 @@
4338     +<lexicon lang="pt">
4339     +
4340     + <entry>
4341     + <base>FORM_TITLE</base>
4342     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
4343     + </entry>
4344     +
4345     + <entry>
4346     + <base>ERROR_UPDATING</base>
4347     + <trans>There was an error while updating xt_geoip.</trans>
4348     + </entry>
4349     +
4350     + <entry>
4351     + <base>SUCCESS</base>
4352     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
4353     +
4354     + </entry>
4355     +
4356     + <entry>
4357     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
4358     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
4359     + </entry>
4360     +
4361     + <entry>
4362     + <base>NO_CHANGE</base>
4363     + <trans>No change... no update !</trans>
4364     + </entry>
4365     +
4366     + <entry>
4367     + <base>LABEL_GEOIP_STATUS</base>
4368     + <trans>Current GEOIP filtering :</trans>
4369     + </entry>
4370     +
4371     + <entry>
4372     + <base>LABEL_GEOIP</base>
4373     + <trans>GEOIP filtering desired :</trans>
4374     + </entry>
4375     +
4376     + <entry>
4377     + <base>DESC_GEOIP</base>
4378     + <trans>Should filtering by country of origin be activated ?</trans>
4379     + </entry>
4380     +
4381     + <entry>
4382     + <base>ERROR_STATUS_GEOIP</base>
4383     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
4384     + </entry>
4385     +
4386     + <entry>
4387     + <base>LABEL_BADCOUNTRIES_STATUS</base>
4388     + <trans>Current list of banished country codes :</trans>
4389     + </entry>
4390     +
4391     + <entry>
4392     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
4393     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
4394     + </entry>
4395     +
4396     + <entry>
4397     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
4398     + <trans>Country code(s) maximum reached: {$ctr}</trans>
4399     + </entry>
4400     +
4401     + <entry>
4402     + <base>LABEL_BADCOUNTRIES</base>
4403     + <trans>New country codes to be used :</trans>
4404     + </entry>
4405     +
4406     + <entry>
4407     + <base>DESC_BADCOUNTRIES</base>
4408     + <trans>List of country codes (uppercase et comma-separated).</trans>
4409     + </entry>
4410     +
4411     + <entry>
4412     + <base>LABEL_DATE_UPDATE_STATUS</base>
4413     + <trans>Last update of GeoIP table :</trans>
4414     + </entry>
4415     +
4416     + <entry>
4417     + <base>LABEL_UPDATE</base>
4418     + <trans>Force the update of GeoIP table :</trans>
4419     + </entry>
4420     +
4421     + <entry>
4422     + <base>DESC_UPDATE</base>
4423     + <trans>GeoIP table is updated every week, but you can ...</trans>
4424     + </entry>
4425     +
4426     + <entry>
4427     + <base>IPT_LIST_DESCRIPTION</base>
4428     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
4429     + </entry>
4430     + <entry>
4431     + <base>IPT_LIST</base>
4432     + <trans>Filtro</trans>
4433     + </entry>
4434     +
4435     + <entry>
4436     + <base>SSH_LIST_DESCRIPTION</base>
4437     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
4438     + </entry>
4439     + <entry>
4440     + <base>SSH_LIST</base>
4441     + <trans>Erro de sintaxe</trans>
4442     + </entry>
4443     +
4444     + <entry>
4445     + <base>STATS_GENERATED</base>
4446     + <trans>Estatísticas</trans>
4447     + </entry>
4448     +
4449     + <entry>
4450     + <base>END_OF_STATS</base>
4451     + <trans>Mostrar Estatísticas</trans>
4452     + </entry>
4453     +
4454     + <entry>
4455     + <base>INVALID_STATS_TYPE</base>
4456     + <trans>Enviar estatísticas</trans>
4457     + </entry>
4458     +
4459     + <entry>
4460     + <base>STATS_DESCRIPTION</base>
4461     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
4462     + </entry>
4463     +
4464     + <entry>
4465     + <base>COUNTRY_LIST_DESCRIPTION</base>
4466     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
4467     + </entry>
4468     +
4469     + <entry>
4470     + <base>LABEL_COUNTRY_LIST</base>
4471     + <trans>Código fonte</trans>
4472     + </entry>
4473     + <entry>
4474     + <base>COUNTRY_LIST</base>
4475     + <trans>Código fonte</trans>
4476     + </entry>
4477     +
4478     + <entry>
4479     + <base>CNTRY_LIST</base>
4480     + <trans>Lista A-Fazer</trans>
4481     + </entry>
4482     +
4483     + <entry>
4484     + <base>END_OF_CODES</base>
4485     + <trans>Fim dos resultados.</trans>
4486     + </entry>
4487     +
4488     + <entry>
4489     + <base>SERVICE_DESCRIPTION</base>
4490     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
4491     + </entry>
4492     +
4493     + <entry>
4494     + <base>LABEL_SERVICE</base>
4495     + <trans>Service name :</trans>
4496     + </entry>
4497     +
4498     + <entry>
4499     + <base>PER_SERVICE_GEOIP</base>
4500     + <trans>Serviços jabber</trans>
4501     + </entry>
4502     +
4503     + <entry>
4504     + <base>ADD_SERVICE</base>
4505     + <trans>Add or modify a per service filtering</trans>
4506     + </entry>
4507     +
4508     + <entry>
4509     + <base>ADD_DESC</base>
4510     + <trans>You are choosing a particular country filtering for this service</trans>
4511     + </entry>
4512     +
4513     + <entry>
4514     + <base>REMOVE_SERVICE</base>
4515     + <trans>Delete a per service filtering</trans>
4516     + </entry>
4517     +
4518     + <entry>
4519     + <base>REMOVE_DESC</base>
4520     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
4521     + </entry>
4522     +
4523     + <entry>
4524     + <base>SERV_NOT_BAN</base>
4525     + <trans>serviço grátis</trans>
4526     + </entry>
4527     +
4528     + <entry>
4529     + <base>NO_SERVICES</base>
4530     + <trans>Serviços jabber</trans>
4531     + </entry>
4532     +
4533     + <entry>
4534     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
4535     + <trans>List of rejected country codes for the service :</trans>
4536     + </entry>
4537     +
4538     + <entry>
4539     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
4540     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
4541     + </entry>
4542     +
4543     + <entry>
4544     + <base>BADCOUNTRIES</base>
4545     + <trans>Blacklist</trans>
4546     + </entry>
4547     +
4548     + <entry>
4549     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
4550     + <trans>Too many countries chosen: {$ctr}</trans>
4551     + </entry>
4552     +
4553     + <entry>
4554     + <base>LABEL_REVERSE_MATCH</base>
4555     + <trans>Retornar ao remetente</trans>
4556     + </entry>
4557     +
4558     + <entry>
4559     + <base>DESC_REVERSE_MATCH</base>
4560     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
4561     + </entry>
4562     +
4563     + <entry>
4564     + <base>LABEL_OTHERS</base>
4565     + <trans>General filter only for services without rules</trans>
4566     + </entry>
4567     +
4568     + <entry>
4569     + <base>DESC_OTHERS</base>
4570     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
4571     + </entry>
4572     +
4573     + <entry>
4574     + <base>SERVICE_LIST_DESCRIPTION</base>
4575     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
4576     + </entry>
4577     +
4578     + <entry>
4579     + <base>LABEL_SERVICE_LIST</base>
4580     + <trans>Serviços jabber</trans>
4581     + </entry>
4582     +
4583     + <entry>
4584     + <base>SERV_LIST</base>
4585     + <trans>Lista A-Fazer</trans>
4586     + </entry>
4587     +
4588     + <entry>
4589     + <base>DESC_AVAILABLE_SERVICES</base>
4590     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
4591     + </entry>
4592     +
4593     + <entry>
4594     + <base>LABEL_AVAILABLE_SERVICES</base>
4595     + <trans>Pacotes disponíveis</trans>
4596     + </entry>
4597     +
4598     +
4599     +</lexicon>
4600     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/xt_geoip
4601     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
4602     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
4603     @@ -0,0 +1,262 @@
4604     +<lexicon lang="pt-br">
4605     +
4606     + <entry>
4607     + <base>FORM_TITLE</base>
4608     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
4609     + </entry>
4610     +
4611     + <entry>
4612     + <base>ERROR_UPDATING</base>
4613     + <trans>There was an error while updating xt_geoip.</trans>
4614     + </entry>
4615     +
4616     + <entry>
4617     + <base>SUCCESS</base>
4618     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
4619     +
4620     + </entry>
4621     +
4622     + <entry>
4623     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
4624     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
4625     + </entry>
4626     +
4627     + <entry>
4628     + <base>NO_CHANGE</base>
4629     + <trans>No change... no update !</trans>
4630     + </entry>
4631     +
4632     + <entry>
4633     + <base>LABEL_GEOIP_STATUS</base>
4634     + <trans>Current GEOIP filtering :</trans>
4635     + </entry>
4636     +
4637     + <entry>
4638     + <base>LABEL_GEOIP</base>
4639     + <trans>GEOIP filtering desired :</trans>
4640     + </entry>
4641     +
4642     + <entry>
4643     + <base>DESC_GEOIP</base>
4644     + <trans>Should filtering by country of origin be activated ?</trans>
4645     + </entry>
4646     +
4647     + <entry>
4648     + <base>ERROR_STATUS_GEOIP</base>
4649     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
4650     + </entry>
4651     +
4652     + <entry>
4653     + <base>LABEL_BADCOUNTRIES_STATUS</base>
4654     + <trans>Current list of banished country codes :</trans>
4655     + </entry>
4656     +
4657     + <entry>
4658     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
4659     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
4660     + </entry>
4661     +
4662     + <entry>
4663     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
4664     + <trans>Country code(s) maximum reached: {$ctr}</trans>
4665     + </entry>
4666     +
4667     + <entry>
4668     + <base>LABEL_BADCOUNTRIES</base>
4669     + <trans>New country codes to be used :</trans>
4670     + </entry>
4671     +
4672     + <entry>
4673     + <base>DESC_BADCOUNTRIES</base>
4674     + <trans>List of country codes (uppercase et comma-separated).</trans>
4675     + </entry>
4676     +
4677     + <entry>
4678     + <base>LABEL_DATE_UPDATE_STATUS</base>
4679     + <trans>Last update of GeoIP table :</trans>
4680     + </entry>
4681     +
4682     + <entry>
4683     + <base>LABEL_UPDATE</base>
4684     + <trans>Force the update of GeoIP table :</trans>
4685     + </entry>
4686     +
4687     + <entry>
4688     + <base>DESC_UPDATE</base>
4689     + <trans>GeoIP table is updated every week, but you can ...</trans>
4690     + </entry>
4691     +
4692     + <entry>
4693     + <base>IPT_LIST_DESCRIPTION</base>
4694     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
4695     + </entry>
4696     + <entry>
4697     + <base>IPT_LIST</base>
4698     + <trans>filtrado</trans>
4699     + </entry>
4700     +
4701     + <entry>
4702     + <base>SSH_LIST_DESCRIPTION</base>
4703     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
4704     + </entry>
4705     + <entry>
4706     + <base>SSH_LIST</base>
4707     + <trans>Erro de sintaxe</trans>
4708     + </entry>
4709     +
4710     + <entry>
4711     + <base>STATS_GENERATED</base>
4712     + <trans>Estatísticas</trans>
4713     + </entry>
4714     +
4715     + <entry>
4716     + <base>END_OF_STATS</base>
4717     + <trans>Mostrar estatísticas</trans>
4718     + </entry>
4719     +
4720     + <entry>
4721     + <base>INVALID_STATS_TYPE</base>
4722     + <trans>Estatísticas de remetente</trans>
4723     + </entry>
4724     +
4725     + <entry>
4726     + <base>STATS_DESCRIPTION</base>
4727     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
4728     + </entry>
4729     +
4730     + <entry>
4731     + <base>COUNTRY_LIST_DESCRIPTION</base>
4732     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
4733     + </entry>
4734     +
4735     + <entry>
4736     + <base>LABEL_COUNTRY_LIST</base>
4737     + <trans>Código fonte</trans>
4738     + </entry>
4739     + <entry>
4740     + <base>COUNTRY_LIST</base>
4741     + <trans>Código fonte</trans>
4742     + </entry>
4743     +
4744     + <entry>
4745     + <base>CNTRY_LIST</base>
4746     + <trans>Lista</trans>
4747     + </entry>
4748     +
4749     + <entry>
4750     + <base>END_OF_CODES</base>
4751     + <trans>Fim dos resultados.</trans>
4752     + </entry>
4753     +
4754     + <entry>
4755     + <base>SERVICE_DESCRIPTION</base>
4756     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
4757     + </entry>
4758     +
4759     + <entry>
4760     + <base>LABEL_SERVICE</base>
4761     + <trans>Status do Serviço</trans>
4762     + </entry>
4763     +
4764     + <entry>
4765     + <base>PER_SERVICE_GEOIP</base>
4766     + <trans>Status do Serviço</trans>
4767     + </entry>
4768     +
4769     + <entry>
4770     + <base>ADD_SERVICE</base>
4771     + <trans>Adicionar ou modificar um registro.</trans>
4772     + </entry>
4773     +
4774     + <entry>
4775     + <base>ADD_DESC</base>
4776     + <trans>You are choosing a particular country filtering for this service</trans>
4777     + </entry>
4778     +
4779     + <entry>
4780     + <base>REMOVE_SERVICE</base>
4781     + <trans>Delete a per service filtering</trans>
4782     + </entry>
4783     +
4784     + <entry>
4785     + <base>REMOVE_DESC</base>
4786     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
4787     + </entry>
4788     +
4789     + <entry>
4790     + <base>SERV_NOT_BAN</base>
4791     + <trans>serviço grátis</trans>
4792     + </entry>
4793     +
4794     + <entry>
4795     + <base>NO_SERVICES</base>
4796     + <trans>Serviços jabber</trans>
4797     + </entry>
4798     +
4799     + <entry>
4800     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
4801     + <trans>List of rejected country codes for the service :</trans>
4802     + </entry>
4803     +
4804     + <entry>
4805     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
4806     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
4807     + </entry>
4808     +
4809     + <entry>
4810     + <base>BADCOUNTRIES</base>
4811     + <trans>Lista Negra</trans>
4812     + </entry>
4813     +
4814     + <entry>
4815     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
4816     + <trans>Too many countries chosen: {$ctr}</trans>
4817     + </entry>
4818     +
4819     + <entry>
4820     + <base>LABEL_REVERSE_MATCH</base>
4821     + <trans>Retornar ao remetente</trans>
4822     + </entry>
4823     +
4824     + <entry>
4825     + <base>DESC_REVERSE_MATCH</base>
4826     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
4827     + </entry>
4828     +
4829     + <entry>
4830     + <base>LABEL_OTHERS</base>
4831     + <trans>General filter only for services without rules</trans>
4832     + </entry>
4833     +
4834     + <entry>
4835     + <base>DESC_OTHERS</base>
4836     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
4837     + </entry>
4838     +
4839     + <entry>
4840     + <base>SERVICE_LIST_DESCRIPTION</base>
4841     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
4842     + </entry>
4843     +
4844     + <entry>
4845     + <base>LABEL_SERVICE_LIST</base>
4846     + <trans>Status do Serviço</trans>
4847     + </entry>
4848     +
4849     + <entry>
4850     + <base>SERV_LIST</base>
4851     + <trans>Lista</trans>
4852     + </entry>
4853     +
4854     + <entry>
4855     + <base>DESC_AVAILABLE_SERVICES</base>
4856     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
4857     + </entry>
4858     +
4859     + <entry>
4860     + <base>LABEL_AVAILABLE_SERVICES</base>
4861     + <trans>Pacotes disponíveis</trans>
4862     + </entry>
4863     +
4864     +
4865     +</lexicon>
4866     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/ro/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/ro/etc/e-smith/web/functions/xt_geoip
4867     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/ro/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
4868     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/ro/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
4869     @@ -0,0 +1,262 @@
4870     +<lexicon lang="ro">
4871     +
4872     + <entry>
4873     + <base>FORM_TITLE</base>
4874     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
4875     + </entry>
4876     +
4877     + <entry>
4878     + <base>ERROR_UPDATING</base>
4879     + <trans>There was an error while updating xt_geoip.</trans>
4880     + </entry>
4881     +
4882     + <entry>
4883     + <base>SUCCESS</base>
4884     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
4885     +
4886     + </entry>
4887     +
4888     + <entry>
4889     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
4890     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
4891     + </entry>
4892     +
4893     + <entry>
4894     + <base>NO_CHANGE</base>
4895     + <trans>No change... no update !</trans>
4896     + </entry>
4897     +
4898     + <entry>
4899     + <base>LABEL_GEOIP_STATUS</base>
4900     + <trans>Current GEOIP filtering :</trans>
4901     + </entry>
4902     +
4903     + <entry>
4904     + <base>LABEL_GEOIP</base>
4905     + <trans>GEOIP filtering desired :</trans>
4906     + </entry>
4907     +
4908     + <entry>
4909     + <base>DESC_GEOIP</base>
4910     + <trans>Should filtering by country of origin be activated ?</trans>
4911     + </entry>
4912     +
4913     + <entry>
4914     + <base>ERROR_STATUS_GEOIP</base>
4915     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
4916     + </entry>
4917     +
4918     + <entry>
4919     + <base>LABEL_BADCOUNTRIES_STATUS</base>
4920     + <trans>Current list of banished country codes :</trans>
4921     + </entry>
4922     +
4923     + <entry>
4924     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
4925     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
4926     + </entry>
4927     +
4928     + <entry>
4929     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
4930     + <trans>Country code(s) maximum reached: {$ctr}</trans>
4931     + </entry>
4932     +
4933     + <entry>
4934     + <base>LABEL_BADCOUNTRIES</base>
4935     + <trans>New country codes to be used :</trans>
4936     + </entry>
4937     +
4938     + <entry>
4939     + <base>DESC_BADCOUNTRIES</base>
4940     + <trans>List of country codes (uppercase et comma-separated).</trans>
4941     + </entry>
4942     +
4943     + <entry>
4944     + <base>LABEL_DATE_UPDATE_STATUS</base>
4945     + <trans>Last update of GeoIP table :</trans>
4946     + </entry>
4947     +
4948     + <entry>
4949     + <base>LABEL_UPDATE</base>
4950     + <trans>Force the update of GeoIP table :</trans>
4951     + </entry>
4952     +
4953     + <entry>
4954     + <base>DESC_UPDATE</base>
4955     + <trans>GeoIP table is updated every week, but you can ...</trans>
4956     + </entry>
4957     +
4958     + <entry>
4959     + <base>IPT_LIST_DESCRIPTION</base>
4960     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
4961     + </entry>
4962     + <entry>
4963     + <base>IPT_LIST</base>
4964     + <trans>Filtered</trans>
4965     + </entry>
4966     +
4967     + <entry>
4968     + <base>SSH_LIST_DESCRIPTION</base>
4969     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
4970     + </entry>
4971     + <entry>
4972     + <base>SSH_LIST</base>
4973     + <trans>SSH errors</trans>
4974     + </entry>
4975     +
4976     + <entry>
4977     + <base>STATS_GENERATED</base>
4978     + <trans>Statistics generated</trans>
4979     + </entry>
4980     +
4981     + <entry>
4982     + <base>END_OF_STATS</base>
4983     + <trans>Arată statistici</trans>
4984     + </entry>
4985     +
4986     + <entry>
4987     + <base>INVALID_STATS_TYPE</base>
4988     + <trans>Statistică expeditori</trans>
4989     + </entry>
4990     +
4991     + <entry>
4992     + <base>STATS_DESCRIPTION</base>
4993     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
4994     + </entry>
4995     +
4996     + <entry>
4997     + <base>COUNTRY_LIST_DESCRIPTION</base>
4998     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
4999     + </entry>
5000     +
5001     + <entry>
5002     + <base>LABEL_COUNTRY_LIST</base>
5003     + <trans>Country codes :</trans>
5004     + </entry>
5005     + <entry>
5006     + <base>COUNTRY_LIST</base>
5007     + <trans>Country codes</trans>
5008     + </entry>
5009     +
5010     + <entry>
5011     + <base>CNTRY_LIST</base>
5012     + <trans>List</trans>
5013     + </entry>
5014     +
5015     + <entry>
5016     + <base>END_OF_CODES</base>
5017     + <trans>Final raport</trans>
5018     + </entry>
5019     +
5020     + <entry>
5021     + <base>SERVICE_DESCRIPTION</base>
5022     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
5023     + </entry>
5024     +
5025     + <entry>
5026     + <base>LABEL_SERVICE</base>
5027     + <trans>Service name :</trans>
5028     + </entry>
5029     +
5030     + <entry>
5031     + <base>PER_SERVICE_GEOIP</base>
5032     + <trans>serviciu gratuit</trans>
5033     + </entry>
5034     +
5035     + <entry>
5036     + <base>ADD_SERVICE</base>
5037     + <trans>Add or modify a per service filtering</trans>
5038     + </entry>
5039     +
5040     + <entry>
5041     + <base>ADD_DESC</base>
5042     + <trans>You are choosing a particular country filtering for this service</trans>
5043     + </entry>
5044     +
5045     + <entry>
5046     + <base>REMOVE_SERVICE</base>
5047     + <trans>Delete a per service filtering</trans>
5048     + </entry>
5049     +
5050     + <entry>
5051     + <base>REMOVE_DESC</base>
5052     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
5053     + </entry>
5054     +
5055     + <entry>
5056     + <base>SERV_NOT_BAN</base>
5057     + <trans>serviciu gratuit</trans>
5058     + </entry>
5059     +
5060     + <entry>
5061     + <base>NO_SERVICES</base>
5062     + <trans>serviciu gratuit</trans>
5063     + </entry>
5064     +
5065     + <entry>
5066     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
5067     + <trans>List of rejected country codes for the service :</trans>
5068     + </entry>
5069     +
5070     + <entry>
5071     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
5072     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
5073     + </entry>
5074     +
5075     + <entry>
5076     + <base>BADCOUNTRIES</base>
5077     + <trans>Blacklist</trans>
5078     + </entry>
5079     +
5080     + <entry>
5081     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
5082     + <trans>Too many countries chosen: {$ctr}</trans>
5083     + </entry>
5084     +
5085     + <entry>
5086     + <base>LABEL_REVERSE_MATCH</base>
5087     + <trans>Respinge</trans>
5088     + </entry>
5089     +
5090     + <entry>
5091     + <base>DESC_REVERSE_MATCH</base>
5092     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
5093     + </entry>
5094     +
5095     + <entry>
5096     + <base>LABEL_OTHERS</base>
5097     + <trans>General filter only for services without rules</trans>
5098     + </entry>
5099     +
5100     + <entry>
5101     + <base>DESC_OTHERS</base>
5102     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
5103     + </entry>
5104     +
5105     + <entry>
5106     + <base>SERVICE_LIST_DESCRIPTION</base>
5107     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
5108     + </entry>
5109     +
5110     + <entry>
5111     + <base>LABEL_SERVICE_LIST</base>
5112     + <trans>serviciu gratuit</trans>
5113     + </entry>
5114     +
5115     + <entry>
5116     + <base>SERV_LIST</base>
5117     + <trans>List</trans>
5118     + </entry>
5119     +
5120     + <entry>
5121     + <base>DESC_AVAILABLE_SERVICES</base>
5122     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
5123     + </entry>
5124     +
5125     + <entry>
5126     + <base>LABEL_AVAILABLE_SERVICES</base>
5127     + <trans>Pachete disponibile</trans>
5128     + </entry>
5129     +
5130     +
5131     +</lexicon>
5132     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/ru/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/ru/etc/e-smith/web/functions/xt_geoip
5133     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/ru/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
5134     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/ru/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
5135     @@ -0,0 +1,262 @@
5136     +<lexicon lang="ru">
5137     +
5138     + <entry>
5139     + <base>FORM_TITLE</base>
5140     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
5141     + </entry>
5142     +
5143     + <entry>
5144     + <base>ERROR_UPDATING</base>
5145     + <trans>There was an error while updating xt_geoip.</trans>
5146     + </entry>
5147     +
5148     + <entry>
5149     + <base>SUCCESS</base>
5150     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
5151     +
5152     + </entry>
5153     +
5154     + <entry>
5155     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
5156     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
5157     + </entry>
5158     +
5159     + <entry>
5160     + <base>NO_CHANGE</base>
5161     + <trans>No change... no update !</trans>
5162     + </entry>
5163     +
5164     + <entry>
5165     + <base>LABEL_GEOIP_STATUS</base>
5166     + <trans>Current GEOIP filtering :</trans>
5167     + </entry>
5168     +
5169     + <entry>
5170     + <base>LABEL_GEOIP</base>
5171     + <trans>GEOIP filtering desired :</trans>
5172     + </entry>
5173     +
5174     + <entry>
5175     + <base>DESC_GEOIP</base>
5176     + <trans>Should filtering by country of origin be activated ?</trans>
5177     + </entry>
5178     +
5179     + <entry>
5180     + <base>ERROR_STATUS_GEOIP</base>
5181     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
5182     + </entry>
5183     +
5184     + <entry>
5185     + <base>LABEL_BADCOUNTRIES_STATUS</base>
5186     + <trans>Current list of banished country codes :</trans>
5187     + </entry>
5188     +
5189     + <entry>
5190     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
5191     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
5192     + </entry>
5193     +
5194     + <entry>
5195     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
5196     + <trans>Country code(s) maximum reached: {$ctr}</trans>
5197     + </entry>
5198     +
5199     + <entry>
5200     + <base>LABEL_BADCOUNTRIES</base>
5201     + <trans>New country codes to be used :</trans>
5202     + </entry>
5203     +
5204     + <entry>
5205     + <base>DESC_BADCOUNTRIES</base>
5206     + <trans>List of country codes (uppercase et comma-separated).</trans>
5207     + </entry>
5208     +
5209     + <entry>
5210     + <base>LABEL_DATE_UPDATE_STATUS</base>
5211     + <trans>Last update of GeoIP table :</trans>
5212     + </entry>
5213     +
5214     + <entry>
5215     + <base>LABEL_UPDATE</base>
5216     + <trans>Force the update of GeoIP table :</trans>
5217     + </entry>
5218     +
5219     + <entry>
5220     + <base>DESC_UPDATE</base>
5221     + <trans>GeoIP table is updated every week, but you can ...</trans>
5222     + </entry>
5223     +
5224     + <entry>
5225     + <base>IPT_LIST_DESCRIPTION</base>
5226     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
5227     + </entry>
5228     + <entry>
5229     + <base>IPT_LIST</base>
5230     + <trans>Filtered</trans>
5231     + </entry>
5232     +
5233     + <entry>
5234     + <base>SSH_LIST_DESCRIPTION</base>
5235     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
5236     + </entry>
5237     + <entry>
5238     + <base>SSH_LIST</base>
5239     + <trans>SSH errors</trans>
5240     + </entry>
5241     +
5242     + <entry>
5243     + <base>STATS_GENERATED</base>
5244     + <trans>Statistics generated</trans>
5245     + </entry>
5246     +
5247     + <entry>
5248     + <base>END_OF_STATS</base>
5249     + <trans>Показать статистику</trans>
5250     + </entry>
5251     +
5252     + <entry>
5253     + <base>INVALID_STATS_TYPE</base>
5254     + <trans>Статистика по отправителям</trans>
5255     + </entry>
5256     +
5257     + <entry>
5258     + <base>STATS_DESCRIPTION</base>
5259     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
5260     + </entry>
5261     +
5262     + <entry>
5263     + <base>COUNTRY_LIST_DESCRIPTION</base>
5264     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
5265     + </entry>
5266     +
5267     + <entry>
5268     + <base>LABEL_COUNTRY_LIST</base>
5269     + <trans>Country codes :</trans>
5270     + </entry>
5271     + <entry>
5272     + <base>COUNTRY_LIST</base>
5273     + <trans>Country codes</trans>
5274     + </entry>
5275     +
5276     + <entry>
5277     + <base>CNTRY_LIST</base>
5278     + <trans>List</trans>
5279     + </entry>
5280     +
5281     + <entry>
5282     + <base>END_OF_CODES</base>
5283     + <trans>Конец результатов.</trans>
5284     + </entry>
5285     +
5286     + <entry>
5287     + <base>SERVICE_DESCRIPTION</base>
5288     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
5289     + </entry>
5290     +
5291     + <entry>
5292     + <base>LABEL_SERVICE</base>
5293     + <trans>Состояние службы</trans>
5294     + </entry>
5295     +
5296     + <entry>
5297     + <base>PER_SERVICE_GEOIP</base>
5298     + <trans>Состояние службы</trans>
5299     + </entry>
5300     +
5301     + <entry>
5302     + <base>ADD_SERVICE</base>
5303     + <trans>Создать или изменить общую папку</trans>
5304     + </entry>
5305     +
5306     + <entry>
5307     + <base>ADD_DESC</base>
5308     + <trans>You are choosing a particular country filtering for this service</trans>
5309     + </entry>
5310     +
5311     + <entry>
5312     + <base>REMOVE_SERVICE</base>
5313     + <trans>Delete a per service filtering</trans>
5314     + </entry>
5315     +
5316     + <entry>
5317     + <base>REMOVE_DESC</base>
5318     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
5319     + </entry>
5320     +
5321     + <entry>
5322     + <base>SERV_NOT_BAN</base>
5323     + <trans>бесплатный сервис</trans>
5324     + </entry>
5325     +
5326     + <entry>
5327     + <base>NO_SERVICES</base>
5328     + <trans>Службы Jabber</trans>
5329     + </entry>
5330     +
5331     + <entry>
5332     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
5333     + <trans>List of rejected country codes for the service :</trans>
5334     + </entry>
5335     +
5336     + <entry>
5337     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
5338     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
5339     + </entry>
5340     +
5341     + <entry>
5342     + <base>BADCOUNTRIES</base>
5343     + <trans>Blacklist</trans>
5344     + </entry>
5345     +
5346     + <entry>
5347     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
5348     + <trans>Too many countries chosen: {$ctr}</trans>
5349     + </entry>
5350     +
5351     + <entry>
5352     + <base>LABEL_REVERSE_MATCH</base>
5353     + <trans>Отказаться</trans>
5354     + </entry>
5355     +
5356     + <entry>
5357     + <base>DESC_REVERSE_MATCH</base>
5358     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
5359     + </entry>
5360     +
5361     + <entry>
5362     + <base>LABEL_OTHERS</base>
5363     + <trans>General filter only for services without rules</trans>
5364     + </entry>
5365     +
5366     + <entry>
5367     + <base>DESC_OTHERS</base>
5368     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
5369     + </entry>
5370     +
5371     + <entry>
5372     + <base>SERVICE_LIST_DESCRIPTION</base>
5373     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
5374     + </entry>
5375     +
5376     + <entry>
5377     + <base>LABEL_SERVICE_LIST</base>
5378     + <trans>Состояние службы</trans>
5379     + </entry>
5380     +
5381     + <entry>
5382     + <base>SERV_LIST</base>
5383     + <trans>List</trans>
5384     + </entry>
5385     +
5386     + <entry>
5387     + <base>DESC_AVAILABLE_SERVICES</base>
5388     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
5389     + </entry>
5390     +
5391     + <entry>
5392     + <base>LABEL_AVAILABLE_SERVICES</base>
5393     + <trans>Доступные пакеты</trans>
5394     + </entry>
5395     +
5396     +
5397     +</lexicon>
5398     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/sl/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/sl/etc/e-smith/web/functions/xt_geoip
5399     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/sl/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
5400     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/sl/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
5401     @@ -0,0 +1,262 @@
5402     +<lexicon lang="sl">
5403     +
5404     + <entry>
5405     + <base>FORM_TITLE</base>
5406     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
5407     + </entry>
5408     +
5409     + <entry>
5410     + <base>ERROR_UPDATING</base>
5411     + <trans>There was an error while updating xt_geoip.</trans>
5412     + </entry>
5413     +
5414     + <entry>
5415     + <base>SUCCESS</base>
5416     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
5417     +
5418     + </entry>
5419     +
5420     + <entry>
5421     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
5422     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
5423     + </entry>
5424     +
5425     + <entry>
5426     + <base>NO_CHANGE</base>
5427     + <trans>No change... no update !</trans>
5428     + </entry>
5429     +
5430     + <entry>
5431     + <base>LABEL_GEOIP_STATUS</base>
5432     + <trans>Current GEOIP filtering :</trans>
5433     + </entry>
5434     +
5435     + <entry>
5436     + <base>LABEL_GEOIP</base>
5437     + <trans>GEOIP filtering desired :</trans>
5438     + </entry>
5439     +
5440     + <entry>
5441     + <base>DESC_GEOIP</base>
5442     + <trans>Should filtering by country of origin be activated ?</trans>
5443     + </entry>
5444     +
5445     + <entry>
5446     + <base>ERROR_STATUS_GEOIP</base>
5447     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
5448     + </entry>
5449     +
5450     + <entry>
5451     + <base>LABEL_BADCOUNTRIES_STATUS</base>
5452     + <trans>Current list of banished country codes :</trans>
5453     + </entry>
5454     +
5455     + <entry>
5456     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
5457     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
5458     + </entry>
5459     +
5460     + <entry>
5461     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
5462     + <trans>Country code(s) maximum reached: {$ctr}</trans>
5463     + </entry>
5464     +
5465     + <entry>
5466     + <base>LABEL_BADCOUNTRIES</base>
5467     + <trans>New country codes to be used :</trans>
5468     + </entry>
5469     +
5470     + <entry>
5471     + <base>DESC_BADCOUNTRIES</base>
5472     + <trans>List of country codes (uppercase et comma-separated).</trans>
5473     + </entry>
5474     +
5475     + <entry>
5476     + <base>LABEL_DATE_UPDATE_STATUS</base>
5477     + <trans>Last update of GeoIP table :</trans>
5478     + </entry>
5479     +
5480     + <entry>
5481     + <base>LABEL_UPDATE</base>
5482     + <trans>Force the update of GeoIP table :</trans>
5483     + </entry>
5484     +
5485     + <entry>
5486     + <base>DESC_UPDATE</base>
5487     + <trans>GeoIP table is updated every week, but you can ...</trans>
5488     + </entry>
5489     +
5490     + <entry>
5491     + <base>IPT_LIST_DESCRIPTION</base>
5492     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
5493     + </entry>
5494     + <entry>
5495     + <base>IPT_LIST</base>
5496     + <trans>Filtered</trans>
5497     + </entry>
5498     +
5499     + <entry>
5500     + <base>SSH_LIST_DESCRIPTION</base>
5501     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
5502     + </entry>
5503     + <entry>
5504     + <base>SSH_LIST</base>
5505     + <trans>SSH errors</trans>
5506     + </entry>
5507     +
5508     + <entry>
5509     + <base>STATS_GENERATED</base>
5510     + <trans>Statistics generated</trans>
5511     + </entry>
5512     +
5513     + <entry>
5514     + <base>END_OF_STATS</base>
5515     + <trans>Prikaži statistiko</trans>
5516     + </entry>
5517     +
5518     + <entry>
5519     + <base>INVALID_STATS_TYPE</base>
5520     + <trans>Statistika posiljateljev</trans>
5521     + </entry>
5522     +
5523     + <entry>
5524     + <base>STATS_DESCRIPTION</base>
5525     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
5526     + </entry>
5527     +
5528     + <entry>
5529     + <base>COUNTRY_LIST_DESCRIPTION</base>
5530     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
5531     + </entry>
5532     +
5533     + <entry>
5534     + <base>LABEL_COUNTRY_LIST</base>
5535     + <trans>Country codes :</trans>
5536     + </entry>
5537     + <entry>
5538     + <base>COUNTRY_LIST</base>
5539     + <trans>Country codes</trans>
5540     + </entry>
5541     +
5542     + <entry>
5543     + <base>CNTRY_LIST</base>
5544     + <trans>List</trans>
5545     + </entry>
5546     +
5547     + <entry>
5548     + <base>END_OF_CODES</base>
5549     + <trans>Konec porocila</trans>
5550     + </entry>
5551     +
5552     + <entry>
5553     + <base>SERVICE_DESCRIPTION</base>
5554     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
5555     + </entry>
5556     +
5557     + <entry>
5558     + <base>LABEL_SERVICE</base>
5559     + <trans>Service name :</trans>
5560     + </entry>
5561     +
5562     + <entry>
5563     + <base>PER_SERVICE_GEOIP</base>
5564     + <trans>brezplačna storitev</trans>
5565     + </entry>
5566     +
5567     + <entry>
5568     + <base>ADD_SERVICE</base>
5569     + <trans>Add or modify a per service filtering</trans>
5570     + </entry>
5571     +
5572     + <entry>
5573     + <base>ADD_DESC</base>
5574     + <trans>You are choosing a particular country filtering for this service</trans>
5575     + </entry>
5576     +
5577     + <entry>
5578     + <base>REMOVE_SERVICE</base>
5579     + <trans>Delete a per service filtering</trans>
5580     + </entry>
5581     +
5582     + <entry>
5583     + <base>REMOVE_DESC</base>
5584     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
5585     + </entry>
5586     +
5587     + <entry>
5588     + <base>SERV_NOT_BAN</base>
5589     + <trans>brezplačna storitev</trans>
5590     + </entry>
5591     +
5592     + <entry>
5593     + <base>NO_SERVICES</base>
5594     + <trans>brezplačna storitev</trans>
5595     + </entry>
5596     +
5597     + <entry>
5598     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
5599     + <trans>List of rejected country codes for the service :</trans>
5600     + </entry>
5601     +
5602     + <entry>
5603     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
5604     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
5605     + </entry>
5606     +
5607     + <entry>
5608     + <base>BADCOUNTRIES</base>
5609     + <trans>Blacklist</trans>
5610     + </entry>
5611     +
5612     + <entry>
5613     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
5614     + <trans>Too many countries chosen: {$ctr}</trans>
5615     + </entry>
5616     +
5617     + <entry>
5618     + <base>LABEL_REVERSE_MATCH</base>
5619     + <trans>Vrni posiljatelju</trans>
5620     + </entry>
5621     +
5622     + <entry>
5623     + <base>DESC_REVERSE_MATCH</base>
5624     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
5625     + </entry>
5626     +
5627     + <entry>
5628     + <base>LABEL_OTHERS</base>
5629     + <trans>General filter only for services without rules</trans>
5630     + </entry>
5631     +
5632     + <entry>
5633     + <base>DESC_OTHERS</base>
5634     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
5635     + </entry>
5636     +
5637     + <entry>
5638     + <base>SERVICE_LIST_DESCRIPTION</base>
5639     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
5640     + </entry>
5641     +
5642     + <entry>
5643     + <base>LABEL_SERVICE_LIST</base>
5644     + <trans>brezplačna storitev</trans>
5645     + </entry>
5646     +
5647     + <entry>
5648     + <base>SERV_LIST</base>
5649     + <trans>List</trans>
5650     + </entry>
5651     +
5652     + <entry>
5653     + <base>DESC_AVAILABLE_SERVICES</base>
5654     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
5655     + </entry>
5656     +
5657     + <entry>
5658     + <base>LABEL_AVAILABLE_SERVICES</base>
5659     + <trans>Programski paketi</trans>
5660     + </entry>
5661     +
5662     +
5663     +</lexicon>
5664     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/xt_geoip
5665     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
5666     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
5667     @@ -0,0 +1,262 @@
5668     +<lexicon lang="sv">
5669     +
5670     + <entry>
5671     + <base>FORM_TITLE</base>
5672     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
5673     + </entry>
5674     +
5675     + <entry>
5676     + <base>ERROR_UPDATING</base>
5677     + <trans>There was an error while updating xt_geoip.</trans>
5678     + </entry>
5679     +
5680     + <entry>
5681     + <base>SUCCESS</base>
5682     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
5683     +
5684     + </entry>
5685     +
5686     + <entry>
5687     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
5688     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
5689     + </entry>
5690     +
5691     + <entry>
5692     + <base>NO_CHANGE</base>
5693     + <trans>No change... no update !</trans>
5694     + </entry>
5695     +
5696     + <entry>
5697     + <base>LABEL_GEOIP_STATUS</base>
5698     + <trans>Current GEOIP filtering :</trans>
5699     + </entry>
5700     +
5701     + <entry>
5702     + <base>LABEL_GEOIP</base>
5703     + <trans>GEOIP filtering desired :</trans>
5704     + </entry>
5705     +
5706     + <entry>
5707     + <base>DESC_GEOIP</base>
5708     + <trans>Should filtering by country of origin be activated ?</trans>
5709     + </entry>
5710     +
5711     + <entry>
5712     + <base>ERROR_STATUS_GEOIP</base>
5713     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
5714     + </entry>
5715     +
5716     + <entry>
5717     + <base>LABEL_BADCOUNTRIES_STATUS</base>
5718     + <trans>Current list of banished country codes :</trans>
5719     + </entry>
5720     +
5721     + <entry>
5722     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
5723     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
5724     + </entry>
5725     +
5726     + <entry>
5727     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
5728     + <trans>Country code(s) maximum reached: {$ctr}</trans>
5729     + </entry>
5730     +
5731     + <entry>
5732     + <base>LABEL_BADCOUNTRIES</base>
5733     + <trans>New country codes to be used :</trans>
5734     + </entry>
5735     +
5736     + <entry>
5737     + <base>DESC_BADCOUNTRIES</base>
5738     + <trans>List of country codes (uppercase et comma-separated).</trans>
5739     + </entry>
5740     +
5741     + <entry>
5742     + <base>LABEL_DATE_UPDATE_STATUS</base>
5743     + <trans>Last update of GeoIP table :</trans>
5744     + </entry>
5745     +
5746     + <entry>
5747     + <base>LABEL_UPDATE</base>
5748     + <trans>Force the update of GeoIP table :</trans>
5749     + </entry>
5750     +
5751     + <entry>
5752     + <base>DESC_UPDATE</base>
5753     + <trans>GeoIP table is updated every week, but you can ...</trans>
5754     + </entry>
5755     +
5756     + <entry>
5757     + <base>IPT_LIST_DESCRIPTION</base>
5758     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
5759     + </entry>
5760     + <entry>
5761     + <base>IPT_LIST</base>
5762     + <trans>Filter</trans>
5763     + </entry>
5764     +
5765     + <entry>
5766     + <base>SSH_LIST_DESCRIPTION</base>
5767     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
5768     + </entry>
5769     + <entry>
5770     + <base>SSH_LIST</base>
5771     + <trans>Syntaxfel</trans>
5772     + </entry>
5773     +
5774     + <entry>
5775     + <base>STATS_GENERATED</base>
5776     + <trans>Statistik</trans>
5777     + </entry>
5778     +
5779     + <entry>
5780     + <base>END_OF_STATS</base>
5781     + <trans>Visa statistik</trans>
5782     + </entry>
5783     +
5784     + <entry>
5785     + <base>INVALID_STATS_TYPE</base>
5786     + <trans>Avsändarstatistik</trans>
5787     + </entry>
5788     +
5789     + <entry>
5790     + <base>STATS_DESCRIPTION</base>
5791     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
5792     + </entry>
5793     +
5794     + <entry>
5795     + <base>COUNTRY_LIST_DESCRIPTION</base>
5796     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
5797     + </entry>
5798     +
5799     + <entry>
5800     + <base>LABEL_COUNTRY_LIST</base>
5801     + <trans>Källkod</trans>
5802     + </entry>
5803     + <entry>
5804     + <base>COUNTRY_LIST</base>
5805     + <trans>Källkod</trans>
5806     + </entry>
5807     +
5808     + <entry>
5809     + <base>CNTRY_LIST</base>
5810     + <trans>Att-göra-lista</trans>
5811     + </entry>
5812     +
5813     + <entry>
5814     + <base>END_OF_CODES</base>
5815     + <trans>Inga fler resultat.</trans>
5816     + </entry>
5817     +
5818     + <entry>
5819     + <base>SERVICE_DESCRIPTION</base>
5820     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
5821     + </entry>
5822     +
5823     + <entry>
5824     + <base>LABEL_SERVICE</base>
5825     + <trans>Tjänst</trans>
5826     + </entry>
5827     +
5828     + <entry>
5829     + <base>PER_SERVICE_GEOIP</base>
5830     + <trans>Tjänst</trans>
5831     + </entry>
5832     +
5833     + <entry>
5834     + <base>ADD_SERVICE</base>
5835     + <trans>Skapa eller ändra en delad mapp</trans>
5836     + </entry>
5837     +
5838     + <entry>
5839     + <base>ADD_DESC</base>
5840     + <trans>You are choosing a particular country filtering for this service</trans>
5841     + </entry>
5842     +
5843     + <entry>
5844     + <base>REMOVE_SERVICE</base>
5845     + <trans>Delete a per service filtering</trans>
5846     + </entry>
5847     +
5848     + <entry>
5849     + <base>REMOVE_DESC</base>
5850     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
5851     + </entry>
5852     +
5853     + <entry>
5854     + <base>SERV_NOT_BAN</base>
5855     + <trans>gratis tjänst</trans>
5856     + </entry>
5857     +
5858     + <entry>
5859     + <base>NO_SERVICES</base>
5860     + <trans>DNS-tjänster</trans>
5861     + </entry>
5862     +
5863     + <entry>
5864     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
5865     + <trans>List of rejected country codes for the service :</trans>
5866     + </entry>
5867     +
5868     + <entry>
5869     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
5870     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
5871     + </entry>
5872     +
5873     + <entry>
5874     + <base>BADCOUNTRIES</base>
5875     + <trans>Blacklist</trans>
5876     + </entry>
5877     +
5878     + <entry>
5879     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
5880     + <trans>Too many countries chosen: {$ctr}</trans>
5881     + </entry>
5882     +
5883     + <entry>
5884     + <base>LABEL_REVERSE_MATCH</base>
5885     + <trans>Förkasta</trans>
5886     + </entry>
5887     +
5888     + <entry>
5889     + <base>DESC_REVERSE_MATCH</base>
5890     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
5891     + </entry>
5892     +
5893     + <entry>
5894     + <base>LABEL_OTHERS</base>
5895     + <trans>General filter only for services without rules</trans>
5896     + </entry>
5897     +
5898     + <entry>
5899     + <base>DESC_OTHERS</base>
5900     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
5901     + </entry>
5902     +
5903     + <entry>
5904     + <base>SERVICE_LIST_DESCRIPTION</base>
5905     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
5906     + </entry>
5907     +
5908     + <entry>
5909     + <base>LABEL_SERVICE_LIST</base>
5910     + <trans>Tjänst</trans>
5911     + </entry>
5912     +
5913     + <entry>
5914     + <base>SERV_LIST</base>
5915     + <trans>Att-göra-lista</trans>
5916     + </entry>
5917     +
5918     + <entry>
5919     + <base>DESC_AVAILABLE_SERVICES</base>
5920     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
5921     + </entry>
5922     +
5923     + <entry>
5924     + <base>LABEL_AVAILABLE_SERVICES</base>
5925     + <trans>Tillgängliga paket</trans>
5926     + </entry>
5927     +
5928     +
5929     +</lexicon>
5930     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/th/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/th/etc/e-smith/web/functions/xt_geoip
5931     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/th/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
5932     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/th/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
5933     @@ -0,0 +1,262 @@
5934     +<lexicon lang="th">
5935     +
5936     + <entry>
5937     + <base>FORM_TITLE</base>
5938     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
5939     + </entry>
5940     +
5941     + <entry>
5942     + <base>ERROR_UPDATING</base>
5943     + <trans>There was an error while updating xt_geoip.</trans>
5944     + </entry>
5945     +
5946     + <entry>
5947     + <base>SUCCESS</base>
5948     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
5949     +
5950     + </entry>
5951     +
5952     + <entry>
5953     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
5954     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
5955     + </entry>
5956     +
5957     + <entry>
5958     + <base>NO_CHANGE</base>
5959     + <trans>No change... no update !</trans>
5960     + </entry>
5961     +
5962     + <entry>
5963     + <base>LABEL_GEOIP_STATUS</base>
5964     + <trans>Current GEOIP filtering :</trans>
5965     + </entry>
5966     +
5967     + <entry>
5968     + <base>LABEL_GEOIP</base>
5969     + <trans>GEOIP filtering desired :</trans>
5970     + </entry>
5971     +
5972     + <entry>
5973     + <base>DESC_GEOIP</base>
5974     + <trans>Should filtering by country of origin be activated ?</trans>
5975     + </entry>
5976     +
5977     + <entry>
5978     + <base>ERROR_STATUS_GEOIP</base>
5979     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
5980     + </entry>
5981     +
5982     + <entry>
5983     + <base>LABEL_BADCOUNTRIES_STATUS</base>
5984     + <trans>Current list of banished country codes :</trans>
5985     + </entry>
5986     +
5987     + <entry>
5988     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
5989     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
5990     + </entry>
5991     +
5992     + <entry>
5993     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
5994     + <trans>Country code(s) maximum reached: {$ctr}</trans>
5995     + </entry>
5996     +
5997     + <entry>
5998     + <base>LABEL_BADCOUNTRIES</base>
5999     + <trans>New country codes to be used :</trans>
6000     + </entry>
6001     +
6002     + <entry>
6003     + <base>DESC_BADCOUNTRIES</base>
6004     + <trans>List of country codes (uppercase et comma-separated).</trans>
6005     + </entry>
6006     +
6007     + <entry>
6008     + <base>LABEL_DATE_UPDATE_STATUS</base>
6009     + <trans>Last update of GeoIP table :</trans>
6010     + </entry>
6011     +
6012     + <entry>
6013     + <base>LABEL_UPDATE</base>
6014     + <trans>Force the update of GeoIP table :</trans>
6015     + </entry>
6016     +
6017     + <entry>
6018     + <base>DESC_UPDATE</base>
6019     + <trans>GeoIP table is updated every week, but you can ...</trans>
6020     + </entry>
6021     +
6022     + <entry>
6023     + <base>IPT_LIST_DESCRIPTION</base>
6024     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
6025     + </entry>
6026     + <entry>
6027     + <base>IPT_LIST</base>
6028     + <trans>กรอง, ตัวกรอง</trans>
6029     + </entry>
6030     +
6031     + <entry>
6032     + <base>SSH_LIST_DESCRIPTION</base>
6033     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
6034     + </entry>
6035     + <entry>
6036     + <base>SSH_LIST</base>
6037     + <trans>Syntax error</trans>
6038     + </entry>
6039     +
6040     + <entry>
6041     + <base>STATS_GENERATED</base>
6042     + <trans>สถิติ</trans>
6043     + </entry>
6044     +
6045     + <entry>
6046     + <base>END_OF_STATS</base>
6047     + <trans>แสดงสถิติ</trans>
6048     + </entry>
6049     +
6050     + <entry>
6051     + <base>INVALID_STATS_TYPE</base>
6052     + <trans>สถิติผู้ส่ง</trans>
6053     + </entry>
6054     +
6055     + <entry>
6056     + <base>STATS_DESCRIPTION</base>
6057     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
6058     + </entry>
6059     +
6060     + <entry>
6061     + <base>COUNTRY_LIST_DESCRIPTION</base>
6062     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
6063     + </entry>
6064     +
6065     + <entry>
6066     + <base>LABEL_COUNTRY_LIST</base>
6067     + <trans>Source code</trans>
6068     + </entry>
6069     + <entry>
6070     + <base>COUNTRY_LIST</base>
6071     + <trans>Source code</trans>
6072     + </entry>
6073     +
6074     + <entry>
6075     + <base>CNTRY_LIST</base>
6076     + <trans>List</trans>
6077     + </entry>
6078     +
6079     + <entry>
6080     + <base>END_OF_CODES</base>
6081     + <trans>สิ้นสุดการรายงาน</trans>
6082     + </entry>
6083     +
6084     + <entry>
6085     + <base>SERVICE_DESCRIPTION</base>
6086     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
6087     + </entry>
6088     +
6089     + <entry>
6090     + <base>LABEL_SERVICE</base>
6091     + <trans>Service name :</trans>
6092     + </entry>
6093     +
6094     + <entry>
6095     + <base>PER_SERVICE_GEOIP</base>
6096     + <trans>อุปกรณ์</trans>
6097     + </entry>
6098     +
6099     + <entry>
6100     + <base>ADD_SERVICE</base>
6101     + <trans>Add or modify a per service filtering</trans>
6102     + </entry>
6103     +
6104     + <entry>
6105     + <base>ADD_DESC</base>
6106     + <trans>You are choosing a particular country filtering for this service</trans>
6107     + </entry>
6108     +
6109     + <entry>
6110     + <base>REMOVE_SERVICE</base>
6111     + <trans>Delete a per service filtering</trans>
6112     + </entry>
6113     +
6114     + <entry>
6115     + <base>REMOVE_DESC</base>
6116     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
6117     + </entry>
6118     +
6119     + <entry>
6120     + <base>SERV_NOT_BAN</base>
6121     + <trans>Unfiltered service.</trans>
6122     + </entry>
6123     +
6124     + <entry>
6125     + <base>NO_SERVICES</base>
6126     + <trans>No services.</trans>
6127     + </entry>
6128     +
6129     + <entry>
6130     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
6131     + <trans>List of rejected country codes for the service :</trans>
6132     + </entry>
6133     +
6134     + <entry>
6135     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
6136     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
6137     + </entry>
6138     +
6139     + <entry>
6140     + <base>BADCOUNTRIES</base>
6141     + <trans>Blacklist</trans>
6142     + </entry>
6143     +
6144     + <entry>
6145     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
6146     + <trans>Too many countries chosen: {$ctr}</trans>
6147     + </entry>
6148     +
6149     + <entry>
6150     + <base>LABEL_REVERSE_MATCH</base>
6151     + <trans>ไม่รับ</trans>
6152     + </entry>
6153     +
6154     + <entry>
6155     + <base>DESC_REVERSE_MATCH</base>
6156     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
6157     + </entry>
6158     +
6159     + <entry>
6160     + <base>LABEL_OTHERS</base>
6161     + <trans>General filter only for services without rules</trans>
6162     + </entry>
6163     +
6164     + <entry>
6165     + <base>DESC_OTHERS</base>
6166     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
6167     + </entry>
6168     +
6169     + <entry>
6170     + <base>SERVICE_LIST_DESCRIPTION</base>
6171     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
6172     + </entry>
6173     +
6174     + <entry>
6175     + <base>LABEL_SERVICE_LIST</base>
6176     + <trans>อุปกรณ์</trans>
6177     + </entry>
6178     +
6179     + <entry>
6180     + <base>SERV_LIST</base>
6181     + <trans>List</trans>
6182     + </entry>
6183     +
6184     + <entry>
6185     + <base>DESC_AVAILABLE_SERVICES</base>
6186     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
6187     + </entry>
6188     +
6189     + <entry>
6190     + <base>LABEL_AVAILABLE_SERVICES</base>
6191     + <trans>แพ็คเกจที่มี</trans>
6192     + </entry>
6193     +
6194     +
6195     +</lexicon>
6196     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/tr/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/tr/etc/e-smith/web/functions/xt_geoip
6197     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/tr/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
6198     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/tr/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
6199     @@ -0,0 +1,262 @@
6200     +<lexicon lang="tr">
6201     +
6202     + <entry>
6203     + <base>FORM_TITLE</base>
6204     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
6205     + </entry>
6206     +
6207     + <entry>
6208     + <base>ERROR_UPDATING</base>
6209     + <trans>There was an error while updating xt_geoip.</trans>
6210     + </entry>
6211     +
6212     + <entry>
6213     + <base>SUCCESS</base>
6214     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
6215     +
6216     + </entry>
6217     +
6218     + <entry>
6219     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
6220     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
6221     + </entry>
6222     +
6223     + <entry>
6224     + <base>NO_CHANGE</base>
6225     + <trans>No change... no update !</trans>
6226     + </entry>
6227     +
6228     + <entry>
6229     + <base>LABEL_GEOIP_STATUS</base>
6230     + <trans>Current GEOIP filtering :</trans>
6231     + </entry>
6232     +
6233     + <entry>
6234     + <base>LABEL_GEOIP</base>
6235     + <trans>GEOIP filtering desired :</trans>
6236     + </entry>
6237     +
6238     + <entry>
6239     + <base>DESC_GEOIP</base>
6240     + <trans>Should filtering by country of origin be activated ?</trans>
6241     + </entry>
6242     +
6243     + <entry>
6244     + <base>ERROR_STATUS_GEOIP</base>
6245     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
6246     + </entry>
6247     +
6248     + <entry>
6249     + <base>LABEL_BADCOUNTRIES_STATUS</base>
6250     + <trans>Current list of banished country codes :</trans>
6251     + </entry>
6252     +
6253     + <entry>
6254     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
6255     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
6256     + </entry>
6257     +
6258     + <entry>
6259     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
6260     + <trans>Country code(s) maximum reached: {$ctr}</trans>
6261     + </entry>
6262     +
6263     + <entry>
6264     + <base>LABEL_BADCOUNTRIES</base>
6265     + <trans>New country codes to be used :</trans>
6266     + </entry>
6267     +
6268     + <entry>
6269     + <base>DESC_BADCOUNTRIES</base>
6270     + <trans>List of country codes (uppercase et comma-separated).</trans>
6271     + </entry>
6272     +
6273     + <entry>
6274     + <base>LABEL_DATE_UPDATE_STATUS</base>
6275     + <trans>Last update of GeoIP table :</trans>
6276     + </entry>
6277     +
6278     + <entry>
6279     + <base>LABEL_UPDATE</base>
6280     + <trans>Force the update of GeoIP table :</trans>
6281     + </entry>
6282     +
6283     + <entry>
6284     + <base>DESC_UPDATE</base>
6285     + <trans>GeoIP table is updated every week, but you can ...</trans>
6286     + </entry>
6287     +
6288     + <entry>
6289     + <base>IPT_LIST_DESCRIPTION</base>
6290     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
6291     + </entry>
6292     + <entry>
6293     + <base>IPT_LIST</base>
6294     + <trans>süzgeç</trans>
6295     + </entry>
6296     +
6297     + <entry>
6298     + <base>SSH_LIST_DESCRIPTION</base>
6299     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
6300     + </entry>
6301     + <entry>
6302     + <base>SSH_LIST</base>
6303     + <trans>hata</trans>
6304     + </entry>
6305     +
6306     + <entry>
6307     + <base>STATS_GENERATED</base>
6308     + <trans>istatistik</trans>
6309     + </entry>
6310     +
6311     + <entry>
6312     + <base>END_OF_STATS</base>
6313     + <trans>İstatistikleri Göster</trans>
6314     + </entry>
6315     +
6316     + <entry>
6317     + <base>INVALID_STATS_TYPE</base>
6318     + <trans>Gönderici istatistikleri</trans>
6319     + </entry>
6320     +
6321     + <entry>
6322     + <base>STATS_DESCRIPTION</base>
6323     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
6324     + </entry>
6325     +
6326     + <entry>
6327     + <base>COUNTRY_LIST_DESCRIPTION</base>
6328     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
6329     + </entry>
6330     +
6331     + <entry>
6332     + <base>LABEL_COUNTRY_LIST</base>
6333     + <trans>Country codes :</trans>
6334     + </entry>
6335     + <entry>
6336     + <base>COUNTRY_LIST</base>
6337     + <trans>Country codes</trans>
6338     + </entry>
6339     +
6340     + <entry>
6341     + <base>CNTRY_LIST</base>
6342     + <trans>List</trans>
6343     + </entry>
6344     +
6345     + <entry>
6346     + <base>END_OF_CODES</base>
6347     + <trans>Sonuçların sonu.</trans>
6348     + </entry>
6349     +
6350     + <entry>
6351     + <base>SERVICE_DESCRIPTION</base>
6352     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
6353     + </entry>
6354     +
6355     + <entry>
6356     + <base>LABEL_SERVICE</base>
6357     + <trans>Service name :</trans>
6358     + </entry>
6359     +
6360     + <entry>
6361     + <base>PER_SERVICE_GEOIP</base>
6362     + <trans>sınırsız servis</trans>
6363     + </entry>
6364     +
6365     + <entry>
6366     + <base>ADD_SERVICE</base>
6367     + <trans>Add or modify a per service filtering</trans>
6368     + </entry>
6369     +
6370     + <entry>
6371     + <base>ADD_DESC</base>
6372     + <trans>You are choosing a particular country filtering for this service</trans>
6373     + </entry>
6374     +
6375     + <entry>
6376     + <base>REMOVE_SERVICE</base>
6377     + <trans>Delete a per service filtering</trans>
6378     + </entry>
6379     +
6380     + <entry>
6381     + <base>REMOVE_DESC</base>
6382     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
6383     + </entry>
6384     +
6385     + <entry>
6386     + <base>SERV_NOT_BAN</base>
6387     + <trans>sınırsız servis</trans>
6388     + </entry>
6389     +
6390     + <entry>
6391     + <base>NO_SERVICES</base>
6392     + <trans>sınırsız servis</trans>
6393     + </entry>
6394     +
6395     + <entry>
6396     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
6397     + <trans>List of rejected country codes for the service :</trans>
6398     + </entry>
6399     +
6400     + <entry>
6401     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
6402     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
6403     + </entry>
6404     +
6405     + <entry>
6406     + <base>BADCOUNTRIES</base>
6407     + <trans>liste</trans>
6408     + </entry>
6409     +
6410     + <entry>
6411     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
6412     + <trans>Too many countries chosen: {$ctr}</trans>
6413     + </entry>
6414     +
6415     + <entry>
6416     + <base>LABEL_REVERSE_MATCH</base>
6417     + <trans>Reddet</trans>
6418     + </entry>
6419     +
6420     + <entry>
6421     + <base>DESC_REVERSE_MATCH</base>
6422     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
6423     + </entry>
6424     +
6425     + <entry>
6426     + <base>LABEL_OTHERS</base>
6427     + <trans>General filter only for services without rules</trans>
6428     + </entry>
6429     +
6430     + <entry>
6431     + <base>DESC_OTHERS</base>
6432     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
6433     + </entry>
6434     +
6435     + <entry>
6436     + <base>SERVICE_LIST_DESCRIPTION</base>
6437     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
6438     + </entry>
6439     +
6440     + <entry>
6441     + <base>LABEL_SERVICE_LIST</base>
6442     + <trans>sınırsız servis</trans>
6443     + </entry>
6444     +
6445     + <entry>
6446     + <base>SERV_LIST</base>
6447     + <trans>List</trans>
6448     + </entry>
6449     +
6450     + <entry>
6451     + <base>DESC_AVAILABLE_SERVICES</base>
6452     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
6453     + </entry>
6454     +
6455     + <entry>
6456     + <base>LABEL_AVAILABLE_SERVICES</base>
6457     + <trans>Kurulabilir paketler</trans>
6458     + </entry>
6459     +
6460     +
6461     +</lexicon>
6462     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/xt_geoip
6463     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
6464     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
6465     @@ -0,0 +1,262 @@
6466     +<lexicon lang="zh-cn">
6467     +
6468     + <entry>
6469     + <base>FORM_TITLE</base>
6470     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
6471     + </entry>
6472     +
6473     + <entry>
6474     + <base>ERROR_UPDATING</base>
6475     + <trans>There was an error while updating xt_geoip.</trans>
6476     + </entry>
6477     +
6478     + <entry>
6479     + <base>SUCCESS</base>
6480     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
6481     +
6482     + </entry>
6483     +
6484     + <entry>
6485     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
6486     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
6487     + </entry>
6488     +
6489     + <entry>
6490     + <base>NO_CHANGE</base>
6491     + <trans>No change... no update !</trans>
6492     + </entry>
6493     +
6494     + <entry>
6495     + <base>LABEL_GEOIP_STATUS</base>
6496     + <trans>Current GEOIP filtering :</trans>
6497     + </entry>
6498     +
6499     + <entry>
6500     + <base>LABEL_GEOIP</base>
6501     + <trans>GEOIP filtering desired :</trans>
6502     + </entry>
6503     +
6504     + <entry>
6505     + <base>DESC_GEOIP</base>
6506     + <trans>Should filtering by country of origin be activated ?</trans>
6507     + </entry>
6508     +
6509     + <entry>
6510     + <base>ERROR_STATUS_GEOIP</base>
6511     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
6512     + </entry>
6513     +
6514     + <entry>
6515     + <base>LABEL_BADCOUNTRIES_STATUS</base>
6516     + <trans>Current list of banished country codes :</trans>
6517     + </entry>
6518     +
6519     + <entry>
6520     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
6521     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
6522     + </entry>
6523     +
6524     + <entry>
6525     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
6526     + <trans>Country code(s) maximum reached: {$ctr}</trans>
6527     + </entry>
6528     +
6529     + <entry>
6530     + <base>LABEL_BADCOUNTRIES</base>
6531     + <trans>New country codes to be used :</trans>
6532     + </entry>
6533     +
6534     + <entry>
6535     + <base>DESC_BADCOUNTRIES</base>
6536     + <trans>List of country codes (uppercase et comma-separated).</trans>
6537     + </entry>
6538     +
6539     + <entry>
6540     + <base>LABEL_DATE_UPDATE_STATUS</base>
6541     + <trans>Last update of GeoIP table :</trans>
6542     + </entry>
6543     +
6544     + <entry>
6545     + <base>LABEL_UPDATE</base>
6546     + <trans>Force the update of GeoIP table :</trans>
6547     + </entry>
6548     +
6549     + <entry>
6550     + <base>DESC_UPDATE</base>
6551     + <trans>GeoIP table is updated every week, but you can ...</trans>
6552     + </entry>
6553     +
6554     + <entry>
6555     + <base>IPT_LIST_DESCRIPTION</base>
6556     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
6557     + </entry>
6558     + <entry>
6559     + <base>IPT_LIST</base>
6560     + <trans>已过滤</trans>
6561     + </entry>
6562     +
6563     + <entry>
6564     + <base>SSH_LIST_DESCRIPTION</base>
6565     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
6566     + </entry>
6567     + <entry>
6568     + <base>SSH_LIST</base>
6569     + <trans>语法错误</trans>
6570     + </entry>
6571     +
6572     + <entry>
6573     + <base>STATS_GENERATED</base>
6574     + <trans>统计学,统计值</trans>
6575     + </entry>
6576     +
6577     + <entry>
6578     + <base>END_OF_STATS</base>
6579     + <trans>显示统计信息</trans>
6580     + </entry>
6581     +
6582     + <entry>
6583     + <base>INVALID_STATS_TYPE</base>
6584     + <trans>发送者统计</trans>
6585     + </entry>
6586     +
6587     + <entry>
6588     + <base>STATS_DESCRIPTION</base>
6589     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
6590     + </entry>
6591     +
6592     + <entry>
6593     + <base>COUNTRY_LIST_DESCRIPTION</base>
6594     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
6595     + </entry>
6596     +
6597     + <entry>
6598     + <base>LABEL_COUNTRY_LIST</base>
6599     + <trans>源代码</trans>
6600     + </entry>
6601     + <entry>
6602     + <base>COUNTRY_LIST</base>
6603     + <trans>源代码</trans>
6604     + </entry>
6605     +
6606     + <entry>
6607     + <base>CNTRY_LIST</base>
6608     + <trans>列表</trans>
6609     + </entry>
6610     +
6611     + <entry>
6612     + <base>END_OF_CODES</base>
6613     + <trans>结果的结尾。</trans>
6614     + </entry>
6615     +
6616     + <entry>
6617     + <base>SERVICE_DESCRIPTION</base>
6618     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
6619     + </entry>
6620     +
6621     + <entry>
6622     + <base>LABEL_SERVICE</base>
6623     + <trans>服务状态</trans>
6624     + </entry>
6625     +
6626     + <entry>
6627     + <base>PER_SERVICE_GEOIP</base>
6628     + <trans>服务状态</trans>
6629     + </entry>
6630     +
6631     + <entry>
6632     + <base>ADD_SERVICE</base>
6633     + <trans>添加或删除记录</trans>
6634     + </entry>
6635     +
6636     + <entry>
6637     + <base>ADD_DESC</base>
6638     + <trans>You are choosing a particular country filtering for this service</trans>
6639     + </entry>
6640     +
6641     + <entry>
6642     + <base>REMOVE_SERVICE</base>
6643     + <trans>Delete a per service filtering</trans>
6644     + </entry>
6645     +
6646     + <entry>
6647     + <base>REMOVE_DESC</base>
6648     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
6649     + </entry>
6650     +
6651     + <entry>
6652     + <base>SERV_NOT_BAN</base>
6653     + <trans>免费服务</trans>
6654     + </entry>
6655     +
6656     + <entry>
6657     + <base>NO_SERVICES</base>
6658     + <trans>Jabber服务</trans>
6659     + </entry>
6660     +
6661     + <entry>
6662     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
6663     + <trans>List of rejected country codes for the service :</trans>
6664     + </entry>
6665     +
6666     + <entry>
6667     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
6668     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
6669     + </entry>
6670     +
6671     + <entry>
6672     + <base>BADCOUNTRIES</base>
6673     + <trans>Blacklist</trans>
6674     + </entry>
6675     +
6676     + <entry>
6677     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
6678     + <trans>Too many countries chosen: {$ctr}</trans>
6679     + </entry>
6680     +
6681     + <entry>
6682     + <base>LABEL_REVERSE_MATCH</base>
6683     + <trans>拒绝</trans>
6684     + </entry>
6685     +
6686     + <entry>
6687     + <base>DESC_REVERSE_MATCH</base>
6688     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
6689     + </entry>
6690     +
6691     + <entry>
6692     + <base>LABEL_OTHERS</base>
6693     + <trans>General filter only for services without rules</trans>
6694     + </entry>
6695     +
6696     + <entry>
6697     + <base>DESC_OTHERS</base>
6698     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
6699     + </entry>
6700     +
6701     + <entry>
6702     + <base>SERVICE_LIST_DESCRIPTION</base>
6703     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
6704     + </entry>
6705     +
6706     + <entry>
6707     + <base>LABEL_SERVICE_LIST</base>
6708     + <trans>服务状态</trans>
6709     + </entry>
6710     +
6711     + <entry>
6712     + <base>SERV_LIST</base>
6713     + <trans>列表</trans>
6714     + </entry>
6715     +
6716     + <entry>
6717     + <base>DESC_AVAILABLE_SERVICES</base>
6718     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
6719     + </entry>
6720     +
6721     + <entry>
6722     + <base>LABEL_AVAILABLE_SERVICES</base>
6723     + <trans>可用的软件包</trans>
6724     + </entry>
6725     +
6726     +
6727     +</lexicon>
6728     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/zh-tw/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/zh-tw/etc/e-smith/web/functions/xt_geoip
6729     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/locale/zh-tw/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
6730     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/zh-tw/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
6731     @@ -0,0 +1,262 @@
6732     +<lexicon lang="zh-tw">
6733     +
6734     + <entry>
6735     + <base>FORM_TITLE</base>
6736     + <trans><![CDATA[XTABLES-ADDONS Administration<br>GeoIP ]]></trans>
6737     + </entry>
6738     +
6739     + <entry>
6740     + <base>ERROR_UPDATING</base>
6741     + <trans>There was an error while updating xt_geoip.</trans>
6742     + </entry>
6743     +
6744     + <entry>
6745     + <base>SUCCESS</base>
6746     + <trans>Successful change... Now IP filtering takes into account the countries entered.</trans>
6747     +
6748     + </entry>
6749     +
6750     + <entry>
6751     + <base>XT_GEOIP_STATUS_DESCRIPTION</base>
6752     + <trans><![CDATA[ <ul> <li>IP filtering can be enabled or disabled with the appropriate button</li> <li>Codes of the countries to be banished can be entered in the corresponding field</li> <li>An immediate update of the table can be requested here</li></ul> <p><i>Be careful not to ban the IP addresses needed to run your server !</i></p> ]]></trans>
6753     + </entry>
6754     +
6755     + <entry>
6756     + <base>NO_CHANGE</base>
6757     + <trans>No change... no update !</trans>
6758     + </entry>
6759     +
6760     + <entry>
6761     + <base>LABEL_GEOIP_STATUS</base>
6762     + <trans>Current GEOIP filtering :</trans>
6763     + </entry>
6764     +
6765     + <entry>
6766     + <base>LABEL_GEOIP</base>
6767     + <trans>GEOIP filtering desired :</trans>
6768     + </entry>
6769     +
6770     + <entry>
6771     + <base>DESC_GEOIP</base>
6772     + <trans>Should filtering by country of origin be activated ?</trans>
6773     + </entry>
6774     +
6775     + <entry>
6776     + <base>ERROR_STATUS_GEOIP</base>
6777     + <trans><![CDATA[ <font color="red">GEOIP filtering is <b>inactive</b></font> (iptables) ]]></trans>
6778     + </entry>
6779     +
6780     + <entry>
6781     + <base>LABEL_BADCOUNTRIES_STATUS</base>
6782     + <trans>Current list of banished country codes :</trans>
6783     + </entry>
6784     +
6785     + <entry>
6786     + <base>ERR_COUNTRY_NOT_EXIST: {$listerr}</base>
6787     + <trans>Country code(s) does not exist on the server: {$listerr}</trans>
6788     + </entry>
6789     +
6790     + <entry>
6791     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
6792     + <trans>Country code(s) maximum reached: {$ctr}</trans>
6793     + </entry>
6794     +
6795     + <entry>
6796     + <base>LABEL_BADCOUNTRIES</base>
6797     + <trans>New country codes to be used :</trans>
6798     + </entry>
6799     +
6800     + <entry>
6801     + <base>DESC_BADCOUNTRIES</base>
6802     + <trans>List of country codes (uppercase et comma-separated).</trans>
6803     + </entry>
6804     +
6805     + <entry>
6806     + <base>LABEL_DATE_UPDATE_STATUS</base>
6807     + <trans>Last update of GeoIP table :</trans>
6808     + </entry>
6809     +
6810     + <entry>
6811     + <base>LABEL_UPDATE</base>
6812     + <trans>Force the update of GeoIP table :</trans>
6813     + </entry>
6814     +
6815     + <entry>
6816     + <base>DESC_UPDATE</base>
6817     + <trans>GeoIP table is updated every week, but you can ...</trans>
6818     + </entry>
6819     +
6820     + <entry>
6821     + <base>IPT_LIST_DESCRIPTION</base>
6822     + <trans><![CDATA[<ul><li>Click here to see the statistics of the prevented connections</li></ul> ]]></trans>
6823     + </entry>
6824     + <entry>
6825     + <base>IPT_LIST</base>
6826     + <trans>過濾</trans>
6827     + </entry>
6828     +
6829     + <entry>
6830     + <base>SSH_LIST_DESCRIPTION</base>
6831     + <trans><![CDATA[<ul><li>Click here to see the statistics of SSH errors for non blocked access</li></ul> ]]></trans>
6832     + </entry>
6833     + <entry>
6834     + <base>SSH_LIST</base>
6835     + <trans>語法錯誤</trans>
6836     + </entry>
6837     +
6838     + <entry>
6839     + <base>STATS_GENERATED</base>
6840     + <trans>統計</trans>
6841     + </entry>
6842     +
6843     + <entry>
6844     + <base>END_OF_STATS</base>
6845     + <trans>顯示統計</trans>
6846     + </entry>
6847     +
6848     + <entry>
6849     + <base>INVALID_STATS_TYPE</base>
6850     + <trans>寄件人統計</trans>
6851     + </entry>
6852     +
6853     + <entry>
6854     + <base>STATS_DESCRIPTION</base>
6855     + <trans><![CDATA[<HR class="sme-copyrightbar"> <h3>Statistics for Xt_GeoIP</h3><ul> <li>For 3 periods : Day, Week and Month</li> <li>Banned Ips by country sorted by number</li> <li>Ssh errors by country sorted by number</li> </ul><p><i>XX means Country not found !</i></p> ]]></trans>
6856     + </entry>
6857     +
6858     + <entry>
6859     + <base>COUNTRY_LIST_DESCRIPTION</base>
6860     + <trans><![CDATA[<ul> <li>Click here to see a <b>list of available country codes</b></li> </ul> ]]></trans>
6861     + </entry>
6862     +
6863     + <entry>
6864     + <base>LABEL_COUNTRY_LIST</base>
6865     + <trans>源代碼</trans>
6866     + </entry>
6867     + <entry>
6868     + <base>COUNTRY_LIST</base>
6869     + <trans>源代碼</trans>
6870     + </entry>
6871     +
6872     + <entry>
6873     + <base>CNTRY_LIST</base>
6874     + <trans>列表</trans>
6875     + </entry>
6876     +
6877     + <entry>
6878     + <base>END_OF_CODES</base>
6879     + <trans>結果的結尾。</trans>
6880     + </entry>
6881     +
6882     + <entry>
6883     + <base>SERVICE_DESCRIPTION</base>
6884     + <trans><![CDATA[ <h2> Per service filtering for Xtables GeoIP</h2><ul> <li>If you want different filtering based on services</li> </ul><p><i></i></p> ]]></trans>
6885     + </entry>
6886     +
6887     + <entry>
6888     + <base>LABEL_SERVICE</base>
6889     + <trans>服務狀態</trans>
6890     + </entry>
6891     +
6892     + <entry>
6893     + <base>PER_SERVICE_GEOIP</base>
6894     + <trans>服務狀態</trans>
6895     + </entry>
6896     +
6897     + <entry>
6898     + <base>ADD_SERVICE</base>
6899     + <trans>增加或修正一筆紀錄。</trans>
6900     + </entry>
6901     +
6902     + <entry>
6903     + <base>ADD_DESC</base>
6904     + <trans>You are choosing a particular country filtering for this service</trans>
6905     + </entry>
6906     +
6907     + <entry>
6908     + <base>REMOVE_SERVICE</base>
6909     + <trans>Delete a per service filtering</trans>
6910     + </entry>
6911     +
6912     + <entry>
6913     + <base>REMOVE_DESC</base>
6914     + <trans>You are deleting a filtering by service. The general filtering will then apply.</trans>
6915     + </entry>
6916     +
6917     + <entry>
6918     + <base>SERV_NOT_BAN</base>
6919     + <trans>無過濾</trans>
6920     + </entry>
6921     +
6922     + <entry>
6923     + <base>NO_SERVICES</base>
6924     + <trans>Jabber服務</trans>
6925     + </entry>
6926     +
6927     + <entry>
6928     + <base>LABEL_SERV_BADCOUNTRIES_STATUS</base>
6929     + <trans>List of rejected country codes for the service :</trans>
6930     + </entry>
6931     +
6932     + <entry>
6933     + <base>SUCCESSFULLY_DELETED_SERVICE</base>
6934     + <trans>Per service filtering successfully deleted... New filtering taken into account.</trans>
6935     + </entry>
6936     +
6937     + <entry>
6938     + <base>BADCOUNTRIES</base>
6939     + <trans>黑名單</trans>
6940     + </entry>
6941     +
6942     + <entry>
6943     + <base>ERR_COUNTRY_MAX: {$ctr}</base>
6944     + <trans>Too many countries chosen: {$ctr}</trans>
6945     + </entry>
6946     +
6947     + <entry>
6948     + <base>LABEL_REVERSE_MATCH</base>
6949     + <trans>拒絕</trans>
6950     + </entry>
6951     +
6952     + <entry>
6953     + <base>DESC_REVERSE_MATCH</base>
6954     + <trans>The following option allow to chose if you want reject visitors from the country list (==) which is the default behaviour, or if you want to only let them in (!=).</trans>
6955     + </entry>
6956     +
6957     + <entry>
6958     + <base>LABEL_OTHERS</base>
6959     + <trans>General filter only for services without rules</trans>
6960     + </entry>
6961     +
6962     + <entry>
6963     + <base>DESC_OTHERS</base>
6964     + <trans>Choose if you want to have the general filter to apply to all incoming connections or if you do not want to filter ports already defined with a specific service rule. This would allow you to have a service less restricted than the general rule if you enable this.</trans>
6965     + </entry>
6966     +
6967     + <entry>
6968     + <base>SERVICE_LIST_DESCRIPTION</base>
6969     + <trans><![CDATA[<ul> <li>Click here to select <b>new </b>services among an <b>available services list</b></li> </ul> ]]></trans>
6970     + </entry>
6971     +
6972     + <entry>
6973     + <base>LABEL_SERVICE_LIST</base>
6974     + <trans>服務狀態</trans>
6975     + </entry>
6976     +
6977     + <entry>
6978     + <base>SERV_LIST</base>
6979     + <trans>列表</trans>
6980     + </entry>
6981     +
6982     + <entry>
6983     + <base>DESC_AVAILABLE_SERVICES</base>
6984     + <trans><![CDATA[ <h2> New Services selection</h2> <ul><li>Select here among the other services not yet managed individually. </li><li>You may select one or more elements. Generally <b>enabled and public</b> ones. </li></ul> ]]></trans>
6985     + </entry>
6986     +
6987     + <entry>
6988     + <base>LABEL_AVAILABLE_SERVICES</base>
6989     + <trans>可用套件</trans>
6990     + </entry>
6991     +
6992     +
6993     +</lexicon>
6994     diff -urN smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/web/functions/xt_geoip smeserver-xt_geoip-1.3.1/root/etc/e-smith/web/functions/xt_geoip
6995     --- smeserver-xt_geoip-1.3.1.old/root/etc/e-smith/web/functions/xt_geoip 1970-01-01 04:00:00.000000000 +0400
6996     +++ smeserver-xt_geoip-1.3.1/root/etc/e-smith/web/functions/xt_geoip 2020-06-07 23:12:41.000000000 +0400
6997     @@ -0,0 +1,308 @@
6998     +#!/usr/bin/perl -wT
6999     +# vim: set ft=xml:
7000     +
7001     +#----------------------------------------------------------------------
7002     +# heading : Security
7003     +# description : GeoIP IP filtering
7004     +# navigation : 5000 5610
7005     +#----------------------------------------------------------------------
7006     +# copyright (C) 2007 Mitel Networks Corporation
7007     +#
7008     +# This program is free software; you can redistribute it and/or modify
7009     +# it under the terms of the GNU General Public License as published by
7010     +# the Free Software Foundation; either version 2 of the License, or
7011     +# (at your option) any later version.
7012     +#
7013     +# This program is distributed in the hope that it will be useful,
7014     +# but WITHOUT ANY WARRANTY; without even the implied warranty of
7015     +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7016     +# GNU General Public License for more details.
7017     +#
7018     +# You should have received a copy of the GNU General Public License
7019     +# along with this program; if not, write to the Free Software
7020     +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
7021     +#
7022     +# Technical support for this program is available from Mitel Networks
7023     +# Please visit our web site www.mitel.com/sme/ for details.
7024     +#----------------------------------------------------------------------
7025     +
7026     +use strict;
7027     +use warnings;
7028     +use esmith::FormMagick::Panel::xt_geoip;
7029     +
7030     +my $f = esmith::FormMagick::Panel::xt_geoip->new();
7031     +$f->display();
7032     +
7033     +=head1
7034     +=cut
7035     +=begin testing
7036     +
7037     +use esmith::FormMagick::Tester;
7038     +use esmith::TestUtils;
7039     +use esmith::ConfigDB;
7040     +use esmith::AccountsDB;
7041     +
7042     +my $panel = $Original_File;
7043     +my $ua = esmith::FormMagick::Tester->new();
7044     +
7045     +my $c = esmith::ConfigDB->open();
7046     +my $a = esmith::AccountsDB->open();
7047     +
7048     +is (mode($panel), '4750', "Check permissions on script");
7049     +ok ($ua->get_panel($panel), "ABOUT TO RUN L10N TESTS");
7050     +is ($ua->{status}, 200, "200 OK");
7051     +#like($ua->{content}, qr/FORM_TITLE/, "Saw untranslated form title");
7052     +ok ($ua->set_language("en-us"), "Set language to U.S. English");
7053     +ok ($ua->get_panel($panel), "Get panel");
7054     +is ($ua->{status}, 200, "200 OK");
7055     +like($ua->{content}, qr/xt_geoip Admin/, "Saw translated form title");
7056     +
7057     +=end testing
7058     +
7059     +=cut
7060     +
7061     +__DATA__
7062     +<form
7063     + title="FORM_TITLE"
7064     + header="/etc/e-smith/web/common/head.tmpl"
7065     + footer="/etc/e-smith/web/common/foot.tmpl">
7066     +
7067     + <page name="First" pre-event="print_status_message()">
7068     + # post-event="wherenext('Second')"
7069     + <description>XT_GEOIP_STATUS_DESCRIPTION</description>
7070     +
7071     + <field
7072     + type="literal"
7073     + id="geoip"
7074     + value="get_geoip()">
7075     + <label>LABEL_GEOIP_STATUS</label>
7076     + </field>
7077     +
7078     + <field
7079     + type="literal"
7080     + id="badcountries"
7081     + value="get_badcountries(1)">
7082     + <label>LABEL_BADCOUNTRIES_STATUS</label>
7083     + </field>
7084     +
7085     + <field
7086     + type="literal"
7087     + id="date_update"
7088     + value="get_date_update()">
7089     + <label>LABEL_DATE_UPDATE_STATUS</label>
7090     + </field>
7091     +
7092     + <field
7093     + type="literal"
7094     + id="stat_geoip"
7095     + value="get_stat_geoip()">
7096     + <label> </label>
7097     + </field>
7098     +
7099     + <field
7100     + type="literal"
7101     + id="stat_license"
7102     + value="get_stat_license_key()">
7103     + <label> </label>
7104     + </field>
7105     +
7106     +
7107     + <field type="literal" id="country_list_label" value="">
7108     + <description>COUNTRY_LIST_DESCRIPTION</description>
7109     + </field>
7110     + <subroutine src="print_custom_button('CNTRY_LIST', 'Codes', '')"/>
7111     +
7112     +
7113     + <subroutine src="print_button('NEXT')" />
7114     +
7115     +
7116     + <field type="literal" id="service_label" value="">
7117     + <description>SERVICE_DESCRIPTION</description>
7118     + </field>
7119     + <subroutine src="print_service_table()" />
7120     +
7121     +
7122     + <field type="literal" id="service_list_label" value="">
7123     + <description>SERVICE_LIST_DESCRIPTION</description>
7124     + </field>
7125     + <subroutine src="print_custom_button('SERV_LIST', 'Services', '')"/>
7126     +
7127     +
7128     +
7129     + <field type="literal" id="stats_label" value="">
7130     + <description>STATS_DESCRIPTION</description>
7131     + </field>
7132     +
7133     + <field type="literal" id="ipt_list_label" value="">
7134     + <description>IPT_LIST_DESCRIPTION</description>
7135     + </field>
7136     + <subroutine src="print_custom_button('IPT_LIST', 'Stats', 'ipt')"/>
7137     +
7138     + <field type="literal" id="ssh_list_label" value="">
7139     + <description>SSH_LIST_DESCRIPTION</description>
7140     + </field>
7141     + <subroutine src="print_custom_button('SSH_LIST', 'Stats', 'ssh')"/>
7142     +
7143     + </page>
7144     +
7145     +
7146     +
7147     + <page name="Second" pre-event="turn_off_buttons" post-event="change_settings()">
7148     +
7149     + <field
7150     + type="select"
7151     + id="masq_geoip"
7152     + options="'enabled' => 'YES', 'disabled' => 'NO'"
7153     + value="get_geoip()">
7154     + <label>LABEL_GEOIP</label>
7155     + <description>DESC_GEOIP</description>
7156     + </field>
7157     +
7158     + <field
7159     + type="select"
7160     + id="masq_reverse"
7161     + options="'enabled' => '!=', 'disabled' => '=='"
7162     + value="get_reverse('masq','XTGeoipRev')">
7163     + <label>LABEL_REVERSE_MATCH</label>
7164     + <description>DESC_REVERSE_MATCH</description>
7165     + </field>
7166     +
7167     + <field
7168     + type="text"
7169     + id="masq_badcountries"
7170     + size="64"
7171     + value="get_badcountries(0)"
7172     + validation="must_exist()">
7173     + <label>LABEL_BADCOUNTRIES</label>
7174     + <description>DESC_BADCOUNTRIES</description>
7175     + </field>
7176     +
7177     + <field
7178     + type="literal"
7179     + id="badcountries"
7180     + value="get_badcountries(1)">
7181     + <label>LABEL_BADCOUNTRIES_STATUS</label>
7182     + </field>
7183     +
7184     + <field
7185     + type="select"
7186     + id="masq_others"
7187     + options="'enabled' => 'enabled', 'disabled' => 'disabled'"
7188     + value="get_reverse('masq','XTGeoipOther')">
7189     + <label>LABEL_OTHERS</label>
7190     + <description>DESC_OTHERS</description>
7191     + </field>
7192     +
7193     + <field
7194     + type="select"
7195     + id="update_geoip"
7196     + options="'NO', 'YES'"
7197     + value="'NO'">
7198     + <label>LABEL_UPDATE</label>
7199     + <description>DESC_UPDATE</description>
7200     + </field>
7201     +
7202     + <subroutine src="print_button('SAVE')" />
7203     +
7204     + </page>
7205     +
7206     +
7207     +
7208     + <page name="SrvModify" pre-event="turn_off_buttons()" post-event="modify_serv()">
7209     +
7210     + <title>ADD_SERVICE</title>
7211     + <description>ADD_DESC</description>
7212     +
7213     + <field
7214     + type="literal"
7215     + id="service"
7216     + value="get_srv_name()">
7217     + <label>LABEL_SERVICE</label>
7218     + </field>
7219     +
7220     + <field
7221     + type="literal"
7222     + id="badcountries"
7223     + value="get_badcountries(1)">
7224     + <label>LABEL_BADCOUNTRIES_STATUS</label>
7225     + </field>
7226     +
7227     + <field
7228     + type="select"
7229     + id="masq_srv_reverse"
7230     + options="'enabled' => '!=', 'disabled' => '=='"
7231     + value="get_reverse('','XTGeoipRev')">
7232     + <label>LABEL_REVERSE_MATCH</label>
7233     + <description>DESC_REVERSE_MATCH</description>
7234     + </field>
7235     +
7236     + <field
7237     + type="text"
7238     + id="masq_srv_badcountries"
7239     + size="64"
7240     + value="get_srv_badcountries(0)"
7241     + validation="srv_must_exist()">
7242     + <label>LABEL_BADCOUNTRIES</label>
7243     + <description>DESC_BADCOUNTRIES</description>
7244     + </field>
7245     +
7246     + <field
7247     + type="literal"
7248     + id="srv_badcountries"
7249     + value="get_srv_badcountries(1)">
7250     + <label>LABEL_SERV_BADCOUNTRIES_STATUS</label>
7251     + </field>
7252     +
7253     + <subroutine src="print_button('SAVE')" />
7254     + </page>
7255     +
7256     +
7257     + <page name="SrvRemove" pre-event="turn_off_buttons()" post-event="remove_serv()">
7258     +
7259     + <title>REMOVE_SERVICE</title>
7260     + <description>REMOVE_DESC</description>
7261     +
7262     + <field
7263     + type="literal"
7264     + id="service"
7265     + value="get_srv_name()">
7266     + <label>LABEL_SERVICE</label>
7267     + </field>
7268     +
7269     + <field
7270     + type="literal"
7271     + id="badcountries"
7272     + value="get_srv_badcountries()">
7273     + <label>LABEL_SERV_BADCOUNTRIES_STATUS</label>
7274     + </field>
7275     +
7276     + <subroutine src="print_button('REMOVE')" />
7277     +
7278     + </page>
7279     +
7280     +
7281     + <page name="Stats" pre-event="generateStats" post-event="wherenext('First')">
7282     + <subroutine src="print_button('NEXT')"/>
7283     + </page>
7284     +
7285     +
7286     + <page name="Codes" pre-event="generateCodes" post-event="wherenext('First')">
7287     + <subroutine src="print_button('NEXT')"/>
7288     + </page>
7289     +
7290     + <page name="Services" pre-event="turn_off_buttons()" post-event="do_otherServices()">
7291     + <field
7292     + type="select" multiple="1"
7293     + id="SelectedServices"
7294     + value="otherServices('sel')"
7295     + options="otherServices('all')">
7296     + <label>LABEL_AVAILABLE_SERVICES</label>
7297     + <description>DESC_AVAILABLE_SERVICES</description>
7298     + </field>
7299     +
7300     + <subroutine src="print_button('NEXT')"/>
7301     + </page>
7302     +
7303     +
7304     +
7305     +</form>
7306     diff -urN smeserver-xt_geoip-1.3.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm smeserver-xt_geoip-1.3.1/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm
7307     --- smeserver-xt_geoip-1.3.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm 1970-01-01 04:00:00.000000000 +0400
7308     +++ smeserver-xt_geoip-1.3.1/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm 2021-01-06 17:24:43.041000000 +0400
7309     @@ -0,0 +1,596 @@
7310     +#!/usr/bin/perl -w
7311     +
7312     +#-------------------------------------------
7313     +# Copyright (c) Michel Begue 2017
7314     +# Xt_GeoIP Administration panel
7315     +#-------------------------------------------
7316     +package esmith::FormMagick::Panel::xt_geoip;
7317     +
7318     +use strict;
7319     +#use warnings;
7320     +use esmith::FormMagick;
7321     +use esmith::ConfigDB;
7322     +use esmith::util;
7323     +use esmith::cgi;
7324     +use File::Basename;
7325     +use Exporter;
7326     +use POSIX qw(strftime);
7327     +
7328     +our @ISA = qw(esmith::FormMagick Exporter);
7329     +
7330     +our @EXPORT = qw(
7331     + otherServices
7332     + do_otherServices
7333     + get_prop
7334     + get_value
7335     + get_badcountries
7336     + get_geoip
7337     + get_stat_license_key
7338     + get_reverse
7339     + print_service_table
7340     + get_stat_geoip
7341     + print_custom_button
7342     + generateStats
7343     + get_srv_name
7344     + get_srv_badcountries
7345     + remove_serv
7346     + modify_serv
7347     + srv_must_exist
7348     + get_date_update
7349     + change_settings
7350     + must_exist
7351     +);
7352     +
7353     +our $VERSION = sprintf '%d.%03d', q$Revision: 0.01 $ =~ /: (\d+).(\d+)/;
7354     +
7355     +our $db = esmith::ConfigDB->open || die "Couldn't open ConfigDB\n";
7356     +
7357     +=pod
7358     +
7359     +=head1 NAME
7360     +
7361     +esmith::FormMagick::Panels::xt_geoip - Panel providing countries codes,
7362     +enable and update base actions.
7363     +
7364     +=head1 SYNOPSYS
7365     +
7366     + use esmith::FormMagick::Panel::xt_geoip;
7367     +
7368     + my $panel = esmith::FormMagick::Panel::xt_geoip->new;
7369     + $panel->display();
7370     +
7371     +=head1 DESCRIPTION
7372     +
7373     +xt_geoip (xtables-addons geoip) install a base of IPs by country.
7374     + This panel provides a 'non-commandline' form to enter selected countries codes
7375     +for filtering, to enable-disable the fonctionnality and update the base of IPs.
7376     +
7377     +
7378     +=cut
7379     +
7380     +# {{{ new
7381     +
7382     +=head2 new()
7383     +
7384     +Exactly as for esmith::FormMagick
7385     +
7386     +=begin testing
7387     +
7388     +$ENV{ESMITH_CONFIG_DB} = "10e-smith-base/configuration.conf"
7389     +
7390     +use_ok('esmith::FormMagick::Panel::xt_geoip');
7391     +use vars qw($panel);
7392     +ok($panel = esmith::FormMagick::Panel::xt_geoip->new(), "Create panel object");
7393     +isa_ok($panel, 'esmith::FormMagick::Panel::xt_geoip');
7394     +
7395     +=end testing
7396     +
7397     +=cut
7398     +
7399     +
7400     +
7401     +sub new
7402     +{
7403     + shift;
7404     + my $self = esmith::FormMagick->new();
7405     + $self->{calling_package} = (caller)[0];
7406     + bless $self;
7407     +# $self->debug(1);
7408     + return $self;
7409     +}
7410     +
7411     +=head2 get_prop
7412     +
7413     +=cut
7414     +
7415     +sub get_prop
7416     +{
7417     + my $fm = shift if (ref($_[0]) );
7418     + my $item = shift;
7419     + my $prop = shift;
7420     +
7421     + my $record = $db->get($item);
7422     + if ($record) {
7423     + return $record->prop($prop);
7424     + }
7425     + else {
7426     + return '';
7427     + }
7428     +}
7429     +
7430     +=head2 get_value
7431     +
7432     +=cut
7433     +
7434     +sub get_value
7435     +{
7436     + my $fm = shift;
7437     + my $item = shift;
7438     + my $record = $db->get($item);
7439     + #return ($db->get("masq")->prop($item));
7440     + if ($record) {
7441     + return $record->value();
7442     + }
7443     + else {
7444     + return '';
7445     + }
7446     +}
7447     +
7448     +=head2 get_badcountries
7449     +
7450     +method to retrieve the value of "badcountries" for the form
7451     +=cut
7452     +
7453     +sub get_badcountries
7454     +{
7455     + my $self = shift;
7456     + my $full = shift;
7457     + my $badc=$db->get_prop("masq", "BadCountries")||"";
7458     + return $badc unless $full ;
7459     + my $rev = (($db->get_prop("masq", "XTGeoipRev")||"disabled") eq "enabled") ? "!=" : "==";
7460     + return "$rev $badc ";
7461     +}
7462     +
7463     +=head2 get_geoip
7464     +
7465     +method to retrieve the value of geoip for the form
7466     +=cut
7467     +
7468     +sub get_geoip
7469     +{
7470     + return $db->get_prop("masq", "GeoIP") || 'disabled';
7471     +}
7472     +
7473     +=head2 get_reverse
7474     +
7475     +method to retrieve the value of geoip for the form
7476     +=cut
7477     +
7478     +sub get_reverse
7479     +{
7480     + my $fm = shift;
7481     + my $item = shift;
7482     + my $prop = shift;
7483     + $item = ($item eq 'masq') ? $item : $fm->cgi->param('name');
7484     + return $db->get_prop("$item", "$prop") || "disabled";
7485     +}
7486     +
7487     +=head2 get_stat_geoip
7488     +
7489     +method to retrieve the status of geoip for the form
7490     +=cut
7491     +
7492     +sub get_stat_geoip
7493     +{
7494     + my $fm = shift;
7495     + if ( get_geoip() eq 'enabled' && system ( "/sbin/iptables -L -n | grep 'GeoIP' > /dev/null") != 0 ) {
7496     + return $fm->localise('ERROR_STATUS_GEOIP');
7497     + } else {
7498     + return '';
7499     + }
7500     +}
7501     +
7502     +=head2 get_stat_license_key
7503     +
7504     +method to retrieve the status of geoip license_key for the site
7505     +=cut
7506     +
7507     +sub get_stat_license_key {
7508     +
7509     + my $fm = shift;
7510     + if ((get_prop( 'geoip','status' ) || 'disabled') eq 'enabled' ) {
7511     + if ( (get_prop( 'geoip','LicenseKey' ) || '') ne '' ) {
7512     + return '';
7513     + }
7514     + }
7515     + return $fm->localise('ERROR_LICENSE_KEY');
7516     +
7517     +}
7518     +
7519     +=head2 get_date_update
7520     +=cut
7521     +
7522     +sub get_date_update
7523     +{
7524     + my $file = "/usr/share/xt_geoip/LE/A1.iv4";
7525     + my $filetime = ( -e $file ) ? (stat($file))[9] : 0;
7526     + return strftime("%Y/%m/%d %H:%M", localtime( $filetime )) || '';
7527     +}
7528     +
7529     +=head2 change_settings
7530     +
7531     +Sub to change settings as per user input in the panel
7532     +=cut
7533     +
7534     +sub change_settings
7535     +{
7536     + my $self = shift;
7537     + my $q = $self->{'cgi'};
7538     +
7539     + my $mq_bc = get_badcountries();
7540     + my $mq_gp = get_geoip();
7541     + my $masq = $db->get('masq') || "disabled";
7542     + my $mq_rv = $masq->prop('XTGeoipRev') || 'disabled';
7543     + my $mq_ot = $masq->prop('XTGeoipOther') || 'disabled';
7544     +
7545     + my $n_mq_bc = $q->param("masq_badcountries");
7546     + my $n_mq_gp = $q->param("masq_geoip") || $mq_gp;
7547     + my $n_upd_gp = $q->param("update_geoip") || '';
7548     + my $n_mq_rv = $q->param("masq_reverse") || $mq_rv ;
7549     + my $n_mq_ot = $q->param("masq_others") || $mq_ot ;
7550     +
7551     + if (($n_mq_bc eq $mq_bc) && ($n_mq_gp eq $mq_gp) && ($n_upd_gp eq 'NO') && ($n_mq_rv eq $mq_rv) && ($n_mq_ot eq $mq_ot)) {
7552     + return $self->success("NO_CHANGE")
7553     + }
7554     + $db->set_prop("masq", "BadCountries", $n_mq_bc);
7555     + $db->set_prop("masq", "GeoIP", $n_mq_gp);
7556     + $db->set_prop("masq", "XTGeoipRev", $n_mq_rv);
7557     + $db->set_prop("masq", "XTGeoipOther", $n_mq_ot);
7558     +
7559     + my $eventloc = "xt_geoip-modify";
7560     + $eventloc = "xt_geoip-update" if $n_upd_gp eq 'YES';
7561     +
7562     + unless ( system ( "/sbin/e-smith/signal-event", $eventloc ) == 0 )
7563     + {
7564     + $self->error("ERROR_UPDATING");
7565     + return undef;
7566     + }
7567     + return $self->success("SUCCESS");
7568     +}
7569     +
7570     +
7571     +=head2 valid_badcountries
7572     +
7573     +subroutine to validate countries.
7574     +=cut
7575     +
7576     +sub must_exist
7577     +{
7578     + my $self = shift;
7579     + my $q = $self->{cgi};
7580     + my $listerr = "";
7581     + my @mq_bcs = split /[,:]/, $q->param("masq_badcountries");
7582     + if (@mq_bcs) {
7583     + my $ctr = @mq_bcs;
7584     + return $self->localise('ERROR_COUNTRY_MAX: {$ctr}', {ctr=> "$ctr"}) if ($ctr > 50);
7585     +
7586     + foreach my $bcs (@mq_bcs) {
7587     + my $file = "/usr/share/xt_geoip/LE/" . $bcs . ".iv4";
7588     + if (! -f $file) { $listerr .= $bcs . ","; }
7589     + }
7590     + return $self->localise('ERR_COUNTRY_NOT_EXIST: {$listerr}', {listerr=> "$listerr"}) if $listerr;
7591     + }
7592     + return 'OK';
7593     +}
7594     +
7595     +#Subroutine to display buttons
7596     +sub print_custom_button
7597     +{
7598     + my ($fm,$desc,$url,$type) = @_;
7599     + my $q = $fm->{cgi};
7600     + $url="xt_geoip?page=0&page_stack=&Next=Next&type=".$type."&wherenext=".$url;
7601     + print " <tr>\n <td colspan='2'>\n";
7602     + print $q->p($q->a({href => $url, -class => "button-like"},$fm->localise($desc)));
7603     + print qq(</tr>\n);
7604     + return undef;
7605     +}
7606     +
7607     +#Subroutine to list statistics
7608     +sub generateStats
7609     +{
7610     + my $self = shift;
7611     + my $q = $self->{cgi};
7612     +
7613     + $self->turn_off_buttons();
7614     +
7615     + # Untaint $name before use in system()
7616     + my $stats_type = $q->param ('type');
7617     + $stats_type =~ /(.+)/; $stats_type = $1;
7618     + if ($stats_type ne "ipt" && $stats_type ne "ssh")
7619     + {
7620     + print $q->p($q->b($self->localise('INVALID_STATS_TYPE')." ".
7621     + $stats_type));
7622     + return '';
7623     + } else {
7624     + # my $now_string = $self->gen_locale_date_string();
7625     + my $file = "/var/lib/xt_geoip/extA_" . $stats_type . "_country.lst";
7626     + my $filetime = ( -e $file ) ? (stat($file))[9] : 0;
7627     + my $date_string = strftime("%Y/%m/%d %H:%M", localtime( $filetime )) || '';
7628     + print $q->h3($self->localise('STATS_GENERATED'), "[", $stats_type, "]", $date_string);
7629     +
7630     + open( XTGEOIPSTATS, $file );
7631     + print "<pre>\n";
7632     +
7633     + while (<XTGEOIPSTATS>)
7634     + {
7635     + print;
7636     + }
7637     +
7638     + close XTGEOIPSTATS;
7639     + print "</pre>\n";
7640     +
7641     + print $q->h3($self->localise('END_OF_STATS'));
7642     + #$self->wherenext('First');
7643     + return '';
7644     + }
7645     +}
7646     +
7647     +sub get_srv_name
7648     +{
7649     + my ($self) = @_;
7650     + return $self->cgi->param('name');
7651     +}
7652     +
7653     +sub get_srv_badcountries
7654     +{
7655     + my $self = shift;
7656     + my $name = $self->cgi->param('name');
7657     + my $full = shift;
7658     + my $badc=$db->get_prop($name, "BadCountries")||"";
7659     + return $badc unless $full ;
7660     + my $rev = (($db->get_prop($name, "XTGeoipRev")||"disabled") eq "enabled") ? "!=" : "==";
7661     + return "$rev $badc ";
7662     +}
7663     +
7664     +sub print_service_table {
7665     + my $self = shift;
7666     + my $q = $self->{cgi};
7667     + my $servname = $self->localise('NAME');
7668     + my $port = $self->localise('PORT');
7669     + my $status = $self->localise('STATUS');
7670     + my $access = $self->localise('ACCESS');
7671     + my $servBC = $self->localise('BADCOUNTRIES');
7672     + my $modify = $self->localise('MODIFY');
7673     + my $remove = $self->localise('REMOVE');
7674     + my $action_h = $self->localise('ACTION');
7675     +
7676     + my @services = split(/,/, $db->get_prop("masq", "XtServices"));
7677     + #my @services = ('imaps','pop3s','sshd','ftp','ssmtpd');
7678     +
7679     + unless ( scalar @services )
7680     + {
7681     + print $q->Tr($q->td($self->localise('NO_SERVICES')));
7682     + return "";
7683     + }
7684     +
7685     + print $q->start_table({-CLASS => "sme-border"}),"\n";
7686     + print $q->Tr (
7687     + esmith::cgi::genSmallCell($q, $servname,"header"),
7688     + esmith::cgi::genSmallCell($q, $port,"header"),
7689     + esmith::cgi::genSmallCell($q, $status,"header"),
7690     + esmith::cgi::genSmallCell($q, $access,"header"),
7691     + esmith::cgi::genSmallCell($q, $servBC,"header"),
7692     + esmith::cgi::genSmallCell($q, $action_h,"header", 2)),"\n";
7693     +
7694     + my $scriptname = basename($0);
7695     +
7696     + foreach my $servname (@services)
7697     + {
7698     + my $i = $db->get($servname);
7699     + next if not defined $i;
7700     +
7701     + my $port = $i->prop('TCPPort');
7702     + my $status = $i->prop('status');
7703     + my $access = $i->prop('access');
7704     + my $servBC = $i->prop('BadCountries') || ' ';
7705     + my $servRev = (( $i->prop('XTGeoipRev')|| 'disabled') eq 'disabled' )? '==': '!=';
7706     +
7707     + my $params = $self->build_serv_cgi_params($servname, $i->props());
7708     +
7709     + my $href = "$scriptname?$params&action=modify&wherenext=";
7710     +
7711     + my $actionModify = '&nbsp;';
7712     + $actionModify .= $q->a({href => "${href}SrvModify"},$modify)
7713     + . '&nbsp;';
7714     +
7715     + my $actionRemove = '&nbsp;';
7716     + $actionRemove .= $q->a({href => "${href}SrvRemove"}, $remove)
7717     + . '&nbsp';
7718     +
7719     + my $color = 'red';
7720     + my $deco= "none";
7721     + if ($servRev eq '!=' ) { $color = 'green'; }
7722     + if ($status eq 'disabled' || $access ne 'public') { $color = 'grey'; $deco= "line-through"; }
7723     + print $q->Tr (
7724     + esmith::cgi::genSmallCell($q, $servname,"normal"),
7725     + esmith::cgi::genSmallCell($q, $port,"normal"),
7726     + esmith::cgi::genSmallCell($q, $status,"normal"),
7727     + esmith::cgi::genSmallCell($q, $access,"normal"),
7728     + esmith::cgi::genSmallCell($q, "<font color='$color' style='text-decoration: $deco'>" . "$servRev $servBC" . "</font>","normal"),
7729     + esmith::cgi::genSmallCell($q, $actionModify,"normal"),
7730     + esmith::cgi::genSmallCell($q, $actionRemove,"normal"));
7731     + }
7732     +
7733     + print $q->end_table,"\n";
7734     +
7735     + return "";
7736     +}
7737     +
7738     +sub build_serv_cgi_params {
7739     + my ($self, $servname, %oldprops) = @_;
7740     +
7741     + my %props = (
7742     + page => 0,
7743     + page_stack => "",
7744     + name => $servname,
7745     + );
7746     +
7747     + return $self->props_to_query_string(\%props);
7748     +}
7749     +
7750     +sub remove_serv {
7751     + my ($self) = @_;
7752     + my $name = $self->cgi->param('name');
7753     + if (my $serv = $db->get($name)) {
7754     + my $servBC = $serv->prop('BadCountries') || '';
7755     + if ($servBC ne '') {
7756     + my $tps = $db->set_prop_and_delete($name, "BadCountries");
7757     + $tps = $db->get_prop_and_delete($name, "XTGeoipRev");
7758     + # Untaint $name before use in system()
7759     + # $name =~ /(.+)/; $name = $1;
7760     + if (system ("/sbin/e-smith/signal-event", "xt_geoip-service") == 0)
7761     + {
7762     + return $self->success("SUCCESSFULLY_DELETED_SERVICE");
7763     + } else {
7764     + return $self->error("ERROR_WHILE_DELETING_SERVICE");
7765     + }
7766     + } else {
7767     + return $self->success('NO_CHANGE');
7768     + }
7769     +
7770     + } else {
7771     + $self->error('CANT_FIND_SERV');
7772     + }
7773     + $self->wherenext('First');
7774     +}
7775     +
7776     +sub modify_serv {
7777     + my ($self) = @_;
7778     + my $name = $self->cgi->param('name');
7779     + if (my $serv = $db->get($name)) {
7780     + my $servBC = $serv->prop('BadCountries') || '';
7781     + my $servRev = $serv->prop('XTGeoipRev') || 'disabled';
7782     +
7783     + my $q = $self->{'cgi'};
7784     + my $n_servBC = $q->param("masq_srv_badcountries");
7785     + my $n_servRev = $q->param("masq_srv_reverse") || $servRev;
7786     +
7787     + if ($n_servBC eq $servBC && $n_servRev eq $servRev ) {
7788     + return $self->success("NO_CHANGE")
7789     + }
7790     + $db->set_prop($name, "BadCountries", $n_servBC);
7791     + $db->set_prop($name, "XTGeoipRev", $n_servRev);
7792     +
7793     + if (system ( "/sbin/e-smith/signal-event", "xt_geoip-service" ) == 0 )
7794     + {
7795     + return $self->success("SUCCESS");
7796     + } else {
7797     + return $self->error("ERROR_UPDATING");
7798     + }
7799     + } else {
7800     + $self->error('CANT_FIND_SERV');
7801     + }
7802     + $self->wherenext('First');
7803     +}
7804     +
7805     +sub srv_must_exist
7806     +{
7807     + my $self = shift;
7808     + my $q = $self->{cgi};
7809     + my $listerr = "";
7810     + my @mq_bcs = split /[,:]/, $q->param("masq_srv_badcountries");
7811     + if (@mq_bcs) {
7812     + my $ctr = @mq_bcs;
7813     + return $self->localise('ERROR_COUNTRY_MAX: {$ctr}', {ctr=> "$ctr"}) if ($ctr > 50);
7814     +
7815     + foreach my $bcs (@mq_bcs) {
7816     + my $file = "/usr/share/xt_geoip/LE/" . $bcs . ".iv4";
7817     + if (! -f $file) { $listerr .= $bcs . ","; }
7818     + }
7819     + return $self->localise('ERR_COUNTRY_NOT_EXIST: {$listerr}', {listerr=> "$listerr"}) if $listerr;
7820     + }
7821     + return 'OK';
7822     +}
7823     +
7824     +
7825     +#Subroutine to list counries codes
7826     +sub generateCodes
7827     +{
7828     + my $self = shift;
7829     + my $q = $self->{cgi};
7830     +
7831     + $self->turn_off_buttons();
7832     +
7833     + my $file = "/usr/share/xt_geoip/geoip_countries_list.txt";
7834     + unless ( -e $file ) {
7835     + print $q->p($q->b($self->localise('INVALID_CODES_LIST')));
7836     + return '';
7837     + }
7838     +
7839     + print $q->h3($self->localise('COUNTRY_LIST'));
7840     +
7841     + open( XTGEOIPCODES, $file );
7842     + print "<pre>\n";
7843     +
7844     + while (<XTGEOIPCODES>)
7845     + {
7846     + print;
7847     + }
7848     +
7849     + close XTGEOIPCODES;
7850     + print "</pre>\n";
7851     +
7852     + print $q->h3($self->localise('END_OF_CODES'));
7853     + return '';
7854     +
7855     +}
7856     +
7857     +
7858     +#Subroutine to list other services codes
7859     +sub otherServices
7860     +{
7861     + my ($self, $choice) = @_;
7862     +
7863     + my %serv_ok = map { $_ => 1} split(/,/, $db->get_prop("masq", "XtServices"));
7864     + # unless $choice eq 'all';
7865     +
7866     + my @serv_others = ();
7867     +
7868     + for ($db->get_all_by_prop(type => 'service'))
7869     + {
7870     + next unless $_->prop('TCPPort');
7871     + # if ( $_->prop('TCPPort')) {
7872     +
7873     + # push @serv_others, $_->key unless exists( $serv_ok{$_->key});
7874     + push @serv_others, $_->key unless $choice eq 'sel' and not exists( $serv_ok{$_->key});
7875     + # }
7876     + }
7877     +
7878     + return \@serv_others;
7879     +
7880     +}
7881     +
7882     +
7883     +#Subroutine to update list services codes
7884     +sub do_otherServices
7885     +{
7886     + my $self = shift;
7887     +
7888     + my $q = $self->{'cgi'};
7889     +
7890     + my @selected = $q->param('SelectedServices');
7891     +
7892     + my $serv1 = ($db->get_prop("masq", "XtServices")) || '';
7893     + my $serv2 = join( ',', @selected);
7894     +
7895     + $self->wherenext('First');
7896     +
7897     + return $self->success("NO_CHANGE") if ( $serv1 eq $serv2);
7898     +
7899     + $db->set_prop("masq", "XtServices", $serv2);
7900     +
7901     + return $self->success("SUCCESS");
7902     +}
7903     +
7904     +
7905     +1;
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed