Merge branch 'master' into debian-master

diff --combined config.sh.sed.in
index 860f7e1888dc475793a638246693b0ef6663faed,4e228e46d8171c9f5ffd69937eca7fd27b752355..9cd7c0d7f119e5215b2f814cd37018f39f5ac557
--- 1/config.sh.sed.in
--- 2/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -19,7 -19,7 +19,7 @@@ cachedir=${topdir}/cach
  # unset this if %SITE% moves somewhere where the packages files
  # cannot be obtained locally
  #
 -#localdir=/org/ftp.debian.org/debian
 +localdir=/srv/mirrors/ftp.debian.org
  
  # path to private ftp directory
  #ftproot=/org/ftp.root
@@@ -40,7 -40,7 +40,7 @@@ search_url="/search
  
  # Architectures
  #
- polangs="de fi fr hu ja nl ru sv uk zh-cn"
+ polangs="de fi fr hu ja nl ru sk sv uk zh-cn"
  ddtplangs="ca cs da de eo es eu fi fr hu it ja km ko nl pl pt pt-br ru sk sv uk zh zh-cn zh-tw"
  archives="us security debports backports volatile"
  sections="main contrib non-free"