Merge branch 'master' into ubuntu-master

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

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 268ec274775ddf2e974d3ebd292bc09928743c49..9b71c474e604e39f24fd2e9f39d5465d501645b9 100644 (file)
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -1,9 +1,10 @@
 [%- DEFAULT
    charset = 'UTF-8'
-   lang = 'en'
+   po_lang = 'en'
+   ddtp_lang = 'en'
 
    organisation = 'Ubuntu'
-   homepage = 'http://www.ubuntulinux.org/'
+   homepage = 'http://www.ubuntu.com/'
    packages_homepage = 'http://packages.ubuntu.lichtenheld.net/'
    searchformurl = packages_homepage
    search_url = '/'
@@ -14,22 +15,29 @@
    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'
    logo = {
        url => homepage,
-        src => '/Pics/openlogo-nd-50.png',
+        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 => homepage _ 'legal'
+   }
+   trademark = {
+       name => copyright.name,
+       url => homepage _ 'trademark'
    }
-#   license = {
-#      url => homepage _ 'license'
-#   }
    contact = {
        name => 'Frank Lichtenheld',
        mail => 'frank@lichtenheld.de',
@@ -39,10 +47,14 @@
        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" }
+                  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 ) -%]