Merge remote-tracking branch 'ms/squid-ad' into next

diff --cc config/rootfiles/common/armv5tel/initscripts
Simple merge

diff --cc config/rootfiles/common/i586/initscripts
Simple merge

diff --cc doc/language_issues.de
Simple merge

diff --cc doc/language_issues.en
Simple merge

diff --cc doc/language_issues.es
index 11768836294b2167012d2adf4eb55b7d20eaebee,d4e23f8f0a93d3c7ba2aac53920fa669957bb5e0..1f6d5fe6998b157dd1a5a7018b8797204564fdbe
--- 1/doc/language_issues.es
--- 2/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 beca0080bf8b804dd5cfc62e9ed4898752c7af70,26c8646938f9a2b0a040335584775ed01dca43e6..0645609c7bf4349f43c8a0dc19f3ce60292b1086
--- 1/doc/language_issues.fr
--- 2/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 6162636f61cbb207b1a255e817d2bd48a35ba70f,7f4091872d26951078dfd19f0adac72032c2f37a..cb2f82b75706585203d685b1d85e87de6a3725ba
--- 1/doc/language_issues.nl
--- 2/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 11768836294b2167012d2adf4eb55b7d20eaebee,d4e23f8f0a93d3c7ba2aac53920fa669957bb5e0..1f6d5fe6998b157dd1a5a7018b8797204564fdbe
--- 1/doc/language_issues.pl
--- 2/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 547e1d4062a7ab7e0c3f4ba2ecc362d5cb6f94b3,dd3af2de7ad364eb21cc1eb7294913c50831a182..b84e698cbf41c041026120775186304f25c429f4
--- 1/doc/language_issues.ru
--- 2/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 cc40178b83556187a219796829e6051c9ea8a858,c8dbfc156f41b27d80eb7e17063965f3c86c14d1..dd58ee757cf93949cb297ec4dcb2363af2a21d50
--- 1/doc/language_issues.tr
--- 2/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

diff --cc doc/language_missings
Simple merge

diff --cc html/cgi-bin/proxy.cgi
Simple merge

diff --cc langs/de/cgi-bin/de.pl
Simple merge

diff --cc langs/en/cgi-bin/en.pl
Simple merge

diff --cc langs/tr/cgi-bin/tr.pl
Simple merge

diff --cc lfs/samba
Simple merge

diff --cc make.sh
Simple merge