From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sat, 9 Feb 2008 19:43:25 +0000 (+0100)
Subject: Merge commit 'origin/master' into debian-master
X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=commitdiff_plain;h=e594b1fe3f88069be790f9954e66219f9ae5ae97

Merge commit 'origin/master' into debian-master

Conflicts:

	templates/config.tmpl
---

e594b1fe3f88069be790f9954e66219f9ae5ae97
diff --cc templates/config.tmpl
index 26827e4,294d8f0..dc836b9
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -49,9 -50,8 +50,9 @@@
  -%]
  [%-
     # 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://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://%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('.'),