Merge commit 'alioth/master' into debian-master

diff --combined config.sh.sed.in
index 56b4ab8bbe42d4a1628060f8560f0c0676baef5f,63bc714d6aa2bcc761eaa3a365c4af2c0dab743e..e8b51488bda350c1db6505ccb1da0a821a142ca1
--- 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/ftp.debian.org/ftp
  
  # path to private ftp directory
  #ftproot=/org/ftp.root
@@@ -42,7 -42,7 +42,7 @@@ search_url="/search
  # Architectures
  #
  polangs="de fi fr hu ja nl ru sv uk zh-cn"
- ddtplangs="ca cs da de eo es fi fr hu it ja km-kh ko nl pl pt pt-br ru sk sv uk zh-cn zh-tw"
+ 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 amd64 debports backports volatile"
  sections="main contrib non-free"
  parts="$sections"

diff --combined templates/config.tmpl
index e79d091bc96ff88112c72eef9a974eea07f032ad,5ce7cc736eddbc6501d8432c58ccf1b19f09d081..22f00a083435ec6e985a2f4e0d1374ef314064b6
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -5,7 -5,7 +5,7 @@@
  
     organisation = 'Debian'
     project_homepage = 'http://www.debian.org/'
 -   packages_homepage = 'http://packages.debian.net/'
 +   packages_homepage = 'http://packages.debian.org/'
     searchformurl = packages_homepage
     search_url = '/search'
     tags_url = 'http://debtags.alioth.debian.org/'
@@@ -20,6 -20,7 +20,7 @@@
     changelogs_url = 'http://packages.debian.org/changelogs/'
     policy_url = 'http://www.debian.org/doc/debian-policy/'
     cn_help_url = project_homepage _ 'intro/cn'
+    patch_tracking_url = 'http://patch-tracking.debian.net/package'
     logo = {
        url => project_homepage,
          src => '/Pics/openlogo-nd-25.png',
@@@ -47,16 -48,15 +48,16 @@@
        mail => 'webmaster@debian.org',
     }
     trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name)
 -#   sponsor = {
 -#     url => 'http://example.invalid/',
 -#     name => 'Example Sponsor, Inc.',
 -#   }
 +   sponsor = {
 +      url => 'http://1und1.de/',
 +      name => '1&1 Internet AG',
 +   }
  -%]
  [%-
     # possible values for importance: high, normal, low
 -   sitewidemsg = { importance => "high",
 -                 txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') }
 +#   sitewidemsg = { importance => "high",
 +#                txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') }
 +#                txt => "Site maintainance in progress, some temporary problems might occour." }
  -%]
  [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
  [%- USE num = Number.Format( decimal_point => g('.'),