Merge branch 'master' into ubuntu-master

[deb/packages.git] / templates / config.tmpl

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 90c2b4702736bfda199c90b9109c19ecfbc3ddf0..6a24629e418d856f7484eb4b184db6036e257408 100644 (file)
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -1,12 +1,13 @@
 [%- DEFAULT
    charset = 'UTF-8'
-   lang = 'en'
+   po_lang = 'en'
+   ddtp_lang = 'en'
 
    organisation = 'Ubuntu'
-   homepage = 'http://www.ubuntulinux.org/'
-   packages_homepage = 'http://packages.ubuntu.lichtenheld.net/'
+   project_homepage = 'http://www.ubuntu.com/'
+   packages_homepage = 'http://packages.ubuntu.com/'
    searchformurl = packages_homepage
-   search_url = '/'
+   search_url = '/search'
    tags_url = 'http://debtags.alioth.debian.org/'
    bugs_url = 'http://bugs.debian.org/'
    launchpad_url = 'https://launchpad.net/distros/ubuntu/+source/'
@@ -14,35 +15,46 @@
    ddpo_url = 'http://qa.debian.org/developer.php?login='
    src_bugs_url = bugs_url _ 'src:'
    mirror_url = 'http://archive.ubuntu.com/'
-   changelogs_url = 'http://changelogs.ubuntu.com/changelogs'
+   security_mirror = 'security.ubuntu.com'
+   security_mirror_url = security_mirror _ '/ubuntu'
+   security_suite_suffix = '-security'
+   changelogs_url = 'http://changelogs.ubuntu.com/changelogs/'
    policy_url = 'http://www.debian.org/doc/debian-policy/'
-#   cn_help_url = homepage _ 'intro/cn'
+#   cn_help_url = project_homepage _ 'intro/cn'
    logo = {
-       url => homepage,
+       url => project_homepage,
         src => '/Pics/openlogo-nd-25.png',
         alt => organisation,
    }
    copyright = {
-#      url => 'http://www.spi-inc.org/',
+       url => 'http://www.canonical.com/',
         name => 'Canonical Ltd.',
-#        years => '1997 - ' _ timestamp.year,
+        years => timestamp.year,
+   }
+   license = {
+       url => project_homepage _ 'legal'
+   }
+   trademark = {
+       name => copyright.name,
+       url => project_homepage _ 'trademark'
    }
-#   license = {
-#      url => homepage _ 'license'
-#   }
    contact = {
        name => 'Frank Lichtenheld',
        mail => 'frank@lichtenheld.de',
-        url => homepage _ 'support',
+        url => project_homepage _ 'support',
    }
    admin = {
        name => 'Frank Lichtenheld',
        mail => 'frank@lichtenheld.de',
    }
-   trademarknotes = organisation _ ' is a trademark of ' _ copyright.name
+   trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name)
 -%]
 [%-
    # possible values for importance: high, normal, low
-   sitewidemsg = { importance => "high",
-                  txt => "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" }
+#   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.ubuntu.com', 'packages.ubuntu.com') }
 -%]
+[%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
+[%- USE num = Number.Format( decimal_point => g('.'),
+                            thousands_sep => g(','),
+                            decimal_fill  => 1 ) -%]