Make all remaining templates translatable

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 51c97e72d0e562127ee14d575457cfcc6d028313..bf84444962d9e39ffe905b9a89fcea9aea1b7fee 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -222,7 +222,7 @@ sub do_show {
                        my @downloads;
                        foreach my $a ( @archs ) {
                            my %d = ( arch => $a,
                        my @downloads;
                        foreach my $a ( @archs ) {
                            my %d = ( arch => $a,

-                                     pkgsize => sprintf( '%.1f', floor(($sizes_deb->{$a}/102.4)+0.5)/10 ),
+                                     pkgsize => floor(($sizes_deb->{$a}/102.4)+0.5)/10,

                                      instsize => $sizes_inst->{$a}, );
 
                            $d{version} = $versions->{$a} if $multiple_versions;
                                      instsize => $sizes_inst->{$a}, );
 
                            $d{version} = $versions->{$a} if $multiple_versions;


@@ -311,7 +311,7 @@ sub do_show {
                        my $path = "/$source_dir/$src_file_name";
 
                        push @{$contents{srcfiles}}, { server => $server, path => $path, filename => $src_file_name,
                        my $path = "/$source_dir/$src_file_name";
 
                        push @{$contents{srcfiles}}, { server => $server, path => $path, filename => $src_file_name,

-                                                      size => sprintf("%.1f", (floor(($src_file_size/102.4)+0.5)/10)),
+                                                      size => floor(($src_file_size/102.4)+0.5)/10,

                                                       md5sum => $src_file_md5 };
                    }
 
                                                       md5sum => $src_file_md5 };
                    }
 

diff --git a/templates/html/download.tmpl b/templates/html/download.tmpl
index 4a405f24da53a63ee079e1d9a5b79120b4714891..4bd21e3ead17fe1419a256b09e476feebb677308 100644 (file)
--- a/templates/html/download.tmpl
+++ b/templates/html/download.tmpl
@@ -1,11 +1,11 @@
 [%- PROCESS 'html/head.tmpl'
 [%- PROCESS 'html/head.tmpl'

-   title_tag = "Package Download Selection -- $filename.file"
+   title_tag = g('Package Download Selection -- %s', $filename.file)

    description = desc
    keywords = "$suite, $archive, $section, $subsection, $version"
    description = desc
    keywords = "$suite, $archive, $section, $subsection, $version"

-   navigation = [ { prefix=>'Distribution:', title=>'Overview over this suite', url=>make_url('/'), name=>suite },
-                 { prefix=>'Package:', url=>make_url(pkg,'','arch',undef), name=>pkg },
+   navigation = [ { prefix=>g('Distribution:'), title=>g('Overview over this suite'), url=>make_url('/'), name=>suite },
+                 { prefix=>g('Package:'), url=>make_url(pkg,'','arch',undef), name=>pkg },

                  { url=>make_url(pkg), name=>architecture },
                  { url=>make_url(pkg), name=>architecture },

-                 { name => 'Download' },
+                 { name => g('Download') },

                ]
 -%]
 [%- PROCESS 'config/archive_layout.tmpl' -%]
                ]
 -%]
 [%- PROCESS 'config/archive_layout.tmpl' -%]


@@ -14,47 +14,49 @@
 [%- PROCESS 'html/messages.tmpl' -%]
 
 [% IF architecture != 'all' %]
 [%- PROCESS 'html/messages.tmpl' -%]
 
 [% IF architecture != 'all' %]

-<h2>Download Page for <kbd>[% filename.file %]</kbd> on [% architectures.$architecture %] machines</h2>
+<h2>[% g('Download Page for <kbd>%s</kbd> on %s machines', filename.file, architectures.$architecture) %]</h2>

 [% ELSE %]
 [% ELSE %]

-<h2>Download Page for <kbd>[% filename.file %]</kbd></h2>
+<h2>[% g('Download Page for <kbd>%s</kbd>', filename.file) %]</h2>

 [% END %]
 
 <div class="pconstantnag">
 [% END %]
 
 <div class="pconstantnag">

-<p>If you are running Debian, it's strongly suggested to use a
-package manager like <a href="[% make_url('aptitude','','arch','') %]">aptitude</a> or
-<a href="[% make_url('synaptic','','arch','') %]">synaptic</a> to download and install
-packages, instead of doing so manually via this website.</p>
-<p>You should be able to use any of the listed mirrors by adding a
-line to your <kbd>/etc/apt/sources.list</kbd> like this:</p>
+<p>[% g('If you are running %s, it is strongly suggested to use a
+package manager like <a href="%s">aptitude</a> or
+<a href="%s">synaptic</a> to download and install
+packages, instead of doing so manually via this website.',
+       organisation, make_url('aptitude','','arch',''), make_url('synaptic','','arch','')) %]</p>
+<p>[% g('You should be able to use any of the listed mirrors by adding a
+line to your <kbd>/etc/apt/sources.list</kbd> like this:') %]</p>

 [% IF archive != "security" %]
 <pre>
 deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite %] main [% section IF section != main_section %]
 </pre>
 [% IF archive != "security" %]
 <pre>
 deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite %] main [% section IF section != main_section %]
 </pre>

-<p>Replacing <em>[% mirrors.$archive.europa.0 %]</em> with the mirror in question.
+<p>[% g('Replacing <em>%s</em> with the mirror in question.', mirrors.$archive.europa.0) %]

 [% ELSE %]
 <pre>
 deb http://security.debian.org/debian-security [% suite _ "/updates" %] main [% section IF section != main_section %]
 </pre>
 [%- END %]
 [% IF suite == "experimental" %]
 [% ELSE %]
 <pre>
 deb http://security.debian.org/debian-security [% suite _ "/updates" %] main [% section IF section != main_section %]
 </pre>
 [%- END %]
 [% IF suite == "experimental" %]

-<h2>Experimental package</h2>
-<p>Warning: This package is from the <strong>experimental</strong> distribution.
+<h2>[% g('Experimental package') %]</h2>
+<p>[% g('Warning: This package is from the <strong>experimental</strong> distribution.

 That means it is likely unstable or buggy, and it may even cause data loss.
 Please be sure to consult the changelog and other possible documentation before
 That means it is likely unstable or buggy, and it may even cause data loss.
 Please be sure to consult the changelog and other possible documentation before

-using it.</p>
+using it.') %]</p>

 [% END %]
 [% IF subsection == "debian-installer" %]
 [% END %]
 [% IF subsection == "debian-installer" %]

-<h2>debian-installer udeb package</h2>
-<p>Warning: This package is intended for the use in building
+<h2>[% g('debian-installer udeb package') %]</h2>
+<p>[% g('Warning: This package is intended for the use in building

 <a href="http://www.debian.org/devel/debian-installer">debian-installer</a> images only.
 <a href="http://www.debian.org/devel/debian-installer">debian-installer</a> images only.

-Do not install it on a normal Debian system.</p>
+Do not install it on a normal %s system.', organisation) %]</p>

 [% END %]
 </div>
 
 [%- SET a = mirrors.$archive -%]
 
 [% IF archive != 'security' %]
 [% END %]
 </div>
 
 [%- SET a = mirrors.$archive -%]
 
 [% IF archive != 'security' %]

-  <p>You can download the requested file from the <tt>[% filename.directory %]</tt> subdirectory at any of these sites:</p>
+  <p>[% g('You can download the requested file from the <tt>%s</tt> subdirectory at any of these sites:',
+       filename.directory) %]</p>

   <div class="cardleft">
   [% FOREACH continent IN [ 'north_america', 'south_america', 'asia', 'africa' ] %]
     [% IF a.$continent %]
   <div class="cardleft">
   [% FOREACH continent IN [ 'north_america', 'south_america', 'asia', 'africa' ] %]
     [% IF a.$continent %]


@@ -79,16 +81,16 @@ Do not install it on a normal Debian system.</p>
   [% END %]
   </div>
 [% ELSE %]
   [% END %]
   </div>
 [% ELSE %]

-<p>You can download the requested file from the <tt>[% filename.directory %]</tt> subdirectory at:</p>
+<p>[% g('You can download the requested file from the <tt>%s</tt> subdirectory at:', filename.directory) %]</p>

 <ul><li><a href="http://security.debian.org/debian-security/[% filename.full %]">security.debian.org/debian-security</a></li></ul>
 <ul><li><a href="http://security.debian.org/debian-security/[% filename.full %]">security.debian.org/debian-security</a></li></ul>

-<p>Debian security updates are currently officially distributed only via <tt>security.debian.org</tt></p>
+<p>[% g('Debian security updates are currently officially distributed only via <tt>security.debian.org</tt>.') %]</p>

 [% END %]
 
 <div id="pdownloadnotes">
 
 [% IF a.mirror_list %]
 [% END %]
 
 <div id="pdownloadnotes">
 
 [% IF a.mirror_list %]

-<p style="clear:both">If none of the above sites are fast enough for you,
-please see our <a href="[% a.mirror_list %]">complete mirror list</a>.</p>
+<p style="clear:both">[% g('If none of the above sites are fast enough for you,
+please see our <a href="%s">complete mirror list</a>.', a.mirror_list ) %]</p>

 [% END %]
 
 [% IF a.unofficial_port %]
 [% END %]
 
 [% IF a.unofficial_port %]


@@ -96,22 +98,23 @@ please see our <a href="[% a.mirror_list %]">complete mirror list</a>.</p>
 [% IF port.url_name;
    SET port.url = ports_url _ port.url_name _ '/';
    END -%]
 [% IF port.url_name;
    SET port.url = ports_url _ port.url_name _ '/';
    END -%]

-<p style="clear:both">Note that [% port.name %] is not officially included in the [% organisation %] archive yet,
-but the [% port.name %] porter group keeps their archive in sync with the official archive as close as possible.
-See the <a href="[% port.url %]">[% port.name %] ports page</a> for current information.</p>
+<p style="clear:both">[% g('Note that %s is not officially included in the %s archive yet,
+but the %s porter group keeps their archive in sync with the official archive as close as possible.
+See the <a href="%s">%s ports page</a> for current information.',
+       port.name, organisation, port.name, port.url, port.name) %]</p>

 [% END %]
 
 [% END %]
 

-<p>Note that in some browsers you will need to tell your browser you want the file saved to a file.
-For example, in Firefox or Mozilla, you should hold the Shift key when you click on the URL.</p>
+<p>[% g('Note that in some browsers you will need to tell your browser you want the file saved to a file.
+For example, in Firefox or Mozilla, you should hold the Shift key when you click on the URL.') %]</p>

 
 </div>
 
 
 </div>
 

-<h3>More information on <kbd>[% filename.file %]</kbd>:</h3>
+<h3>[% g('More information on <kbd>%s</kbd>:', filename.file) %]</h3>

 <table id="pdownloadmeta">
 <table id="pdownloadmeta">

-<tr><th>Exact Size</th>                <td class="size">[% size %] Byte ([% pkgsize %] [% pkgsize_unit %])</td>
-<tr><th>MD5 checksum</th>              <td><tt>[% md5sum %]</tt></td>
-<tr><th>SHA1 checksum</th>             <td><tt>[% sha1 || 'Not Available' %]</tt></td>
-<tr><th>SHA256 checksum</th>           <td><tt>[% sha256  || 'Not Available' %]</tt></td>
+<tr><th>[% g('Exact Size') %]</th>     <td class="size">[% g('%s Byte (%s %s)', size, pkgsize, pkgsize_unit) %]</td>
+<tr><th>[% g('MD5 checksum') %]</th>   <td><tt>[% md5sum %]</tt></td>
+<tr><th>[% g('SHA1 checksum') %]</th>  <td><tt>[% sha1 || g('Not Available') %]</tt></td>
+<tr><th>[% g('SHA256 checksum') %]</th>        <td><tt>[% sha256  || g('Not Available') %]</tt></td>

 </table>
 
 [%- PROCESS 'html/foot.tmpl' -%]
 </table>
 
 [%- PROCESS 'html/foot.tmpl' -%]

diff --git a/templates/html/filelist.tmpl b/templates/html/filelist.tmpl
index dbf9feaf06262a4e7cd53b7d0056df47ce3a14b2..e450d5fc20ffd8e7ad9584323940e81825ee8a39 100644 (file)
--- a/templates/html/filelist.tmpl
+++ b/templates/html/filelist.tmpl
@@ -1,14 +1,13 @@
 [%- PROCESS 'html/head.tmpl'
 [%- PROCESS 'html/head.tmpl'

-   title_tag = "Filelist of package $pkg/$suite/$arch"
-   page_title = "Filelist of package <em>$pkg</em> in <em>$suite</em> of architecture <em>$arch</em>"
+   title_tag = g("Filelist of package %s/%s/%s", pkg, suite, arch)
+   page_title = g("Filelist of package <em>%s</em> in <em>%s</em> of architecture <em>%s</em>", pkg, suite, arch)

    keywords = "$suite, $arch, filelist"
    keywords = "$suite, $arch, filelist"

-   navigation = [ { prefix=>'Distribution:', title=>'Overview over this suite', url=>make_url('/'), name=>suite },
-                 { prefix=>'Package:', url=>make_url(pkg,'','arch',undef), name=>pkg },
+   navigation = [ { prefix=>g('Distribution:'), title=>g('Overview over this suite'), url=>make_url('/'), name=>suite },
+                 { prefix=>g('Package:'), url=>make_url(pkg,'','arch',undef), name=>pkg },

                  { url=>make_url(pkg), name=>arch },
                  { url=>make_url(pkg), name=>arch },

-                 { name => 'Filelist' },
+                 { name => g('Filelist') },

                ]
 -%]
                ]
 -%]

-<h1></h1>

 
 [% FOREACH file IN files %]
 [%- '<div id="pfilelist"><pre>' IF loop.first -%]
 
 [% FOREACH file IN files %]
 [%- '<div id="pfilelist"><pre>' IF loop.first -%]

diff --git a/templates/html/newpkg.tmpl b/templates/html/newpkg.tmpl
index 0f36b4cf807aa7b568f58113791801056ef4cc2e..aaff0745cf642f4237f585d932e6b7d5310c895b 100644 (file)
--- a/templates/html/newpkg.tmpl
+++ b/templates/html/newpkg.tmpl
@@ -1,30 +1,37 @@
 [%- PROCESS 'html/head.tmpl'
 [%- PROCESS 'html/head.tmpl'

-   title_tag = "New Packages in \"$suite\""
+   title_tag = g('New Packages in "%s"', suite)

    description = desc
    keywords = "$suite, new packages, $section"
    rss_alternate = 'newpkg?format=rss'
 -%]
    description = desc
    keywords = "$suite, new packages, $section"
    rss_alternate = 'newpkg?format=rss'
 -%]

-<h1>New Packages in "[% suite %]"</h1>
+<h1>[% g('New Packages in "%s"', suite) %]</h1>

 
 

-<p>The following packages were added to suite <em>[% suite %]</em>[% " (section $section)" IF section %] in the [% organisation %] archive during the last 7 days. You can also display this list
-[%- IF opts.mode == 'byage' %]
- <a href="[% make_url('newpkg','','mode','') %]">sorted by name</a>
-[%- ELSE %]
- <a href="[% make_url('newpkg','mode=byage') %]">sorted by age</a>
-[%- END %].</p>
-<p>This information is also available as an <a href="newpkg?format=rss">RSS feed</a>
-<a href="newpkg?format=rss"><img src="http://planet.debian.org/rss10.png" alt="[RSS 1.0 Feed]"></a></p>
+<p>
+[% IF section;
+       g('The following packages were added to suite <em>%s</em> (section %s) in the %s archive during the last 7 days.',
+       suite, section, organisation);
+   ELSE;
+       g('The following packages were added to suite <em>%s</em> in the %s archive during the last 7 days.',
+       suite, organisation);
+   END;
+   IF opts.mode == 'byage';
+       g(' You can also display this list <a href="%s">sorted by name</a>.', make_url('newpkg','','mode',''));
+   ELSE;
+       g(' You can also display this list <a href="%s">sorted by age</a>.', make_url('newpkg','mode=byage'));
+   END %]</p>
+<p>[% g('This information is also available as an <a href="newpkg?format=rss">RSS feed</a>') %]
+<a href="newpkg?format=rss"><img src="http://planet.debian.org/rss10.png" alt="[% g('[RSS 1.0 Feed]') %]"></a></p>

 
 [% FOREACH pkg IN new_packages %]
        [% '<ul>' IF loop.first %]
        <li><a href="[% pkg.0 %]">[% pkg.0 %]</a>
 
 [% FOREACH pkg IN new_packages %]
        [% '<ul>' IF loop.first %]
        <li><a href="[% pkg.0 %]">[% pkg.0 %]</a>

-       -- [% pkg.-1 | html %][% " <em>($pkg.1 days old)</em>" IF pkg.1 %]
+       -- [% pkg.-1 | html %][% g(' <em>(%u days old)</em>', pkg.1) IF pkg.1 %]

        [% '</ul>' IF loop.last %]
 [% END %]
 
        [% '</ul>' IF loop.last %]
 [% END %]
 

-<p class="psmallcenter"><a href="[% make_url('allpackages','') %]" title="List of all packages">All packages</a><br>
-(<a href="[% make_url('allpackages','','format','txt.gz' ) %]">compact compressed textlist</a>)<br>
-  New packages in 
+<p class="psmallcenter"><a href="[% make_url('allpackages','') %]" title="[% g('List of all packages') %]">[% g('All packages') %]</a><br>
+(<a href="[% make_url('allpackages','','format','txt.gz' ) %]">[% g('compact compressed textlist') %]</a>)<br>
+  [% g('New packages in ') %] 

 [% FOREACH s IN sections %]
   [%- IF s == section -%]
 [% s %]
 [% FOREACH s IN sections %]
   [%- IF s == section -%]
 [% s %]

diff --git a/templates/html/search.tmpl b/templates/html/search.tmpl
index 78b4786a2f8fc50bfee765a69ce3dd09f2c87dec..3427f2a9bd40ea7e347efeeb671361a3ade9ba63 100644 (file)
--- a/templates/html/search.tmpl
+++ b/templates/html/search.tmpl
@@ -16,7 +16,7 @@
    architectures_enc = html_encode(architectures_str);
 -%]
 [%- PROCESS 'html/head.tmpl'
    architectures_enc = html_encode(architectures_str);
 -%]
 [%- PROCESS 'html/head.tmpl'

-   title_tag = "Package Search Results -- $keyword_enc"
+   title_tag = g("Package Search Results -- %s", keyword_enc)

    print_search_field = 'packages'
    search_field_values = {
        keywords => search_keywords.join(' '),
    print_search_field = 'packages'
    search_field_values = {
        keywords => search_keywords.join(' '),


@@ -25,21 +25,22 @@
        architectures => params.values.arch.no_replace.join(','),
        sections => params.values.section.no_replace.join(','),
     }
        architectures => params.values.arch.no_replace.join(','),
        sections => params.values.section.no_replace.join(','),
     }

-   navigation = [ { name => 'Package Search Results' } ]
+   navigation = [ { name => g('Package Search Results') } ]

 -%]
 
 <div id="psearchsug">
 [% UNLESS results %]
 -%]
 
 <div id="psearchsug">
 [% UNLESS results %]

-       <p>You can try a different search on the <a href="[% searchformurl %]#search_packages">Packages search page</a>.</p>
+       <p>[% g('You can try a different search on the <a href="%s#search_packages">Packages search page</a>.',
+               searchformurl) %]</p>

        
        [% IF opts.searchon != "names" && opts.exact %]
        
        [% IF opts.searchon != "names" && opts.exact %]

-       <p>You have searched only for words exactly matching your keywords.
-       You can try to search <a href="[% make_search_url('',"keywords=$keyword_esc",'exact',0) %]">allowing subword matching</a>
+       <p>[% g('You have searched only for words exactly matching your keywords. You can try to search <a href="%s">allowing subword matching.',
+               make_search_url('',"keywords=$keyword_esc",'exact',0) ) %]</a>

        [% END %]
 [% END %]
 [% IF opts.searchon == "names" && non_results %]
        [% END %]
 [% END %]
 [% IF opts.searchon == "names" && non_results %]

-<p><a href="[% search_url %][% keyword_esc %]">[% non_results %]</a>
-results have not been displayed due to the search parameters.</p>
+<p>[% g('<a href="%s">%u</a> results have not been displayed due to the search parameters.',
+       "$search_url$keyword_esc", non_results) %]</p>

 [% END %]
 </div>
 
 [% END %]
 </div>
 


@@ -47,42 +48,45 @@ results have not been displayed due to the search parameters.</p>
 
 <div id="psearchres">
 
 
 <div id="psearchres">
 

-[% suite_wording = suite_enc.match("^(default|all)$") ? "all suites" : "suite(s) <em>$suite_enc</em>";
-   section_wording = (section_enc == 'all') ? "all sections" : "section(s) <em>$section_enc</em>";
-   arch_wording = (architectures_enc == 'any') ? "all architectures" : "architecture(s) <em>$architectures_enc</em>";
+[%# @translators: I'm really sorry :/ %]
+[% suite_wording = suite_enc.match("^(default|all)$") ? g("all suites") : g("suite(s) <em>$suite_enc</em>");
+   section_wording = (section_enc == 'all') ? g("all sections") : g("section(s) <em>$section_enc</em>");
+   arch_wording = (architectures_enc == 'any') ? g("all architectures") : g("architecture(s) <em>$architectures_enc</em>");

     IF opts.searchon == "names";
     IF opts.searchon == "names";

-       source_wording = opts.source ? "source packages" : "packages";
-       msg = "You have searched for $source_wording that names contain <em>$keyword_enc</em> in $suite_wording, $section_wording, and $arch_wording .";
+       source_wording = opts.source ? g("source packages") : g("packages");
+       msg = g("You have searched for %s that names contain <em>%s</em> in %s, %s, and %s.",
+               source_wording, keyword_enc, suite_wording, section_wording, arch_wording);

     ELSE;
     ELSE;

-       exact_wording = opts.exact ? "" : " (including subword matching)";
-       msg = "You have searched for <em>$keyword_enc</em> in packages names and descriptions in $suite_wording, $section_wording, and $arch_wording$exact_wording .";
+       exact_wording = opts.exact ? "" : g(" (including subword matching)");
+       msg = g("You have searched for <em>%s</em> in packages names and descriptions in %s, %s, and %s%s.",
+               keyword_enc, suite_wording, section_wording, arch_wording, exact_wording);

     END %]
 <p>[% msg %]
 
 [% IF results %]
     END %]
 <p>[% msg %]
 
 [% IF results %]

-Found <strong>[% results %]</strong> matching packages.</p>
+[% g('Found <strong>%u</strong> matching packages.', results) %]</p>

 [% END %]
 
 [% IF too_many_hits %]
 [% IF opts.searchon != "names" %]
 [% END %]
 
 [% IF too_many_hits %]
 [% IF opts.searchon != "names" %]

-<p id="psearchtoomanyhits">Note that this only shows the best matches, sorted by relevance.
+<p id="psearchtoomanyhits">[% g("Note that this only shows the best matches, sorted by relevance.

 If the first few packages don't match what you searched for, try using more keywords or alternative
 If the first few packages don't match what you searched for, try using more keywords or alternative

-keywords.</p>
+keywords.") %]</p>

 [% ELSE %]
 [% ELSE %]

-<p id="psearchtoomanyhits">Your search was too wide so we will only display exact matches.
-At least <em>[% too_many_hits %]</em> results have been omitted and will not be displayed.
-Please consider using a longer keyword or more keywords.</p>
+<p id="psearchtoomanyhits">[% g('Your search was too wide so we will only display exact matches.
+At least <em>%u</em> results have been omitted and will not be displayed.
+Please consider using a longer keyword or more keywords.', too_many_hits) %]</p>

 [% END; END %]
 
 [% UNLESS results %]
 [% END; END %]
 
 [% UNLESS results %]

-<p id="psearchnoresult">Sorry, your search gave no results</p>
+<p id="psearchnoresult">[% g('Sorry, your search gave no results') %]</p>

 [% END %]
 
 [% FOREACH categories %]
   [% "<h2>$name</h2>" IF name %]
 
 [% FOREACH packages %]
 [% END %]
 
 [% FOREACH categories %]
   [% "<h2>$name</h2>" IF name %]
 
 [% FOREACH packages %]

-  <h3>Package [% pkg %]</h3>
+  <h3>[% g('Package %s', pkg) %]</h3>

   <ul>
   [% FOREACH s IN suites;
        suite = s.suite %]
   <ul>
   [% FOREACH s IN suites;
        suite = s.suite %]


@@ -92,7 +96,7 @@ Please consider using a longer keyword or more keywords.</p>
       <br>[% version %] [%- IF archive != main_archive %] [<strong class="pmarker">[% archive %]</strong>][% END %]: [% architectures.join(' ') %]
     [% END %]
     [% IF s.providers %]
       <br>[% version %] [%- IF archive != main_archive %] [<strong class="pmarker">[% archive %]</strong>][% END %]: [% architectures.join(' ') %]
     [% END %]
     [% IF s.providers %]

-       <br>[% 'also ' IF s.versions.size > 0 %]provided by: [% FOREACH provider IN s.providers %]<a href="[% make_url(provider,'','suite',suite) %]">[% provider %]</a>[% ', ' UNLESS loop.last %][% END %]
+       <br>[% 'also ' IF s.versions.size > 0 %][% g('provided by:') %] [% FOREACH provider IN s.providers %]<a href="[% make_url(provider,'','suite',suite) %]">[% provider %]</a>[% ', ' UNLESS loop.last %][% END %]

     [% END %]
     </li>
   [% END %]
     [% END %]
     </li>
   [% END %]


@@ -100,7 +104,7 @@ Please consider using a longer keyword or more keywords.</p>
 [% END %]
 
 [% FOREACH src_packages %]
 [% END %]
 
 [% FOREACH src_packages %]

-  <h3>Source Package [% pkg %]</h3>
+  <h3>[% g('Source Package %s', pkg) %]</h3>

   <ul>
   [% FOREACH origins %]
      [% origin = (archive == main_archive) ? suite : "$suite/$archive";
   <ul>
   [% FOREACH origins %]
      [% origin = (archive == main_archive) ? suite : "$suite/$archive";


@@ -108,9 +112,9 @@ Please consider using a longer keyword or more keywords.</p>
     <li><a class="resultlink" href="[% make_url(pkg,'','source','source','suite',origin,'section','','arch','') %]">[% origin %]</a> ([% subsection %]): [% version %]
       [%- IF section %] [<strong class="pmarker">[% section %]</strong>][% END %]
       [%- IF real_archive %] [<strong class="pmarker">[% real_archive %]</strong>][% END %]
     <li><a class="resultlink" href="[% make_url(pkg,'','source','source','suite',origin,'section','','arch','') %]">[% origin %]</a> ([% subsection %]): [% version %]
       [%- IF section %] [<strong class="pmarker">[% section %]</strong>][% END %]
       [%- IF real_archive %] [<strong class="pmarker">[% real_archive %]</strong>][% END %]

-    <br>Binary packages: <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]" class="binaries">[% FOREACH binary IN binaries %]<a href="[% make_url(binary,'','source','','suite',suite,'archive',archive,'arch','','archive','') %]">[% binary %]</a>[% ', ' UNLESS loop.last %][% END %]</span>
+    <br>[% g('Binary packages:') %] <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]" class="binaries">[% FOREACH binary IN binaries %]<a href="[% make_url(binary,'','source','','suite',suite,'archive',archive,'arch','','archive','') %]">[% binary %]</a>[% ', ' UNLESS loop.last %][% END %]</span>

        [% IF binaries.size > 10 %]
        [% IF binaries.size > 10 %]

-       <script type="text/javascript">init_toggle_elem("[% js_id %]","[% binaries.size %] binary packages")</script>
+       <script type="text/javascript">init_toggle_elem("[% js_id %]","[% g('%u binary packages', binaries.size) %])</script>

        [% END %]
     </li>
   [% END %]
        [% END %]
     </li>
   [% END %]


@@ -120,7 +124,8 @@ Please consider using a longer keyword or more keywords.</p>
 [% END %]
 
 [% IF skipped %]
 [% END %]
 
 [% IF skipped %]

-  <p><a href="[% make_search_url('',"keywords=$keyword_esc",'exact', 0) %]">[% skipped %]</a> results have not been displayed because you requested only exact matches.
+  <p>[% g('<a href="%s">%u</a> results have not been displayed because you requested only exact matches.',
+       make_search_url('',"keywords=$keyword_esc",'exact', 0), skipped) %]

 [% END %]
 
 </div>
 [% END %]
 
 </div>

diff --git a/templates/html/search_contents.tmpl b/templates/html/search_contents.tmpl
index 71a0019362946b713ef6c126635747c19fc9bcc6..513b4514df5cbf33bbf87cdfb128c8d751eda582 100644 (file)
--- a/templates/html/search_contents.tmpl
+++ b/templates/html/search_contents.tmpl
@@ -11,10 +11,10 @@
    architectures_enc = html_encode(architectures_str);
 -%]
 [%- PROCESS 'html/head.tmpl'
    architectures_enc = html_encode(architectures_str);
 -%]
 [%- PROCESS 'html/head.tmpl'

-   title_tag = "Package Contents Search Results -- $keyword_enc"
+   title_tag = g("Package Contents Search Results -- %s", keyword_enc)

    keywords = "$suite"
    print_search_field = 'packages'
    keywords = "$suite"
    print_search_field = 'packages'

-   navigation = [ { title => '', name => 'Package Contents Search Results', url => '' } ]
+   navigation = [ { title => '', name => g('Package Contents Search Results'), url => '' } ]

    search_field_values = {
        keywords => search_keywords.join(' '),
        searchon => 'contents',
    search_field_values = {
        keywords => search_keywords.join(' '),
        searchon => 'contents',


@@ -30,19 +30,22 @@
 
 <ul class="linklist">
 [% IF mode != 'filename' %]
 
 <ul class="linklist">
 [% IF mode != 'filename' %]

-<li><a href="[% make_search_url('',"keywords=$keyword_esc",'mode','filename') %]">Search for <em>[% keyword_enc %]</em> within filenames</a>
+<li><a href="[% make_search_url('',"keywords=$keyword_esc",'mode','filename') %]">
+[%- g('Search for <em>%s</em> within filenames', keyword_enc) %]</a>

 [% END %]
 
 [% IF mode != 'exactfilename' %]
 [% END %]
 
 [% IF mode != 'exactfilename' %]

-<li><a href="[% make_search_url('',"keywords=$keyword_esc",'mode','exactfilename') %]">Search exact filename <em>[% keyword_enc %]</em></a>
+<li><a href="[% make_search_url('',"keywords=$keyword_esc",'mode','exactfilename') %]">
+[%- g('Search exact filename <em>%s</em>', keyword_enc) %]</a>

 [% END %]
 
 [% IF mode == 'exactfilename' || mode == 'filename' %]
 [% END %]
 
 [% IF mode == 'exactfilename' || mode == 'filename' %]

-<li><a href="[% make_search_url('',"keywords=$keyword_esc",'mode','') %]">Search for paths ending with <em>[% keyword_enc %]</em></a>
+<li><a href="[% make_search_url('',"keywords=$keyword_esc",'mode','') %]">
+[%- g('Search for paths ending with <em>%s</em>', keyword_enc) %]</a>

 [% END %]
 </ul>
 
 [% END %]
 </ul>
 

-<p>Search in other suite:
+<p>[% g('Search in other suite:') %]

 [% FOREACH s IN all_suites %]
        [% IF s != suite %]
        [<a href="[% make_search_url('',"keywords=$keyword_esc",'suite',s) %]">[% s  %]</a>]
 [% FOREACH s IN all_suites %]
        [% IF s != suite %]
        [<a href="[% make_search_url('',"keywords=$keyword_esc",'suite',s) %]">[% s  %]</a>]


@@ -52,12 +55,13 @@
 [% END %]
 
 [% UNLESS search_architectures.size == 1 || all_architectures.size == 1 %]
 [% END %]
 
 [% UNLESS search_architectures.size == 1 || all_architectures.size == 1 %]

-<p>Limit search to a specific architecture:
+<p>[% g('Limit search to a specific architecture:') %]

 [% FOREACH a IN all_architectures %] [<a href="[% make_search_url('',"keywords=$keyword_esc",'arch',a) %]">[% a %]</a>][% END %]
 [% END %]
 
 [% IF search_architectures.size == 1 %]
 [% FOREACH a IN all_architectures %] [<a href="[% make_search_url('',"keywords=$keyword_esc",'arch',a) %]">[% a %]</a>][% END %]
 [% END %]
 
 [% IF search_architectures.size == 1 %]

-<p>Search in <a href="[% make_search_url('',"keywords=$keyword_esc",'arch','any') %]">all architectures</a>
+<p>[% g('Search in <a href="%s">all architectures</a>',
+       make_search_url('',"keywords=$keyword_esc",'arch','any')) %]

 [% END %]
 
 </div>
 [% END %]
 
 </div>


@@ -65,23 +69,24 @@
 [%- PROCESS 'html/messages.tmpl' -%]
 <div id="pcontentsres">
 
 [%- PROCESS 'html/messages.tmpl' -%]
 <div id="pcontentsres">
 

-[% suite_wording = "suite <em>$suite</em>";
-   section_wording = ( section_enc == 'all' ? "all sections" : "section(s) <em>$section_enc</em>" );
-   arch_wording = ( architectures_enc == 'any' ? "all architectures" : "architecture(s) <em>$architectures_enc</em>" );
-   wording = "paths that end with";
+[%# @translators: I'm really sorry :/ %]
+[% section_wording = ( section_enc == 'all' ? g("all sections") : g("section(s) <em>%s</em>", section_enc) );
+   arch_wording = ( architectures_enc == 'any' ? g("all architectures") : g("architecture(s) <em>%s</em>", architectures_enc) );
+   wording = g("paths that end with");

    IF mode == 'filename';
    IF mode == 'filename';

-       wording =  "files named";
+       wording = g("files named");

    ELSIF mode == 'exactfilename';
    ELSIF mode == 'exactfilename';

-       wording = "filenames that contain";
+       wording = g("filenames that contain");

    END %]
    END %]

-<p>You have searched for [% wording %] <em>[% keyword_enc %]</em> in [% suite_wording %], [% section_wording %], and [% arch_wording %].
+<p>[% g('You have searched for %s <em>%s</em> in suite <em>%s</em>, %s, and %s.',
+       wording, keyword_enc, suite, section_wording, arch_wording) %]

 
 [% IF results.size %]
 
 [% IF results.size %]

-Found <strong>[% results.size %] results</strong>.
+[% g('Found <strong>%u results</strong>.', results.size) %]

 
 [% IF too_many_hits %]
 
 [% IF too_many_hits %]

-<p id="psearchtoomanyhits">Note: Your search was too wide so we will only display only the first about 100 matches.
-Please consider using a longer keyword or more keywords.</p>
+<p id="psearchtoomanyhits">[% g('Note: Your search was too wide so we will only display only the first about 100 matches.
+Please consider using a longer keyword or more keywords.') %]</p>

 [% END %]
 
 <table>
 [% END %]
 
 <table>


@@ -90,8 +95,10 @@ Please consider using a longer keyword or more keywords.</p>
        <col>
        </colgroup>
 <tr>
        <col>
        </colgroup>
 <tr>

-       <th><a title="Sort results by filename" href="[% make_search_url('',"keywords=$keyword_esc&amp;sort_by=file") %]">File</a></th>
-       <th><a title="Sort results by package name" href="[% make_search_url('',"keywords=$keyword_esc&amp;sort_by=pkg") %]">Packages</a></th>
+       <th><a title="[% g('Sort results by filename') %]" href="[% make_search_url('',"keywords=$keyword_esc&amp;sort_by=file") %]">
+               [%- g('File') %]</a></th>
+       <th><a title="[% g('Sort results by package name') %]" href="[% make_search_url('',"keywords=$keyword_esc&amp;sort_by=pkg") %]">
+               [%- g('Packages') %]</a></th>

 </tr>
 [% FOREACH results %]
 [% file = html_encode(file);
 </tr>
 [% FOREACH results %]
 [% file = html_encode(file);


@@ -105,7 +112,7 @@ Please consider using a longer keyword or more keywords.</p>
         <td>
         [% FOREACH packages %]
        [% arch_str = architectures.join(', ');
         <td>
         [% FOREACH packages %]
        [% arch_str = architectures.join(', ');

-          SET arch_str = "not $arch_str" IF ( arch_str && architectures_are_rev );
+          SET arch_str = g("not %s", arch_str) IF ( arch_str && architectures_are_rev );

           SET arch_str = " [$arch_str]" IF arch_str;
            pkg_esc = uri_escape(pkg)  %]
        <a href="[% make_url(pkg_esc,'','suite',suite,'arch','') %]">[% pkg | html %]</a>[% arch_str %][% ', ' UNLESS loop.last %]
           SET arch_str = " [$arch_str]" IF arch_str;
            pkg_esc = uri_escape(pkg)  %]
        <a href="[% make_url(pkg_esc,'','suite',suite,'arch','') %]">[% pkg | html %]</a>[% arch_str %][% ', ' UNLESS loop.last %]


@@ -115,14 +122,14 @@ Please consider using a longer keyword or more keywords.</p>
 [% END %]
 
 [% IF results.size > 20 %]
 [% END %]
 
 [% IF results.size > 20 %]

-<tr><th>File</th><th>Packages</th></tr>
+<tr><th>[% g('File') %]</th><th>[% g('Packages') %]</th></tr>

 [% END %]
 </table>
 </div>
 
 [% ELSE %]
 
 [% END %]
 </table>
 </div>
 
 [% ELSE %]
 

-<p id="psearchnoresult">Sorry, your search gave no results</p>
+<p id="psearchnoresult">[% g('Sorry, your search gave no results') %]</p>

 
 [% END %]
 
 
 [% END %]
 

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index 1d9f655eb3835620a78696cfe53ef6e473395520..082079efcd7f0e76b3784a65337e87ef3acaaa57 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -11,15 +11,15 @@
 -%]
 [%- suite_name = suite;
     SET suite_name = suite_name _ ' (' _ suite_aliases.$suite _ ')' IF suite_aliases.$suite;
 -%]
 [%- suite_name = suite;
     SET suite_name = suite_name _ ' (' _ suite_aliases.$suite _ ')' IF suite_aliases.$suite;

-    nav_arr = [ { prefix=>'Distribution:', title=>'Overview over this suite', url=>make_url('/','','source',''), name=>suite_name }, ];
-    nav_arr.push( { title => 'Source packages', url=>make_url('/'), name=>'Source' } ) IF is_source;
-    nav_arr.push( { prefix=>'Section:', title=>'All packages in this section', url=>make_url("$subsection/"), name=>subsection } );
-    nav_arr.push( { prefix=>'Package:', name=>pkg } ); -%]
+    nav_arr = [ { prefix=>g('Distribution:'), title=>g('Overview over this suite'), url=>make_url('/','','source',''), name=>suite_name }, ];
+    nav_arr.push( { title =>g('Source packages'), url=>make_url('/'), name=>g('Source') } ) IF is_source;
+    nav_arr.push( { prefix=>g('Section:'), title=>g('All packages in this section'), url=>make_url("$subsection/"), name=>subsection } );
+    nav_arr.push( { prefix=>g('Package:'), name=>pkg } ); -%]

 [% desclang = 'en';
    SET desclang = lang IF desc.$lang.long %]
 [%- PROCESS 'html/head.tmpl'
 [% desclang = 'en';
    SET desclang = lang IF desc.$lang.long %]
 [%- PROCESS 'html/head.tmpl'

-   title_tag = ( is_source ? "Details of source package $pkg in $suite"
-                          : "Details of package $pkg in $suite" )
+   title_tag = is_source ? g('Details of source package %s in %s', pkg, suite)
+                        : g('Details of package %s in %s', pkg, suite)

    description = desc.$desclang.short
    keywords = "$suite, $archive, $section, $subsection, $version"
    print_search_field = 'packages'
    description = desc.$desclang.short
    keywords = "$suite, $archive, $section, $subsection, $version"
    print_search_field = 'packages'


@@ -42,43 +42,43 @@
 
 [% IF src %]
 <div id="psource">
 
 [% IF src %]
 <div id="psource">

-[% PROCESS menuitem prefix='Source:' title='Source package building this package' url=make_url(src.pkg,'','source','source') name=src.pkg %]
+[% PROCESS menuitem prefix=g('Source:') title=g('Source package building this package') url=make_url(src.pkg,'','source','source') name=src.pkg %]

 </div>
 [% END %]
 
 [%- PROCESS 'html/messages.tmpl' -%]
 
 [% IF is_virtual %]
 </div>
 [% END %]
 
 [%- PROCESS 'html/messages.tmpl' -%]
 
 [% IF is_virtual %]

-<h1>Virtual Package: [% pkg %]
+<h1>[% g('Virtual Package: %s', pkg) %]

 [% ELSIF is_source %]
 [% ELSIF is_source %]

-<h1>Source Package: [% pkg %] ([% version %])
+<h1>[% g('Source Package: %s (%s)', pkg, version) %]

 [% ELSE %]
 [% ELSE %]

-<h1>Package: [% pkg %] ([% versions.short %])
+<h1>[% g('Package: %s (%s)', pkg, versions.short) %]

 [% END %]
 [%- PROCESS marker text=archive IF archive && archive != main_archive %]
 [%- PROCESS marker text=section IF section && section != main_section %]
 [% END %]
 [%- PROCESS marker text=archive IF archive && archive != main_archive %]
 [%- PROCESS marker text=section IF section && section != main_section %]

-[%- PROCESS marker text='essential' IF page.get_newest('essential') == 'yes' %]</h1>
+[%- PROCESS marker text=g('essential') IF page.get_newest('essential') == 'yes' %]</h1>

 
 [% UNLESS is_virtual %]
 <div id="pmoreinfo">
 
 [% UNLESS is_virtual %]
 <div id="pmoreinfo">

-<h2>Links for [% pkg %]</h2>
-<h3>Debian Resources:</h3>
+<h2>[% g('Links for %s', pkg) %]</h2>
+<h3>[% g('Debian Resources:') %]</h3>

 <ul>
 <ul>

-<li><a href="[% (is_source ? src_bugs_url : bugs_url) _ pkg | uri %]">Bug Reports</a></li>
+<li><a href="[% (is_source ? src_bugs_url : bugs_url) _ pkg | uri %]">[% g('Bug Reports') %]</a></li>

 
 [% IF src.pkg -%]
 
 [% IF src.pkg -%]

-<li><a href="[% pts_url _ src.pkg | uri %]">Developer Information (PTS)</a></li>
+<li><a href="[% pts_url _ src.pkg | uri %]">g('Developer Information (PTS)') %]</a></li>

 [% ELSIF is_source %]
 [% ELSIF is_source %]

-<li><a href="[% pts_url _ pkg | uri %]">Developer Information (PTS)</a></li>
+<li><a href="[% pts_url _ pkg | uri %]">g('Developer Information (PTS)') %]</a></li>

 [%- END %]
 
 [% IF files && (!archive or archive == main_archive or archive == 'security') %]
 [%- END %]
 
 [% IF files && (!archive or archive == main_archive or archive == 'security') %]

-<li><a href="[% changelogs_url _ files.changelog.path %]">Debian Changelog</a></li>
-<li><a href="[% changelogs_url _ files.copyright.path %]">Copyright File</a></li>
+<li><a href="[% changelogs_url _ files.changelog.path %]">[% g('%s Changelog', organisation) %]</a></li>
+<li><a href="[% changelogs_url _ files.copyright.path %]">[% g('Copyright File') %]</a></li>

 [% END %]
 
 [% IF vcs_link %]
 [% END %]
 
 [% IF vcs_link %]

-<li><a href="[% vcs_link %]" class="pvcslink">Debian Source Repository</a>
+<li><a href="[% vcs_link %]" class="pvcslink">[% g('Debian Source Repository') %]</a>

 [%- FOREACH vcs IN known_vcs;
        vcs_id = vcs.0; vcs_name = vcs.1; vcs_pkg = vcs.2;
        vcs_info = page.get_newest("vcs-$vcs_id");
 [%- FOREACH vcs IN known_vcs;
        vcs_id = vcs.0; vcs_name = vcs.1; vcs_pkg = vcs.2;
        vcs_info = page.get_newest("vcs-$vcs_id");


@@ -92,26 +92,26 @@
 </ul>
 
 [% IF src %]
 </ul>
 
 [% IF src %]

-  <p>Download Source Package <a href="[% src.url %]">[% src.pkg %]</a>:
+  <p>[% g('Download Source Package <a href="%s">%s</a>:', src.url, src.pkg) %]

   [% FOREACH src.downloads %]
     [% '<ul>' IF loop.first %]
     <li><a href="[% server _ path %]">[[% name %]]</a></li>
     [% '</ul>' IF loop.last %]
   [% END %]
   [% IF src.downloads.size == 0 %]
   [% FOREACH src.downloads %]
     [% '<ul>' IF loop.first %]
     <li><a href="[% server _ path %]">[[% name %]]</a></li>
     [% '</ul>' IF loop.last %]
   [% END %]
   [% IF src.downloads.size == 0 %]

-  Not found
+  [% g('Not found') %]

   [% END %]
 [% END %]
 
 [% IF maintainers.size == 1 -%]
   [% END %]
 [% END %]
 
 [% IF maintainers.size == 1 -%]

-  <h3>Maintainer:</h3>
+  <h3>[% g('Maintainer:') %]</h3>

 [%- ELSE -%]
 [%- ELSE -%]

-  <h3>Maintainers:</h3>
+  <h3>[% g('Maintainers:') %]</h3>

 [%- END %]
 [%- FOREACH maintainers -%]
   [%- '<ul>' IF loop.first -%]
        <li><a href="mailto:[% mail %]">[% name | html %]</a>
 [%- END %]
 [%- FOREACH maintainers -%]
   [%- '<ul>' IF loop.first -%]
        <li><a href="mailto:[% mail %]">[% name | html %]</a>

-       (<a href="[% ddpo_url _ mail %]" title="An overview over the maintainer's packages and uploads">QA Page</a>)
+       (<a href="[% ddpo_url _ mail %]" title="[% g("An overview over the maintainer's packages and uploads") %]">[% g('QA Page') %]</a>)

        </li>
   [%- '</ul>' IF loop.last -%]
 [%- END -%]
        </li>
   [%- '</ul>' IF loop.last -%]
 [%- END -%]


@@ -119,15 +119,15 @@
 [% url = page.get_newest('url');
    SET url = page.get_newest('homepage') IF page.get_newest('homepage');
    IF url %]
 [% url = page.get_newest('url');
    SET url = page.get_newest('homepage') IF page.get_newest('homepage');
    IF url %]

-<h3>External Resources:</h3>
+<h3>[% g('External Resources:') %]</h3>

 <ul>
 <ul>

-<li><a href="[% url | uri %]">Homepage</a> [[% extract_host(url) %]]</li>
+<li><a href="[% url | uri %]">[% g('Homepage') %]</a> [[% extract_host(url) %]]</li>

 </ul>
 [% END %]
 
 [% FOREACH sim IN similar %]
        [% IF loop.first %]
 </ul>
 [% END %]
 
 [% FOREACH sim IN similar %]
        [% IF loop.first %]

-       <h3>Similar packages:</h3>
+       <h3>[% g('Similar packages:') %]</h3>

        <ul>
        [% END %]
        <li><a href="/[% sim %]">[% sim %]</a></li>
        <ul>
        [% END %]
        <li><a href="/[% sim %]">[% sim %]</a></li>


@@ -141,18 +141,18 @@
 <div class="pconstantnag">
 [% IF suite == "experimental" %]
 [% changelog_link = 'changelog';
 <div class="pconstantnag">
 [% IF suite == "experimental" %]
 [% changelog_link = 'changelog';

-   changelog_link = "<a href='$changelogs_url$files.changelog.path'>changelog</a>" %] 
-<h2>Experimental package</h2>
-<p>Warning: This package is from the <strong>experimental</strong> distribution.
+   changelog_link = "$changelogs_url$files.changelog.path" %] 
+<h2>[% g('Experimental package') %]</h2>
+<p>[% g('Warning: This package is from the <strong>experimental</strong> distribution.

 That means it is likely unstable or buggy, and it may even cause data loss.
 That means it is likely unstable or buggy, and it may even cause data loss.

-Please be sure to consult the [% changelog_link %] and other possible documentation before
-using it.</p>
+Please be sure to consult the <a href="%s">changelog</a> and other possible documentation before
+using it.', changelog_link) %]</p>

 [% END %]
 [% IF subsection == "debian-installer" %]
 [% END %]
 [% IF subsection == "debian-installer" %]

-<h2>debian-installer udeb package</h2>
-<p>Warning: This package is intended for the use in building
+<h2>[% g('debian-installer udeb package') %]</h2>
+<p>[% g('Warning: This package is intended for the use in building

 <a href="http://www.debian.org/devel/debian-installer">debian-installer</a> images only.
 <a href="http://www.debian.org/devel/debian-installer">debian-installer</a> images only.

-Do not install it on a normal Debian system.</p>
+Do not install it on a normal %s system.', organisation ) %]</p>

 [% END %]
 </div>
 [% END %]
 [% END %]
 </div>
 [% END %]


@@ -169,14 +169,15 @@ Do not install it on a normal Debian system.</p>
        <p>[% desc.$desclang.long %]
        [% END %]
 [% ELSE %]
        <p>[% desc.$desclang.long %]
        [% END %]
 [% ELSE %]

-       <p>This is a <em>virtual package</em>. See the <a href="[% policy_url %]">Debian policy</a> for a <a href="[% policy_url %]ch-binary.html#s-virtual_pkg">definition of virtual packages</a>.</p>
+       <p>[% g('This is a <em>virtual package</em>. See the <a href="%s">Debian policy</a> for a <a href="%sch-binary.html#s-virtual_pkg">definition of virtual packages</a>.',
+               policy_url, policy_url) %]</p>

 [% END %]
 </div> <!-- end pdesc -->
 
 [% FOREACH tag IN tags %]
   [% IF loop.first -%]
     <div id="ptags"><p>
 [% END %]
 </div> <!-- end pdesc -->
 
 [% FOREACH tag IN tags %]
   [% IF loop.first -%]
     <div id="ptags"><p>

-    <a href="[% tags_url %]edit.html?pkg=[% pkg | uri %]">Tags</a>:
+    <a href="[% tags_url %]edit.html?pkg=[% pkg | uri %]">[% g('Tags') %]</a>:

   [%- END %]
   [% facet = tag.0;
      facet_name = debtags_voc.$facet;
   [%- END %]
   [% facet = tag.0;
      facet_name = debtags_voc.$facet;


@@ -197,7 +198,7 @@ Do not install it on a normal Debian system.</p>
 [% END %]
 
 [% FOREACH providers %]
 [% END %]
 
 [% FOREACH providers %]

-  [% IF loop.first %]<div id="pdeps"><h2>Packages providing [% pkg %]</h2><dl>[% END %]
+  [% IF loop.first %]<div id="pdeps"><h2>[% g('Packages providing %s', pkg) %]</h2><dl>[% END %]

     <dt>[% IF available %]<a href="[% make_url(name,'','source','') %]">[% name %]</a>[% ELSE %][% name %][% END %]</dt>
     <dd>[% desc %]</dd>
   [% '</dl></div>' IF loop.last %]
     <dt>[% IF available %]<a href="[% make_url(name,'','source','') %]">[% name %]</a>[% ELSE %][% name %][% END %]</dt>
     <dd>[% desc %]</dd>
   [% '</dl></div>' IF loop.last %]


@@ -206,7 +207,7 @@ Do not install it on a normal Debian system.</p>
 [% END %]
 
 [% FOREACH binaries %]
 [% END %]
 
 [% FOREACH binaries %]

-  [% IF loop.first %]<div id="pbinaries">The following binary packages are built from this source package:<dl>[% END %]
+  [% IF loop.first %]<div id="pbinaries">[% g('The following binary packages are built from this source package:') %]<dl>[% END %]

     <dt>[% IF available %]<a href="[% make_url(name,'','source','') %]">[% name %]</a>[% ELSE %][% name %][% END %]</dt>
     <dd>[% desc %]</dd>    
   [% '</dl></div>' IF loop.last %]
     <dt>[% IF available %]<a href="[% make_url(name,'','source','') %]">[% name %]</a>[% ELSE %][% name %][% END %]</dt>
     <dd>[% desc %]</dd>    
   [% '</dl></div>' IF loop.last %]


@@ -215,7 +216,7 @@ Do not install it on a normal Debian system.</p>
 [% FOREACH relations %]
   [% IF loop.first -%]
     <div id="pdeps">
 [% FOREACH relations %]
   [% IF loop.first -%]
     <div id="pdeps">

-    <h2>Other Packages Related to [% pkg %]</h2>
+    <h2>[% g('Other Packages Related to %s', pkg) %]</h2>

 
     <table id="pdeplegend" class="visual" summary="legend"><tr>
     [% IF is_source %]
 
     <table id="pdeplegend" class="visual" summary="legend"><tr>
     [% IF is_source %]


@@ -241,11 +242,11 @@ Do not install it on a normal Debian system.</p>
       [%- IF !is_old_pkgs -%]
         <dd>[% desc -%]
         [%- IF providers.pkgs.size > 0 -%]
       [%- IF !is_old_pkgs -%]
         <dd>[% desc -%]
         [%- IF providers.pkgs.size > 0 -%]

-          [% '<br>also a ' IF providers.also %]virtual package provided by
+          [% '<br>also a ' IF providers.also %][% g('virtual package provided by') %]

          [% js_id = name %]
            <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]">[% FOREACH provider IN providers.pkgs %]<a href="[% make_url(provider,'','suite',suite,'source','') %]">[% provider %]</a>[% ', ' UNLESS loop.last %][% END %]</span>
        [% IF providers.pkgs.size > 10 %]
          [% js_id = name %]
            <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]">[% FOREACH provider IN providers.pkgs %]<a href="[% make_url(provider,'','suite',suite,'source','') %]">[% provider %]</a>[% ', ' UNLESS loop.last %][% END %]</span>
        [% IF providers.pkgs.size > 10 %]

-       <script type="text/javascript">init_toggle_elem("[% js_id %]","[% providers.pkgs.size %] providing packages")</script>
+       <script type="text/javascript">init_toggle_elem("[% js_id %]",[% g('%u providing packages', providers.pkgs.size) %]</script>

        [% END %]
         [% END %]
         </dd>
        [% END %]
         [% END %]
         </dd>


@@ -265,16 +266,21 @@ Do not install it on a normal Debian system.</p>
     <div id="pdownload">
     <h2>Download [% pkg %]</h2>
     
     <div id="pdownload">
     <h2>Download [% pkg %]</h2>
     

-    <table summary="The download table links to the download of the package and a file overview. In addition it gives information about the package size and the installed size.">
-    <caption class="hidecss">Download for all available architectures</caption>
-    <tr><th>Architecture</th>[% '<th>Version</th>' IF versions.multiple %]<th>Package Size</th><th>Installed Size</th><th>Files</th></tr>
+    <table summary="[% g('The download table links to the download of the package and a file overview. In addition it gives information about the package size and the installed size.') %]">
+    <caption class="hidecss">[% g('Download for all available architectures') %]</caption>
+    <tr><th>[% g('Architecture') %]</th>
+       [% '<th>'_ g('Version') _'</th>' IF versions.multiple %]
+       <th>[% g('Package Size') %]</th>
+       <th>[% g('Installed Size') %]</th>
+       <th>[% g('Files') %]</th>
+    </tr>

   [%- END %]
 
 <tr>
 [% download_url = pkg _ '/' _ d.arch _ '/download'
    filelist_url = pkg _ '/' _ d.arch _ '/filelist' %]
 <th><a href="[% make_url(download_url) | uri %]">[% d.arch %]</a>
   [%- END %]
 
 <tr>
 [% download_url = pkg _ '/' _ d.arch _ '/download'
    filelist_url = pkg _ '/' _ d.arch _ '/filelist' %]
 <th><a href="[% make_url(download_url) | uri %]">[% d.arch %]</a>

-[%- SET a = d.archive; IF mirrors.$a.unofficial_port  %] <strong>(unofficial port)</strong>[% END %]</th>
+[%- SET a = d.archive; IF mirrors.$a.unofficial_port  %] <strong>[% g('(unofficial port)') %]</strong>[% END %]</th>

 [% vnorm = d.version.replace( '\+b\d+$', '' ); vlatest = version.replace( '\+b\d+$', '' );
    vup = vnorm.replace( '-[^-]+$', '' ); vuplatest = vlatest.replace( '-[^-]+$', '' );
    IF vnorm == vlatest;
 [% vnorm = d.version.replace( '\+b\d+$', '' ); vlatest = version.replace( '\+b\d+$', '' );
    vup = vnorm.replace( '-[^-]+$', '' ); vuplatest = vlatest.replace( '-[^-]+$', '' );
    IF vnorm == vlatest;


@@ -285,12 +291,12 @@ Do not install it on a normal Debian system.</p>
        version_class = 'vold';
    END %]
 [% "<td class='$version_class'>$d.version</td>" IF versions.multiple %]
        version_class = 'vold';
    END %]
 [% "<td class='$version_class'>$d.version</td>" IF versions.multiple %]

-<td class="size">[% d.pkgsize %]&nbsp;kB</td><td class="size">[% d.instsize %]&nbsp;kB</td>
+<td class="size">[% g('%.1f&nbsp;kB', d.pkgsize) %]</td><td class="size">[% g('%u&nbsp;kB', d.instsize) %]</td>

 <td>
 [% IF d.contents_avail %]
 <td>
 [% IF d.contents_avail %]

-  [<a href="[% make_url(filelist_url) | uri %]">list of files</a>]
+  [<a href="[% make_url(filelist_url) | uri %]">[% g('list of files') %]</a>]

 [% ELSE %]
 [% ELSE %]

-  no current information
+  [% g('no current information') %]

 [% END %]
 </td>
 </tr>
 [% END %]
 </td>
 </tr>


@@ -307,13 +313,13 @@ Do not install it on a normal Debian system.</p>
     <div id="pdownload">
     <h2>Download [% pkg %]</h2>
     
     <div id="pdownload">
     <h2>Download [% pkg %]</h2>
     

-    <table summary="Download information for the files of this source package">
-    <tr><th>File</th><th>Size (in kB)</th><th>md5sum</th></tr>
+    <table summary="[% g('Download information for the files of this source package') %]">
+    <tr><th>[% g('File') %]</th><th>[% g('Size (in kB)') %]</th><th>[% g('MD5 checksum') %]</th></tr>

   [%- END %]
 
 <tr>
 <td><a href="[% server _ path %]">[% filename %]</a></td>
   [%- END %]
 
 <tr>
 <td><a href="[% server _ path %]">[% filename %]</a></td>

-<td>[% size %]</td>
+<td>[% g('%.1f&nbsp;kB', size) %]</td>

 <td class="md5sum">[% md5sum %]</td>
 </tr>
 
 <td class="md5sum">[% md5sum %]</td>
 </tr>
 


@@ -326,10 +332,11 @@ Do not install it on a normal Debian system.</p>
        SET vcs_info = page.get_newest("x-vcs-$vcs_id") UNLESS vcs_info;
        IF vcs_info; %]
 <dl>
        SET vcs_info = page.get_newest("x-vcs-$vcs_id") UNLESS vcs_info;
        IF vcs_info; %]
 <dl>

-<dt>Debian Package Source Repository (<acronym title="Version Control System">VCS</acronym>: <a href="[% make_url(vcs_pkg,'','source','') %]">[% vcs_name %]</a>)</dt>
+<dt>[% g('Debian Package Source Repository (<acronym title="Version Control System">VCS</acronym>: <a href="%s">%s</a>)',
+       make_url(vcs_pkg,'','source',''), vcs_name ) %]</dt>

 <dd><a href="[% vcs_info %]" class="pvcslink">[% vcs_info %]</a></dd>
 [% IF vcs_link %]
 <dd><a href="[% vcs_info %]" class="pvcslink">[% vcs_info %]</a></dd>
 [% IF vcs_link %]

-<dt>Debian Package Source Repository (Browsable)</dt><dd><a href="[% vcs_link %]" class="pvcslink">[% vcs_link %]</a></dd>
+<dt>[% g('Debian Package Source Repository (Browsable)') %]</dt><dd><a href="[% vcs_link %]" class="pvcslink">[% vcs_link %]</a></dd>

 [% END %]
 </dl>
 [% END; END %]
 [% END %]
 </dl>
 [% END; END %]

diff --git a/templates/html/tag_index.tmpl b/templates/html/tag_index.tmpl
index 1df4853cbfe0a82d3d275fd34bfe2c7961d44db6..5f84c5e608c7a79ceb443b37e4082ae8f1602fce 100644 (file)
--- a/templates/html/tag_index.tmpl
+++ b/templates/html/tag_index.tmpl
@@ -1,13 +1,13 @@
 [% PROCESS 'html/head.tmpl' 
 [% PROCESS 'html/head.tmpl' 

-       title_tag = "Overview of available Debian Package Tags"
+       title_tag = g("Overview of available Debian Package Tags")

        keywords = debtags
        keywords = debtags

-       navigation = [  { name=>'About', url=>"/about/" },
-                       { name=>'Debtags' } ]
+       navigation = [  { name=>g('About'), url=>"/about/" },
+                       { name=>g('Debtags') } ]

 %]
 %]

-<h1>Overview of available Debian Package Tags</h1>
+<h1>[% g('Overview of available Debian Package Tags') %]</h1>

 
 [% FOREACH facet IN facets %]
 
 [% FOREACH facet IN facets %]

-       <h2 id="[% string2id(facet) %]">Facet: [% facet %]</h2>
+       <h2 id="[% string2id(facet) %]">[% g('Facet: %s', facet) %]</h2>

        <p class="pshortdesc">[% vocabulary.$facet.html_description.0 %]</p>
        <p>[% vocabulary.$facet.html_description.1 %]
 
        <p class="pshortdesc">[% vocabulary.$facet.html_description.0 %]</p>
        <p>[% vocabulary.$facet.html_description.1 %]
 

diff --git a/templates/rss/newpkg.tmpl b/templates/rss/newpkg.tmpl
index 476202d3abe42b5cdfa0195f45355f372668a85d..4735c4423848e97611f919f8e3dc595f26e79c49 100644 (file)
--- a/templates/rss/newpkg.tmpl
+++ b/templates/rss/newpkg.tmpl
@@ -13,11 +13,19 @@
     SET root_url = "$root_url$section/" IF section -%]
 
 <channel rdf:about="[% root_url %]newpkg">
     SET root_url = "$root_url$section/" IF section -%]
 
 <channel rdf:about="[% root_url %]newpkg">

-<title>New [% organisation %] Packages</title>
+<title>[% g('New %s Packages', organisation) %]</title>

 <link>[% root_url %]newpkg</link>
 <link>[% root_url %]newpkg</link>

-<description>Packages that were added to the [% suite %] [% organisation %] archive [% " (section \"$section\")" IF section %] during the last 7 days.</description>
-<dc:language>en</dc:language>
-<dc:rights>Copyright [% timestamp.year %], [% copyright.name %]</dc:rights>
+<description>
+[%- IF section; 
+       g('Packages that were added to the %s %s archive (section "%s") during the last 7 days.',
+       suite, organisation, section);
+    ELSE;
+       g('Packages that were added to the %s %s archive during the last 7 days.',
+       suite, organisation, section);
+    END; -%]
+</description>
+<dc:language>[% lang %]</dc:language>
+<dc:rights>[% g('Copyright ©') %] [% timestamp.year %], [% copyright.name %]</dc:rights>

 <dc:date>[% rss_timestamp %]</dc:date>
 <dc:publisher>[% contact.mail %]</dc:publisher>
 <syn:updatePeriod>weekly</syn:updatePeriod>
 <dc:date>[% rss_timestamp %]</dc:date>
 <dc:publisher>[% contact.mail %]</dc:publisher>
 <syn:updatePeriod>weekly</syn:updatePeriod>