X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=templates%2Fconfig.tmpl;h=4194dadd8b7e006ac1626d8f02b5fce844ad7fa9;hb=d5e622d42460518dc365802aac38cbec778f824d;hp=268ec274775ddf2e974d3ebd292bc09928743c49;hpb=d2feffced1b7f39f2e67fdd736d2cfbcf84b9e45;p=deb%2Fpackages.git

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 268ec27..4194dad 100644
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -3,7 +3,7 @@
    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 +14,26 @@
    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'
+   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 +43,10 @@
 	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://packages.ubuntu.com/">packages.ubuntu.com</a>. Errors and obsolete information should be expected') }
 -%]