The following commit has been merged in the ubuntu-master branch: commit 90b972730bae671e726706892b471e0ce0ac097a Merge: 792f3487bec081187341d8bd5f75d1c62bfd54f3 c8f25b919183b1416bc717c59ab8b0d7de6c9374 Author: Frank Lichtenheld <[EMAIL PROTECTED]> Date: Tue Aug 5 18:09:28 2008 -0300
Merge branch 'master' into ubuntu-master Conflicts: templates/html/foot.tmpl diff --combined templates/config.tmpl index 9b02b63,98525eb..d6e9bd6 --- a/templates/config.tmpl +++ b/templates/config.tmpl @@@ -3,56 -3,59 +3,60 @@@ po_lang = 'en' ddtp_lang = 'en' - organisation = 'Debian' - project_homepage = 'http://www.debian.org/' - packages_homepage = 'http://packages.debian.net/' + organisation = 'Ubuntu' + project_homepage = 'http://www.ubuntu.com/' + packages_homepage = 'http://packages.ubuntu.com/' searchformurl = packages_homepage search_url = '/search' tags_url = 'http://debtags.alioth.debian.org/' bugs_url = 'http://bugs.debian.org/' + launchpad_url = 'https://launchpad.net/distros/ubuntu/+source/' pts_url = 'http://packages.qa.debian.org/' ddpo_url = 'http://qa.debian.org/developer.php?login=' src_bugs_url = bugs_url _ 'src:' - mirror_url = 'http://ftp.debian.org/' - security_mirror = 'security.debian.org' - security_mirror_url = security_mirror _ '/debian-security' - security_suite_suffix = '/updates' - changelogs_url = 'http://packages.debian.org/changelogs/' + mirror_url = 'http://archive.ubuntu.com/' + 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 = project_homepage _ 'intro/cn' +# cn_help_url = project_homepage _ 'intro/cn' logo = { url => project_homepage, src => '/Pics/openlogo-nd-25.png', alt => organisation, } copyright = { - url => 'http://www.spi-inc.org/', - name => 'SPI Inc.', - years => '1997 - ' _ timestamp.year, + url => 'http://www.canonical.com/', + name => 'Canonical Ltd.', + years => timestamp.year, } license = { - url => project_homepage _ 'license' + url => project_homepage _ 'legal' } trademark = { name => copyright.name, - url => project_homepage _ 'trademark' + url => project_homepage _ 'aboutus/trademarkpolicy' } contact = { - name => g('Debian Web Mailinglist'), - mail => '[EMAIL PROTECTED]', - url => project_homepage _ 'contact', + name => 'Frank Lichtenheld', + mail => '[EMAIL PROTECTED]', + url => project_homepage _ 'support', } admin = { - name => g('%s Webmaster', organisation), - mail => '[EMAIL PROTECTED]', + name => 'Frank Lichtenheld', + mail => '[EMAIL PROTECTED]', } trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name) + # sponsor = { + # url => 'http://example.invalid/', + # name => 'Example Sponsor, Inc.', + # } -%] [%- # 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://%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('.'), diff --combined templates/html/foot.tmpl index ba4e030,cbabd66..580e280 --- a/templates/html/foot.tmpl +++ b/templates/html/foot.tmpl @@@ -1,15 -1,14 +1,15 @@@ [%- IF benchmark && debug -%] Total page evaluation took [% benchmark %]<br> [%- END -%] -</div> <!-- end inner --> +</div></div></div> +<div class=\"clear mozclear\"></div><div id=\"prefooter\"> <div id="footer"> [% IF langs.size > 0 %] <hr class="hidecss"> <!--UdmComment--> -<p>[% g('This page is also available in the following languages (How to set <a href="%s">the default document language</a>):', cn_help_url) %]</p> +<p>[% g('This page is also available in the following languages:') %]</p> <p class="navpara"> [% FOREACH l IN langs %] <a href="[% IF keyword_esc; @@@ -20,28 -19,29 +20,29 @@@ [%- IF l.transliteration %] ([% l.transliteration %])[% END %]</a> [% END %] </p> - [% IF cn_help_url %] - <p>[% g('How to set <a href="%s">the default document language</a>', cn_help_url) %]</p> - [% END %] <!--/UdmComment--> [% END %] <hr class="hidecss"> - <p [%- ' class="bordertop"' IF langs.size > 0 %]>[% g('Back to:') %] <a href="[% project_homepage %]">[% g('%s Homepage', organisation) %]</a> || <a href="[% searchformurl %]">[% g('Packages search page') %]</a></p> - - <hr class="hidecss"> <div id="fineprint" class="bordertop"> + <div id="impressum"> <p>[% g('To report a problem with the web site, e-mail <a href="mailto:%s">%s</a>. For other contact information, see the %s <a href="%s">contact page</a>.', contact.mail, contact.mail, organisation, contact.url) %]</p> - <p>[% IF timestamp.string; g('Generated:') _ ' ' _ timestamp.string _ '<br>'; END %] - [% UNLESS footer.doNotDisplayCopyright; - g('Content Copyright © %s <a href="%s">%s</a>; See <a href="%s">license terms</a>.', + [% UNLESS footer.doNotDisplayCopyright %] + <p> + [% g('Content Copyright © %s <a href="%s">%s</a>; See <a href="%s">license terms</a>.', copyright.years, copyright.url, copyright.name, license.url); - ' ' _ trademarknotes IF trademarknotes; - END %] - <p><a href="/about/">[% g('Learn more about this site') %]</a>.</p> + ' ' _ trademarknotes IF trademarknotes %] + <a href="/about/">[% g('Learn more about this site') %]</a>.</p> + [% END %] + </div> <!-- end impressum --> + [% IF sponsor.name %] + <div id="sponsorfooter"><p> + [% g('Hosting provided by <a href="%s">%s</a>.', sponsor.url, sponsor.name) %] + </p></div> + [% END %] </div> <!-- end fineprint --> </div> <!-- end footer --> -</div> <!-- end outer --> +</div> <!-- end pageWrapper --> </body> </html> -- APT Archive Web-Frontend (Alioth repository) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]