From: Frank Lichtenheld Date: Thu, 18 Oct 2007 21:19:27 +0000 (+0000) Subject: Merge commit 'origin/master' into debian-master X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=2ad60a1122641f5c264f36a690847b76d38120b3;p=deb%2Fpackages.git Merge commit 'origin/master' into debian-master Conflicts: config.sh.sed.in templates/config.tmpl --- 2ad60a1122641f5c264f36a690847b76d38120b3 diff --cc config.sh.sed.in index d3f5b14,c4f06a8..f0ee0c7 --- a/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 templates/config.tmpl index 18493bf,bb124e7..7f95493 --- a/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 packages.debian.org. Errors and obsolete information should be expected') } +# sitewidemsg = { importance => "high", - # txt => "Please note that this is an experimental version of packages.debian.org. Errors and obsolete information should be expected" } ++# txt => g('Please note that this is an experimental version of packages.debian.org. Errors and obsolete information should be expected') } +# txt => "Site maintainance in progress, some temporary problems might occour." } -%]