From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sat, 16 Feb 2008 00:55:26 +0000 (+0100)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=4c6c02445d6bd955db66d82946b8c955b1f43615;p=deb%2Fpackages.git

Merge branch 'master' into ubuntu-master

Conflicts:

	cron.d/100syncarchive
	cron.d/300maintainerdb
	templates/config.tmpl
	templates/config/mirrors.tmpl
---

4c6c02445d6bd955db66d82946b8c955b1f43615
diff --cc templates/config.tmpl
index 451b0e6,294d8f0..9b71c47
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -52,7 -51,7 +52,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.ubuntu.com/">packages.ubuntu.com</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 => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.ubuntu.com', 'packages.ubuntu.com') }
  -%]
  [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
  [%- USE num = Number.Format( decimal_point => g('.'),