Merge commit 'origin/master' into debian-master

Conflicts:

	config.sh.sed.in
	templates/config.tmpl

diff --cc config.sh.sed.in
index d3f5b1482d794cafea3dde0696577e8b6b021270,c4f06a8a7d8f6175f4f1732941a3e5fad01101f5..f0ee0c7b194712866b4fa81ca060019c47466d33
--- 1/config.sh.sed.in
--- 2/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -37,9 -37,8 +37,9 @@@ root="
  
  # Architectures
  #
- polangs="de fi nl fr uk"
+ polangs="de fi fr hu nl uk"
 -ddtplangs="ca cs da de eo es fi fr go hu it ja km_KH ko nl pl pt pt_BR ru sk sv uk zh zh_CN zh_TW"
 +ddtplangs="ca cs da de eo es fi fr go hu it ja km_KH ko nl pl pt pt_BR ru sk sv uk"
 +#ddtplangs="ca cs da de eo es fi fr go hu it ja km_KH ko nl pl pt pt_BR ru sk sv uk zh zh_CN zh_TW"
  archives="us security amd64 gnuab backports volatile"
  sections="main contrib non-free"
  parts="$sections"

diff --cc cron.d/050checkinst
Simple merge

diff --cc lib/Packages/Dispatcher.pm
Simple merge

diff --cc templates/config.tmpl
index 18493bf6e8f405dad9a3e57d2229a32210350871,bb124e79c22fd52d49fe81145e549969aa114660..7f954935c03a514adaea7afea75769e67dd04584
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -42,7 -46,6 +46,7 @@@
  -%]
  [%-
     # possible values for importance: high, normal, low
 -   sitewidemsg = { importance => "high",
 -                 txt => g('Please note that this is an experimental version of <a href="http://packages.debian.org/">packages.debian.org</a>. Errors and obsolete information should be expected') }
 +#   sitewidemsg = { importance => "high",
- #                txt => "Please note that this is an experimental version of <a href=\"http://packages.debian.org/\">packages.debian.org</a>. Errors and obsolete information should be expected" }
++#                txt => g('Please note that this is an experimental version of <a href="http://packages.debian.org/">packages.debian.org</a>. Errors and obsolete information should be expected') }
 +#                txt => "Site maintainance in progress, some temporary problems might occour." }
  -%]