From: Michael Tremer Date: Sun, 27 Jul 2014 10:01:50 +0000 (+0200) Subject: Merge remote-tracking branch 'ms/squid-ad' into next X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2deb75c0f3ee968c6298689bcac2110cb12027fe;p=people%2Fms%2Fipfire-2.x.git Merge remote-tracking branch 'ms/squid-ad' into next --- 2deb75c0f3ee968c6298689bcac2110cb12027fe diff --cc doc/language_issues.es index 1176883629,d4e23f8f0a..1f6d5fe699 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@@ -932,9 -925,10 +939,11 @@@ WARNING: untranslated string: route con WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table + WARNING: untranslated string: samba join a domain + WARNING: untranslated string: samba join domain WARNING: untranslated string: server restart WARNING: untranslated string: show dh +WARNING: untranslated string: show tls-auth key WARNING: untranslated string: snat new source ip address WARNING: untranslated string: software version WARNING: untranslated string: source ip country diff --cc doc/language_issues.fr index beca0080bf,26c8646938..0645609c7b --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@@ -939,9 -932,10 +946,11 @@@ WARNING: untranslated string: route con WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table + WARNING: untranslated string: samba join a domain + WARNING: untranslated string: samba join domain WARNING: untranslated string: server restart WARNING: untranslated string: show dh +WARNING: untranslated string: show tls-auth key WARNING: untranslated string: snat new source ip address WARNING: untranslated string: snort working WARNING: untranslated string: software version diff --cc doc/language_issues.nl index 6162636f61,7f4091872d..cb2f82b757 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@@ -712,10 -705,10 +719,12 @@@ WARNING: untranslated string: route con WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table + WARNING: untranslated string: samba join a domain + WARNING: untranslated string: samba join domain WARNING: untranslated string: show dh +WARNING: untranslated string: show tls-auth key WARNING: untranslated string: software version WARNING: untranslated string: source ip country +WARNING: untranslated string: ta key WARNING: untranslated string: upload dh key WARNING: untranslated string: vendor diff --cc doc/language_issues.pl index 1176883629,d4e23f8f0a..1f6d5fe699 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@@ -932,9 -925,10 +939,11 @@@ WARNING: untranslated string: route con WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table + WARNING: untranslated string: samba join a domain + WARNING: untranslated string: samba join domain WARNING: untranslated string: server restart WARNING: untranslated string: show dh +WARNING: untranslated string: show tls-auth key WARNING: untranslated string: snat new source ip address WARNING: untranslated string: software version WARNING: untranslated string: source ip country diff --cc doc/language_issues.ru index 547e1d4062,dd3af2de7a..b84e698cbf --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@@ -922,9 -915,10 +929,11 @@@ WARNING: untranslated string: route con WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table + WARNING: untranslated string: samba join a domain + WARNING: untranslated string: samba join domain WARNING: untranslated string: server restart WARNING: untranslated string: show dh +WARNING: untranslated string: show tls-auth key WARNING: untranslated string: snat new source ip address WARNING: untranslated string: software version WARNING: untranslated string: source ip country diff --cc doc/language_issues.tr index cc40178b83,c8dbfc156f..dd58ee757c --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@@ -711,10 -700,10 +718,12 @@@ WARNING: untranslated string: route con WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table + WARNING: untranslated string: samba join a domain + WARNING: untranslated string: samba join domain WARNING: untranslated string: show dh +WARNING: untranslated string: show tls-auth key WARNING: untranslated string: software version WARNING: untranslated string: source ip country +WARNING: untranslated string: ta key WARNING: untranslated string: upload dh key WARNING: untranslated string: vendor