Some further changes for the archive/section tooltips

* Add a missing template include
* Regenerate templates.*.po
* Move section tooltips from mirrors.tmpl to archive_layout.tmpl

diff --git a/po/templates.de.po b/po/templates.de.po
index 23bf2699f9ba530b8f0178521ea273bc69f3d8f4..9aabd13ddc8a78462c05565966d0316fb7ef95d2 100644 (file)
--- a/po/templates.de.po
+++ b/po/templates.de.po
@@ -104,27 +104,54 @@ msgstr "GNU/kFreeBSD (i386)"
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 

-#: templates/config/mirrors.tmpl:178
+#: templates/config/archive_layout.tmpl:14
+msgid "packages that meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:15
+msgid ""
+"packages that meet the Debian Free Software Guidelines but need software not "
+"in Debian main"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:16
+msgid "packages that do not meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:73
+msgid ""
+"volatile packages that need major changes during the life of a stable release"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:95
+msgid "newer packages that have been adapted to stable releases of Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:123
+msgid "ports of packages to architectures not yet available in Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:151

 msgid "North America"
 msgstr "Nordamerika"
 
 msgid "North America"
 msgstr "Nordamerika"
 

-#: templates/config/mirrors.tmpl:179
+#: templates/config/mirrors.tmpl:152

 msgid "South America"
 msgstr "Südamerika"
 
 msgid "South America"
 msgstr "Südamerika"
 

-#: templates/config/mirrors.tmpl:180
+#: templates/config/mirrors.tmpl:153

 msgid "Asia"
 msgstr "Asien"
 
 msgid "Asia"
 msgstr "Asien"
 

-#: templates/config/mirrors.tmpl:181
+#: templates/config/mirrors.tmpl:154

 msgid "Australia and New Zealand"
 msgstr "Australien und Neuseeland"
 
 msgid "Australia and New Zealand"
 msgstr "Australien und Neuseeland"
 

-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:155

 msgid "Europe"
 msgstr "Europa"
 
 msgid "Europe"
 msgstr "Europa"
 

-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:156

 msgid "Africa"
 msgstr "Afrika"
 
 msgid "Africa"
 msgstr "Afrika"
 


@@ -471,15 +498,15 @@ msgstr "kompakte, gepackte Liste im Textformat"
 msgid "New packages in "
 msgstr "Neue Pakete in "
 
 msgid "New packages in "
 msgstr "Neue Pakete in "
 

-#: templates/html/search.tmpl:19
+#: templates/html/search.tmpl:20

 msgid "Package Search Results -- %s"
 msgstr "Ergebnisse der Debian-Paketsuche -- %s"
 
 msgid "Package Search Results -- %s"
 msgstr "Ergebnisse der Debian-Paketsuche -- %s"
 

-#: templates/html/search.tmpl:28
+#: templates/html/search.tmpl:29

 msgid "Package Search Results"
 msgstr "Ergebnisse der Debian-Paketsuche"
 
 msgid "Package Search Results"
 msgstr "Ergebnisse der Debian-Paketsuche"
 

-#: templates/html/search.tmpl:35
+#: templates/html/search.tmpl:36

 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."


@@ -487,23 +514,23 @@ msgstr ""
 "Sie haben nur nach Wörtern gesucht, die exakt auf die Schlüsselwörter "
 "passen. Sie können eine <a href=\"%s\">Teilwortsuche</a> ausprobieren."
 
 "Sie haben nur nach Wörtern gesucht, die exakt auf die Schlüsselwörter "
 "passen. Sie können eine <a href=\"%s\">Teilwortsuche</a> ausprobieren."
 

-#: templates/html/search.tmpl:40
+#: templates/html/search.tmpl:41

 msgid "Search in specific suite:"
 msgstr "Suche in bestimmter Suite:"
 
 msgid "Search in specific suite:"
 msgstr "Suche in bestimmter Suite:"
 

-#: templates/html/search.tmpl:49
+#: templates/html/search.tmpl:50

 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "Suche in <a href=\"%s\">allen Suites</a>"
 
 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "Suche in <a href=\"%s\">allen Suites</a>"
 

-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:54 templates/html/search_contents.tmpl:58

 msgid "Limit search to a specific architecture:"
 msgstr "Schränke Suche auf bestimmte Architekturen ein:"
 
 msgid "Limit search to a specific architecture:"
 msgstr "Schränke Suche auf bestimmte Architekturen ein:"
 

-#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+#: templates/html/search.tmpl:63 templates/html/search_contents.tmpl:63

 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "Suche in <a href=\"%s\">allen Architekturen</a>"
 
 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "Suche in <a href=\"%s\">allen Architekturen</a>"
 

-#: templates/html/search.tmpl:69
+#: templates/html/search.tmpl:70

 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."


@@ -511,51 +538,51 @@ msgstr ""
 "<a href=\"%s\">Einige</a> Ergebnisse wurden aufgrund der Suchparameter nicht "
 "angezeigt."
 
 "<a href=\"%s\">Einige</a> Ergebnisse wurden aufgrund der Suchparameter nicht "
 "angezeigt."
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "all suites"
 msgstr "allen Suites"
 
 msgid "all suites"
 msgstr "allen Suites"
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "suite(s) <em>%s</em>"
 msgstr "Suite(s) <em>%s</em>"
 
 msgid "suite(s) <em>%s</em>"
 msgstr "Suite(s) <em>%s</em>"
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "all sections"
 msgstr "allen Bereichen"
 
 msgid "all sections"
 msgstr "allen Bereichen"
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "section(s) <em>%s</em>"
 msgstr "Bereich(e) <em>%s</em>"
 
 msgid "section(s) <em>%s</em>"
 msgstr "Bereich(e) <em>%s</em>"
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "all architectures"
 msgstr "auf allen Architekturen"
 
 msgid "all architectures"
 msgstr "auf allen Architekturen"
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "architecture(s) <em>%s</em>"
 msgstr "Architektur(en) <em>%s</em>"
 
 msgid "architecture(s) <em>%s</em>"
 msgstr "Architektur(en) <em>%s</em>"
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "packages"
 msgstr "Paketen"
 
 msgid "packages"
 msgstr "Paketen"
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "source packages"
 msgstr "Quellcode-Paketen"
 
 msgid "source packages"
 msgstr "Quellcode-Paketen"
 

-#: templates/html/search.tmpl:83
+#: templates/html/search.tmpl:84

 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 "Sie haben nach %s gesucht, deren Namen <em>%s</em> enthält, in %s, %s, und %"
 "s."
 
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 "Sie haben nach %s gesucht, deren Namen <em>%s</em> enthält, in %s, %s, und %"
 "s."
 

-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:87

 msgid " (including subword matching)"
 msgstr " (enthält Teilwortabgleich)"
 
 #. @translators: I'm really sorry :/
 msgid " (including subword matching)"
 msgstr " (enthält Teilwortabgleich)"
 
 #. @translators: I'm really sorry :/

-#: templates/html/search.tmpl:88
+#: templates/html/search.tmpl:89

 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."


@@ -563,11 +590,11 @@ msgstr ""
 "Sie haben nach <em>%s</em> in Paketnamen und -beschreibungen gesucht, in %s, "
 "%s, und %s%s."
 
 "Sie haben nach <em>%s</em> in Paketnamen und -beschreibungen gesucht, in %s, "
 "%s, und %s%s."
 

-#: templates/html/search.tmpl:94
+#: templates/html/search.tmpl:95

 msgid "Found <strong>%u</strong> matching packages."
 msgstr "<strong>%u</strong> passende Pakete gefunden."
 
 msgid "Found <strong>%u</strong> matching packages."
 msgstr "<strong>%u</strong> passende Pakete gefunden."
 

-#: templates/html/search.tmpl:99
+#: templates/html/search.tmpl:100

 msgid ""
 "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 "
 msgid ""
 "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 "


@@ -577,7 +604,7 @@ msgstr ""
 "Relevanz. Falls die ersten paar Pakete nicht auf Ihre Suche passen, "
 "versuchen Sie, mehr oder andere Suchbegriffe zu verwenden."
 
 "Relevanz. Falls die ersten paar Pakete nicht auf Ihre Suche passen, "
 "versuchen Sie, mehr oder andere Suchbegriffe zu verwenden."
 

-#: templates/html/search.tmpl:103
+#: templates/html/search.tmpl:104

 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."


@@ -586,7 +613,7 @@ msgstr ""
 "einige Ergebnisse unterdrückt sein.<br />Bitte verwenden Sie ein längeres "
 "oder weitere Suchbegriffe."
 
 "einige Ergebnisse unterdrückt sein.<br />Bitte verwenden Sie ein längeres "
 "oder weitere Suchbegriffe."
 

-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:106

 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."
 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."


@@ -594,39 +621,39 @@ msgstr ""
 "Ihr Schlüsselwort war zu allgemein.<br />Bitte verwenden Sie ein längeres "
 "oder weitere Suchbegriffe."
 
 "Ihr Schlüsselwort war zu allgemein.<br />Bitte verwenden Sie ein längeres "
 "oder weitere Suchbegriffe."
 

-#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:112 templates/html/search_contents.tmpl:131

 msgid "Sorry, your search gave no results"
 msgstr "Leider ergab Ihre Suche kein Ergebnis"
 
 msgid "Sorry, your search gave no results"
 msgstr "Leider ergab Ihre Suche kein Ergebnis"
 

-#: templates/html/search.tmpl:118
+#: templates/html/search.tmpl:119

 msgid "Package %s"
 msgstr "Paket %s"
 
 msgid "Package %s"
 msgstr "Paket %s"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "also provided by:"
 msgstr "auch bereitgestellt durch:"
 
 msgid "also provided by:"
 msgstr "auch bereitgestellt durch:"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "provided by:"
 msgstr "bereitgestellt durch:"
 
 msgid "provided by:"
 msgstr "bereitgestellt durch:"
 

-#: templates/html/search.tmpl:139
+#: templates/html/search.tmpl:140

 msgid "Source Package %s"
 msgstr "Quellcode-Paket %s"
 
 msgid "Source Package %s"
 msgstr "Quellcode-Paket %s"
 

-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:147

 msgid "Binary packages:"
 msgstr "Binär-Pakete:"
 
 msgid "Binary packages:"
 msgstr "Binär-Pakete:"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 msgid "hide %u binary packages"
 msgstr "verberge %u binäre Pakete"
 
 msgid "hide %u binary packages"
 msgstr "verberge %u binäre Pakete"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 msgid "show %u binary packages"
 msgstr "zeige %u binäre Pakete"
 
 msgid "show %u binary packages"
 msgstr "zeige %u binäre Pakete"
 

-#: templates/html/search.tmpl:158
+#: templates/html/search.tmpl:159

 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."


@@ -750,6 +777,10 @@ msgstr "Paket: %s (%s)"
 msgid "essential"
 msgstr "Essenziell"
 
 msgid "essential"
 msgstr "Essenziell"
 

+#: templates/html/show.tmpl:61
+msgid "package manager will refuse to remove this package by default"
+msgstr ""
+

 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "Links für %s"
 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "Links für %s"

diff --git a/po/templates.fi.po b/po/templates.fi.po
index f6b52dde53cf08799cbf314d89ac4beb8e042f35..ee28bd234267060c17aaafa18bdf0c68cf7ad4fc 100644 (file)
--- a/po/templates.fi.po
+++ b/po/templates.fi.po
@@ -108,27 +108,54 @@ msgstr "GNU/kFreeBSD (i386)"
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 

-#: templates/config/mirrors.tmpl:178
+#: templates/config/archive_layout.tmpl:14
+msgid "packages that meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:15
+msgid ""
+"packages that meet the Debian Free Software Guidelines but need software not "
+"in Debian main"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:16
+msgid "packages that do not meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:73
+msgid ""
+"volatile packages that need major changes during the life of a stable release"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:95
+msgid "newer packages that have been adapted to stable releases of Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:123
+msgid "ports of packages to architectures not yet available in Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:151

 msgid "North America"
 msgstr "Pohjois-Amerikka"
 
 msgid "North America"
 msgstr "Pohjois-Amerikka"
 

-#: templates/config/mirrors.tmpl:179
+#: templates/config/mirrors.tmpl:152

 msgid "South America"
 msgstr "Etelä-Amerikka"
 
 msgid "South America"
 msgstr "Etelä-Amerikka"
 

-#: templates/config/mirrors.tmpl:180
+#: templates/config/mirrors.tmpl:153

 msgid "Asia"
 msgstr "Aasia"
 
 msgid "Asia"
 msgstr "Aasia"
 

-#: templates/config/mirrors.tmpl:181
+#: templates/config/mirrors.tmpl:154

 msgid "Australia and New Zealand"
 msgstr "Australia ja Uusi-Seelanti"
 
 msgid "Australia and New Zealand"
 msgstr "Australia ja Uusi-Seelanti"
 

-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:155

 msgid "Europe"
 msgstr "Eurooppa"
 
 msgid "Europe"
 msgstr "Eurooppa"
 

-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:156

 msgid "Africa"
 msgstr "Afrikka"
 
 msgid "Africa"
 msgstr "Afrikka"
 


@@ -467,152 +494,152 @@ msgstr "pieni tiivistetty tekstiluettelo"
 msgid "New packages in "
 msgstr "Uudet paketit komponentissa "
 
 msgid "New packages in "
 msgstr "Uudet paketit komponentissa "
 

-#: templates/html/search.tmpl:19
+#: templates/html/search.tmpl:20

 msgid "Package Search Results -- %s"
 msgstr "Pakettihaun tulokset -- %s"
 
 msgid "Package Search Results -- %s"
 msgstr "Pakettihaun tulokset -- %s"
 

-#: templates/html/search.tmpl:28
+#: templates/html/search.tmpl:29

 msgid "Package Search Results"
 msgstr "Pakettihaun tulokset"
 
 msgid "Package Search Results"
 msgstr "Pakettihaun tulokset"
 

-#: templates/html/search.tmpl:35
+#: templates/html/search.tmpl:36

 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 

-#: templates/html/search.tmpl:40
+#: templates/html/search.tmpl:41

 msgid "Search in specific suite:"
 msgstr ""
 
 msgid "Search in specific suite:"
 msgstr ""
 

-#: templates/html/search.tmpl:49
+#: templates/html/search.tmpl:50

 #, fuzzy
 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "Hae <a href=\"%s\">paketin %s muita versioita</a>"
 
 #, fuzzy
 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "Hae <a href=\"%s\">paketin %s muita versioita</a>"
 

-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:54 templates/html/search_contents.tmpl:58

 msgid "Limit search to a specific architecture:"
 msgstr ""
 
 msgid "Limit search to a specific architecture:"
 msgstr ""
 

-#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+#: templates/html/search.tmpl:63 templates/html/search_contents.tmpl:63

 #, fuzzy
 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "Hae <a href=\"%s\">paketin %s muita versioita</a>"
 
 #, fuzzy
 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "Hae <a href=\"%s\">paketin %s muita versioita</a>"
 

-#: templates/html/search.tmpl:69
+#: templates/html/search.tmpl:70

 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
 
 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "all suites"
 msgstr "kaikki jakelut"
 
 msgid "all suites"
 msgstr "kaikki jakelut"
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "suite(s) <em>%s</em>"
 msgstr ""
 
 msgid "suite(s) <em>%s</em>"
 msgstr ""
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "all sections"
 msgstr "kaikki osastot"
 
 msgid "all sections"
 msgstr "kaikki osastot"
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "section(s) <em>%s</em>"
 msgstr ""
 
 msgid "section(s) <em>%s</em>"
 msgstr ""
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "all architectures"
 msgstr "kaikki arkkitehtuurit"
 
 msgid "all architectures"
 msgstr "kaikki arkkitehtuurit"
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "architecture(s) <em>%s</em>"
 msgstr ""
 
 msgid "architecture(s) <em>%s</em>"
 msgstr ""
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "packages"
 msgstr "paketit"
 
 msgid "packages"
 msgstr "paketit"
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "source packages"
 msgstr "lähdepaketit"
 
 msgid "source packages"
 msgstr "lähdepaketit"
 

-#: templates/html/search.tmpl:83
+#: templates/html/search.tmpl:84

 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 

-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:87

 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/

-#: templates/html/search.tmpl:88
+#: templates/html/search.tmpl:89

 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 

-#: templates/html/search.tmpl:94
+#: templates/html/search.tmpl:95

 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 

-#: templates/html/search.tmpl:99
+#: templates/html/search.tmpl:100

 msgid ""
 "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 keywords."
 msgstr ""
 
 msgid ""
 "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 keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:103
+#: templates/html/search.tmpl:104

 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 
 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:106

 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."
 msgstr ""
 
 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:112 templates/html/search_contents.tmpl:131

 msgid "Sorry, your search gave no results"
 msgstr "Haullasi ei löytynyt yhtään tulosta"
 
 msgid "Sorry, your search gave no results"
 msgstr "Haullasi ei löytynyt yhtään tulosta"
 

-#: templates/html/search.tmpl:118
+#: templates/html/search.tmpl:119

 msgid "Package %s"
 msgstr "Paketti %s"
 
 msgid "Package %s"
 msgstr "Paketti %s"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "also provided by:"
 msgstr "jonka toteuttaa myös:"
 
 msgid "also provided by:"
 msgstr "jonka toteuttaa myös:"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "provided by:"
 msgstr "jonka toteuttaa:"
 
 msgid "provided by:"
 msgstr "jonka toteuttaa:"
 

-#: templates/html/search.tmpl:139
+#: templates/html/search.tmpl:140

 #, fuzzy
 msgid "Source Package %s"
 msgstr "Lähdepaketti"
 
 #, fuzzy
 msgid "Source Package %s"
 msgstr "Lähdepaketti"
 

-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:147

 #, fuzzy
 msgid "Binary packages:"
 msgstr "näennäispaketti"
 
 #, fuzzy
 msgid "Binary packages:"
 msgstr "näennäispaketti"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 #, fuzzy
 msgid "hide %u binary packages"
 msgstr "Paketin koko"
 
 #, fuzzy
 msgid "hide %u binary packages"
 msgstr "Paketin koko"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 #, fuzzy
 msgid "show %u binary packages"
 msgstr "Paketin koko"
 
 #, fuzzy
 msgid "show %u binary packages"
 msgstr "Paketin koko"
 

-#: templates/html/search.tmpl:158
+#: templates/html/search.tmpl:159

 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."


@@ -738,6 +765,10 @@ msgstr "Paketti: %s (%s)"
 msgid "essential"
 msgstr "Välttämätön"
 
 msgid "essential"
 msgstr "Välttämätön"
 

+#: templates/html/show.tmpl:61
+msgid "package manager will refuse to remove this package by default"
+msgstr ""
+

 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr ""
 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr ""

diff --git a/po/templates.fr.po b/po/templates.fr.po
index 7bb4d4bde2b15ab50c13b98c35b629c4cb25893a..f29c15e83109e645d0754e5131b7dd717cd946f2 100644 (file)
--- a/po/templates.fr.po
+++ b/po/templates.fr.po
@@ -108,27 +108,54 @@ msgstr "GNU/kFreeBSD (i386)"
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 

-#: templates/config/mirrors.tmpl:178
+#: templates/config/archive_layout.tmpl:14
+msgid "packages that meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:15
+msgid ""
+"packages that meet the Debian Free Software Guidelines but need software not "
+"in Debian main"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:16
+msgid "packages that do not meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:73
+msgid ""
+"volatile packages that need major changes during the life of a stable release"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:95
+msgid "newer packages that have been adapted to stable releases of Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:123
+msgid "ports of packages to architectures not yet available in Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:151

 msgid "North America"
 msgstr "Amérique du nord"
 
 msgid "North America"
 msgstr "Amérique du nord"
 

-#: templates/config/mirrors.tmpl:179
+#: templates/config/mirrors.tmpl:152

 msgid "South America"
 msgstr "Amérique du sud"
 
 msgid "South America"
 msgstr "Amérique du sud"
 

-#: templates/config/mirrors.tmpl:180
+#: templates/config/mirrors.tmpl:153

 msgid "Asia"
 msgstr "Asie"
 
 msgid "Asia"
 msgstr "Asie"
 

-#: templates/config/mirrors.tmpl:181
+#: templates/config/mirrors.tmpl:154

 msgid "Australia and New Zealand"
 msgstr "Australie et Nouvelle-Zélande"
 
 msgid "Australia and New Zealand"
 msgstr "Australie et Nouvelle-Zélande"
 

-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:155

 msgid "Europe"
 msgstr "Europe"
 
 msgid "Europe"
 msgstr "Europe"
 

-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:156

 msgid "Africa"
 msgstr "Afrique"
 
 msgid "Africa"
 msgstr "Afrique"
 


@@ -485,151 +512,151 @@ msgstr "liste au format texte compressée"
 msgid "New packages in "
 msgstr "Nouveaux Paquets dans "
 
 msgid "New packages in "
 msgstr "Nouveaux Paquets dans "
 

-#: templates/html/search.tmpl:19
+#: templates/html/search.tmpl:20

 msgid "Package Search Results -- %s"
 msgstr "Résultats de la recherche de paquets -- %s"
 
 msgid "Package Search Results -- %s"
 msgstr "Résultats de la recherche de paquets -- %s"
 

-#: templates/html/search.tmpl:28
+#: templates/html/search.tmpl:29

 msgid "Package Search Results"
 msgstr "Résultats de la recherche de paquets"
 
 msgid "Package Search Results"
 msgstr "Résultats de la recherche de paquets"
 

-#: templates/html/search.tmpl:35
+#: templates/html/search.tmpl:36

 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 

-#: templates/html/search.tmpl:40
+#: templates/html/search.tmpl:41

 msgid "Search in specific suite:"
 msgstr ""
 
 msgid "Search in specific suite:"
 msgstr ""
 

-#: templates/html/search.tmpl:49
+#: templates/html/search.tmpl:50

 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "Chercher dans <a href=\"%s\">toutes les versions</a>"
 
 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "Chercher dans <a href=\"%s\">toutes les versions</a>"
 

-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:54 templates/html/search_contents.tmpl:58

 msgid "Limit search to a specific architecture:"
 msgstr "Limiter la recherche à une architecture particulière :"
 
 msgid "Limit search to a specific architecture:"
 msgstr "Limiter la recherche à une architecture particulière :"
 

-#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+#: templates/html/search.tmpl:63 templates/html/search_contents.tmpl:63

 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "Chercher dans <a href=\"%s\">toutes les architectures</a>"
 
 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "Chercher dans <a href=\"%s\">toutes les architectures</a>"
 

-#: templates/html/search.tmpl:69
+#: templates/html/search.tmpl:70

 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
 
 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "all suites"
 msgstr "toutes les versions"
 
 msgid "all suites"
 msgstr "toutes les versions"
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "suite(s) <em>%s</em>"
 msgstr "version(s) <em>%s</em>"
 
 msgid "suite(s) <em>%s</em>"
 msgstr "version(s) <em>%s</em>"
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "all sections"
 msgstr "toutes les sections"
 
 msgid "all sections"
 msgstr "toutes les sections"
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "section(s) <em>%s</em>"
 msgstr "section(s) <em>%s</em>"
 
 msgid "section(s) <em>%s</em>"
 msgstr "section(s) <em>%s</em>"
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "all architectures"
 msgstr "toutes les architectures"
 
 msgid "all architectures"
 msgstr "toutes les architectures"
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "architecture(s) <em>%s</em>"
 msgstr "architecture(s) <em>%s</em>"
 
 msgid "architecture(s) <em>%s</em>"
 msgstr "architecture(s) <em>%s</em>"
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 #, fuzzy
 msgid "packages"
 msgstr "Taille du paquet"
 
 #, fuzzy
 msgid "packages"
 msgstr "Taille du paquet"
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 #, fuzzy
 msgid "source packages"
 msgstr "Paquets source"
 
 #, fuzzy
 msgid "source packages"
 msgstr "Paquets source"
 

-#: templates/html/search.tmpl:83
+#: templates/html/search.tmpl:84

 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 

-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:87

 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/

-#: templates/html/search.tmpl:88
+#: templates/html/search.tmpl:89

 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 

-#: templates/html/search.tmpl:94
+#: templates/html/search.tmpl:95

 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 

-#: templates/html/search.tmpl:99
+#: templates/html/search.tmpl:100

 msgid ""
 "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 keywords."
 msgstr ""
 
 msgid ""
 "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 keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:103
+#: templates/html/search.tmpl:104

 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 
 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:106

 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."
 msgstr ""
 
 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:112 templates/html/search_contents.tmpl:131

 msgid "Sorry, your search gave no results"
 msgstr "Désolé, votre recherche n'a renvoyé aucun résultat."
 
 msgid "Sorry, your search gave no results"
 msgstr "Désolé, votre recherche n'a renvoyé aucun résultat."
 

-#: templates/html/search.tmpl:118
+#: templates/html/search.tmpl:119

 msgid "Package %s"
 msgstr "Paquet %s"
 
 msgid "Package %s"
 msgstr "Paquet %s"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 #, fuzzy
 msgid "also provided by:"
 msgstr "paquet virtuel"
 
 #, fuzzy
 msgid "also provided by:"
 msgstr "paquet virtuel"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "provided by:"
 msgstr "fourni par :"
 
 msgid "provided by:"
 msgstr "fourni par :"
 

-#: templates/html/search.tmpl:139
+#: templates/html/search.tmpl:140

 msgid "Source Package %s"
 msgstr "Paquet source %s"
 
 msgid "Source Package %s"
 msgstr "Paquet source %s"
 

-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:147

 msgid "Binary packages:"
 msgstr "Paquets binaires :"
 
 msgid "Binary packages:"
 msgstr "Paquets binaires :"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 #, fuzzy
 msgid "hide %u binary packages"
 msgstr "Taille du paquet"
 
 #, fuzzy
 msgid "hide %u binary packages"
 msgstr "Taille du paquet"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 #, fuzzy
 msgid "show %u binary packages"
 msgstr "Taille du paquet"
 
 #, fuzzy
 msgid "show %u binary packages"
 msgstr "Taille du paquet"
 

-#: templates/html/search.tmpl:158
+#: templates/html/search.tmpl:159

 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."


@@ -755,6 +782,10 @@ msgstr "Paquet : %s (%s)"
 msgid "essential"
 msgstr "essentiel"
 
 msgid "essential"
 msgstr "essentiel"
 

+#: templates/html/show.tmpl:61
+msgid "package manager will refuse to remove this package by default"
+msgstr ""
+

 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "Liens pour %s"
 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "Liens pour %s"


@@ -1230,9 +1261,9 @@ msgstr "Consultez <URL:%s> pour obtenir les termes de la licence."
 #~ "Users of experimental packages are encouraged to contact the package "
 #~ "maintainers directly in case of problems."
 #~ msgstr ""
 #~ "Users of experimental packages are encouraged to contact the package "
 #~ "maintainers directly in case of problems."
 #~ msgstr ""

-#~ "Nous encourageons les utilisateurs de paquets d'«&nbsp;experimental&nbsp;» "
-#~ "rencontrant des problèmes à contacter directement le responsable du "
-#~ "paquet."
+#~ "Nous encourageons les utilisateurs de paquets d'«&nbsp;"
+#~ "experimental&nbsp;» rencontrant des problèmes à contacter directement le "
+#~ "responsable du paquet."

 
 #~ msgid "Size is measured in kBytes."
 #~ msgstr "La taille est indiquée en kOctets"
 
 #~ msgid "Size is measured in kBytes."
 #~ msgstr "La taille est indiquée en kOctets"

diff --git a/po/templates.hu.po b/po/templates.hu.po
index e5e58675c4178036a81328122cb0e536ff6d43b9..72314b9969b2a75fa68246b25b8ac60d337c14c5 100644 (file)
--- a/po/templates.hu.po
+++ b/po/templates.hu.po
@@ -94,27 +94,54 @@ msgstr ""
 msgid "GNU/kFreeBSD (amd64)"
 msgstr ""
 
 msgid "GNU/kFreeBSD (amd64)"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:178
+#: templates/config/archive_layout.tmpl:14
+msgid "packages that meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:15
+msgid ""
+"packages that meet the Debian Free Software Guidelines but need software not "
+"in Debian main"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:16
+msgid "packages that do not meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:73
+msgid ""
+"volatile packages that need major changes during the life of a stable release"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:95
+msgid "newer packages that have been adapted to stable releases of Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:123
+msgid "ports of packages to architectures not yet available in Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:151

 msgid "North America"
 msgstr ""
 
 msgid "North America"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:179
+#: templates/config/mirrors.tmpl:152

 msgid "South America"
 msgstr ""
 
 msgid "South America"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:180
+#: templates/config/mirrors.tmpl:153

 msgid "Asia"
 msgstr ""
 
 msgid "Asia"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:181
+#: templates/config/mirrors.tmpl:154

 msgid "Australia and New Zealand"
 msgstr ""
 
 msgid "Australia and New Zealand"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:155

 msgid "Europe"
 msgstr ""
 
 msgid "Europe"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:156

 msgid "Africa"
 msgstr ""
 
 msgid "Africa"
 msgstr ""
 


@@ -412,146 +439,146 @@ msgstr ""
 msgid "New packages in "
 msgstr ""
 
 msgid "New packages in "
 msgstr ""
 

-#: templates/html/search.tmpl:19
+#: templates/html/search.tmpl:20

 msgid "Package Search Results -- %s"
 msgstr ""
 
 msgid "Package Search Results -- %s"
 msgstr ""
 

-#: templates/html/search.tmpl:28
+#: templates/html/search.tmpl:29

 msgid "Package Search Results"
 msgstr ""
 
 msgid "Package Search Results"
 msgstr ""
 

-#: templates/html/search.tmpl:35
+#: templates/html/search.tmpl:36

 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 

-#: templates/html/search.tmpl:40
+#: templates/html/search.tmpl:41

 msgid "Search in specific suite:"
 msgstr ""
 
 msgid "Search in specific suite:"
 msgstr ""
 

-#: templates/html/search.tmpl:49
+#: templates/html/search.tmpl:50

 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr ""
 
 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr ""
 

-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:54 templates/html/search_contents.tmpl:58

 msgid "Limit search to a specific architecture:"
 msgstr ""
 
 msgid "Limit search to a specific architecture:"
 msgstr ""
 

-#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+#: templates/html/search.tmpl:63 templates/html/search_contents.tmpl:63

 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr ""
 
 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr ""
 

-#: templates/html/search.tmpl:69
+#: templates/html/search.tmpl:70

 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
 
 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "all suites"
 msgstr ""
 
 msgid "all suites"
 msgstr ""
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "suite(s) <em>%s</em>"
 msgstr ""
 
 msgid "suite(s) <em>%s</em>"
 msgstr ""
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "all sections"
 msgstr ""
 
 msgid "all sections"
 msgstr ""
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "section(s) <em>%s</em>"
 msgstr ""
 
 msgid "section(s) <em>%s</em>"
 msgstr ""
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "all architectures"
 msgstr ""
 
 msgid "all architectures"
 msgstr ""
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "architecture(s) <em>%s</em>"
 msgstr ""
 
 msgid "architecture(s) <em>%s</em>"
 msgstr ""
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "packages"
 msgstr ""
 
 msgid "packages"
 msgstr ""
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "source packages"
 msgstr ""
 
 msgid "source packages"
 msgstr ""
 

-#: templates/html/search.tmpl:83
+#: templates/html/search.tmpl:84

 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 

-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:87

 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/

-#: templates/html/search.tmpl:88
+#: templates/html/search.tmpl:89

 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 

-#: templates/html/search.tmpl:94
+#: templates/html/search.tmpl:95

 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 

-#: templates/html/search.tmpl:99
+#: templates/html/search.tmpl:100

 msgid ""
 "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 keywords."
 msgstr ""
 
 msgid ""
 "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 keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:103
+#: templates/html/search.tmpl:104

 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 
 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:106

 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."
 msgstr ""
 
 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:112 templates/html/search_contents.tmpl:131

 msgid "Sorry, your search gave no results"
 msgstr ""
 
 msgid "Sorry, your search gave no results"
 msgstr ""
 

-#: templates/html/search.tmpl:118
+#: templates/html/search.tmpl:119

 msgid "Package %s"
 msgstr ""
 
 msgid "Package %s"
 msgstr ""
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "also provided by:"
 msgstr ""
 
 msgid "also provided by:"
 msgstr ""
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "provided by:"
 msgstr ""
 
 msgid "provided by:"
 msgstr ""
 

-#: templates/html/search.tmpl:139
+#: templates/html/search.tmpl:140

 msgid "Source Package %s"
 msgstr ""
 
 msgid "Source Package %s"
 msgstr ""
 

-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:147

 msgid "Binary packages:"
 msgstr ""
 
 msgid "Binary packages:"
 msgstr ""
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 msgid "hide %u binary packages"
 msgstr ""
 
 msgid "hide %u binary packages"
 msgstr ""
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 msgid "show %u binary packages"
 msgstr ""
 
 msgid "show %u binary packages"
 msgstr ""
 

-#: templates/html/search.tmpl:158
+#: templates/html/search.tmpl:159

 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."


@@ -669,6 +696,10 @@ msgstr ""
 msgid "essential"
 msgstr ""
 
 msgid "essential"
 msgstr ""
 

+#: templates/html/show.tmpl:61
+msgid "package manager will refuse to remove this package by default"
+msgstr ""
+

 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr ""
 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr ""

diff --git a/po/templates.ja.po b/po/templates.ja.po
index 0b4e197ec40ea175e7b68d73a8160d7bdc397a5a..3395fb8f6d8c12ec105506e87d6ef24a96816656 100644 (file)
--- a/po/templates.ja.po
+++ b/po/templates.ja.po
@@ -107,27 +107,54 @@ msgstr "GNU/kFreeBSD (i386)"
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 

-#: templates/config/mirrors.tmpl:178
+#: templates/config/archive_layout.tmpl:14
+msgid "packages that meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:15
+msgid ""
+"packages that meet the Debian Free Software Guidelines but need software not "
+"in Debian main"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:16
+msgid "packages that do not meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:73
+msgid ""
+"volatile packages that need major changes during the life of a stable release"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:95
+msgid "newer packages that have been adapted to stable releases of Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:123
+msgid "ports of packages to architectures not yet available in Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:151

 msgid "North America"
 msgstr "北アメリカ"
 
 msgid "North America"
 msgstr "北アメリカ"
 

-#: templates/config/mirrors.tmpl:179
+#: templates/config/mirrors.tmpl:152

 msgid "South America"
 msgstr "南アメリカ"
 
 msgid "South America"
 msgstr "南アメリカ"
 

-#: templates/config/mirrors.tmpl:180
+#: templates/config/mirrors.tmpl:153

 msgid "Asia"
 msgstr "アジア"
 
 msgid "Asia"
 msgstr "アジア"
 

-#: templates/config/mirrors.tmpl:181
+#: templates/config/mirrors.tmpl:154

 msgid "Australia and New Zealand"
 msgstr "オーストラリア・ニュージーランド"
 
 msgid "Australia and New Zealand"
 msgstr "オーストラリア・ニュージーランド"
 

-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:155

 msgid "Europe"
 msgstr "ヨーロッパ"
 
 msgid "Europe"
 msgstr "ヨーロッパ"
 

-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:156

 msgid "Africa"
 msgstr "アフリカ"
 
 msgid "Africa"
 msgstr "アフリカ"
 


@@ -470,15 +497,15 @@ msgstr "コンパクトに圧縮されたテキスト形式の一覧"
 msgid "New packages in "
 msgstr "アーカイブに含まれる新規パッケージ:"
 
 msgid "New packages in "
 msgstr "アーカイブに含まれる新規パッケージ:"
 

-#: templates/html/search.tmpl:19
+#: templates/html/search.tmpl:20

 msgid "Package Search Results -- %s"
 msgstr "パッケージ検索結果 -- %s"
 
 msgid "Package Search Results -- %s"
 msgstr "パッケージ検索結果 -- %s"
 

-#: templates/html/search.tmpl:28
+#: templates/html/search.tmpl:29

 msgid "Package Search Results"
 msgstr "パッケージ検索結果"
 
 msgid "Package Search Results"
 msgstr "パッケージ検索結果"
 

-#: templates/html/search.tmpl:35
+#: templates/html/search.tmpl:36

 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."


@@ -486,23 +513,23 @@ msgstr ""
 "キーワードに完全に一致する単語のみを検索しました。<a href=\"%s\">単語の部分的"
 "な一致を有効にして</a>検索してみるとよいでしょう。"
 
 "キーワードに完全に一致する単語のみを検索しました。<a href=\"%s\">単語の部分的"
 "な一致を有効にして</a>検索してみるとよいでしょう。"
 

-#: templates/html/search.tmpl:40
+#: templates/html/search.tmpl:41

 msgid "Search in specific suite:"
 msgstr "特定のスイートに絞って検索:"
 
 msgid "Search in specific suite:"
 msgstr "特定のスイートに絞って検索:"
 

-#: templates/html/search.tmpl:49
+#: templates/html/search.tmpl:50

 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "<a href=\"%s\">すべてのスイート</a>で検索"
 
 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "<a href=\"%s\">すべてのスイート</a>で検索"
 

-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:54 templates/html/search_contents.tmpl:58

 msgid "Limit search to a specific architecture:"
 msgstr "特定のアーキテクチャに絞って検索:"
 
 msgid "Limit search to a specific architecture:"
 msgstr "特定のアーキテクチャに絞って検索:"
 

-#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+#: templates/html/search.tmpl:63 templates/html/search_contents.tmpl:63

 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "<a href=\"%s\">すべてのアーキテクチャ</a>で検索"
 
 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "<a href=\"%s\">すべてのアーキテクチャ</a>で検索"
 

-#: templates/html/search.tmpl:69
+#: templates/html/search.tmpl:70

 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."


@@ -510,60 +537,60 @@ msgstr ""
 "検索パラメータの設定によって、<a href=\"%s\">一部</a>の結果が非表示になってい"
 "ます。"
 
 "検索パラメータの設定によって、<a href=\"%s\">一部</a>の結果が非表示になってい"
 "ます。"
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "all suites"
 msgstr "すべてのスイート"
 
 msgid "all suites"
 msgstr "すべてのスイート"
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "suite(s) <em>%s</em>"
 msgstr "<em>%s</em> スイート"
 
 msgid "suite(s) <em>%s</em>"
 msgstr "<em>%s</em> スイート"
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "all sections"
 msgstr "すべてのセクション"
 
 msgid "all sections"
 msgstr "すべてのセクション"
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "section(s) <em>%s</em>"
 msgstr "<em>%s</em> セクション"
 
 msgid "section(s) <em>%s</em>"
 msgstr "<em>%s</em> セクション"
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "all architectures"
 msgstr "すべてのアーキテクチャ"
 
 msgid "all architectures"
 msgstr "すべてのアーキテクチャ"
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "architecture(s) <em>%s</em>"
 msgstr "<em>%s</em> アーキテクチャ"
 
 msgid "architecture(s) <em>%s</em>"
 msgstr "<em>%s</em> アーキテクチャ"
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "packages"
 msgstr "パッケージ"
 
 msgid "packages"
 msgstr "パッケージ"
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "source packages"
 msgstr "ソースパッケージ"
 
 msgid "source packages"
 msgstr "ソースパッケージ"
 

-#: templates/html/search.tmpl:83
+#: templates/html/search.tmpl:84

 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr "<em>%2</em> を名前に含む%1を、%3、%4、%5で検索しました。"
 
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr "<em>%2</em> を名前に含む%1を、%3、%4、%5で検索しました。"
 

-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:87

 msgid " (including subword matching)"
 msgstr " (単語の一部が一致したものも含んでいます)"
 
 #. @translators: I'm really sorry :/
 msgid " (including subword matching)"
 msgstr " (単語の一部が一致したものも含んでいます)"
 
 #. @translators: I'm really sorry :/

-#: templates/html/search.tmpl:88
+#: templates/html/search.tmpl:89

 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 "名前や説明に<em>%s</em>を含むパッケージを、%s、%s、%sで検索しました%s。"
 
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 "名前や説明に<em>%s</em>を含むパッケージを、%s、%s、%sで検索しました%s。"
 

-#: templates/html/search.tmpl:94
+#: templates/html/search.tmpl:95

 msgid "Found <strong>%u</strong> matching packages."
 msgstr "<strong>%u</strong> 個の一致するパッケージが見つかりました。"
 
 msgid "Found <strong>%u</strong> matching packages."
 msgstr "<strong>%u</strong> 個の一致するパッケージが見つかりました。"
 

-#: templates/html/search.tmpl:99
+#: templates/html/search.tmpl:100

 msgid ""
 "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 "
 msgid ""
 "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 "


@@ -573,7 +600,7 @@ msgstr ""
 "初のいくつかのパッケージが検索しようとしたものと一致していない場合は、キー"
 "ワードを追加するか他のキーワードを用いてみてください。"
 
 "初のいくつかのパッケージが検索しようとしたものと一致していない場合は、キー"
 "ワードを追加するか他のキーワードを用いてみてください。"
 

-#: templates/html/search.tmpl:103
+#: templates/html/search.tmpl:104

 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."


@@ -582,7 +609,7 @@ msgstr ""
 "る可能性があります。<br>もっと長いキーワードを用いるか、キーワードを追加する"
 "ことを検討してください。"
 
 "る可能性があります。<br>もっと長いキーワードを用いるか、キーワードを追加する"
 "ことを検討してください。"
 

-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:106

 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."
 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."


@@ -590,39 +617,39 @@ msgstr ""
 "キーワードが一般的すぎます。<br>もっと長いキーワードを用いるか、キーワードを"
 "追加することを検討してください。"
 
 "キーワードが一般的すぎます。<br>もっと長いキーワードを用いるか、キーワードを"
 "追加することを検討してください。"
 

-#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:112 templates/html/search_contents.tmpl:131

 msgid "Sorry, your search gave no results"
 msgstr "残念ながら、検索結果はありませんでした"
 
 msgid "Sorry, your search gave no results"
 msgstr "残念ながら、検索結果はありませんでした"
 

-#: templates/html/search.tmpl:118
+#: templates/html/search.tmpl:119

 msgid "Package %s"
 msgstr "%s パッケージ"
 
 msgid "Package %s"
 msgstr "%s パッケージ"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "also provided by:"
 msgstr "また、以下のパッケージによって提供されてもいます:"
 
 msgid "also provided by:"
 msgstr "また、以下のパッケージによって提供されてもいます:"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "provided by:"
 msgstr "以下のパッケージによって提供されています:"
 
 msgid "provided by:"
 msgstr "以下のパッケージによって提供されています:"
 

-#: templates/html/search.tmpl:139
+#: templates/html/search.tmpl:140

 msgid "Source Package %s"
 msgstr "%s ソースパッケージ"
 
 msgid "Source Package %s"
 msgstr "%s ソースパッケージ"
 

-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:147

 msgid "Binary packages:"
 msgstr "バイナリパッケージ:"
 
 msgid "Binary packages:"
 msgstr "バイナリパッケージ:"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 msgid "hide %u binary packages"
 msgstr "%u 個のバイナリパッケージを非表示"
 
 msgid "hide %u binary packages"
 msgstr "%u 個のバイナリパッケージを非表示"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 msgid "show %u binary packages"
 msgstr "%u 個のバイナリパッケージを表示"
 
 msgid "show %u binary packages"
 msgstr "%u 個のバイナリパッケージを表示"
 

-#: templates/html/search.tmpl:158
+#: templates/html/search.tmpl:159

 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."


@@ -746,6 +773,10 @@ msgstr "パッケージ: %s (%s)"
 msgid "essential"
 msgstr "必須"
 
 msgid "essential"
 msgstr "必須"
 

+#: templates/html/show.tmpl:61
+msgid "package manager will refuse to remove this package by default"
+msgstr ""
+

 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "%s に関するリンク"
 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "%s に関するリンク"

diff --git a/po/templates.nl.po b/po/templates.nl.po
index 6164929bf729058a5a8f0de57c43baeb87add4a4..733b6b5868aad267c2571ab4019c8279d3fcc20f 100644 (file)
--- a/po/templates.nl.po
+++ b/po/templates.nl.po
@@ -108,27 +108,54 @@ msgstr "GNU/kFreeBSD (i386)"
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 

-#: templates/config/mirrors.tmpl:178
+#: templates/config/archive_layout.tmpl:14
+msgid "packages that meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:15
+msgid ""
+"packages that meet the Debian Free Software Guidelines but need software not "
+"in Debian main"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:16
+msgid "packages that do not meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:73
+msgid ""
+"volatile packages that need major changes during the life of a stable release"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:95
+msgid "newer packages that have been adapted to stable releases of Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:123
+msgid "ports of packages to architectures not yet available in Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:151

 msgid "North America"
 msgstr "Noord Amerika"
 
 msgid "North America"
 msgstr "Noord Amerika"
 

-#: templates/config/mirrors.tmpl:179
+#: templates/config/mirrors.tmpl:152

 msgid "South America"
 msgstr "Zuid Amerika"
 
 msgid "South America"
 msgstr "Zuid Amerika"
 

-#: templates/config/mirrors.tmpl:180
+#: templates/config/mirrors.tmpl:153

 msgid "Asia"
 msgstr "Azië"
 
 msgid "Asia"
 msgstr "Azië"
 

-#: templates/config/mirrors.tmpl:181
+#: templates/config/mirrors.tmpl:154

 msgid "Australia and New Zealand"
 msgstr "Australië en Nieuw Zeeland"
 
 msgid "Australia and New Zealand"
 msgstr "Australië en Nieuw Zeeland"
 

-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:155

 msgid "Europe"
 msgstr "Europa"
 
 msgid "Europe"
 msgstr "Europa"
 

-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:156

 msgid "Africa"
 msgstr "Afrika"
 
 msgid "Africa"
 msgstr "Afrika"
 


@@ -454,150 +481,150 @@ msgstr "compact gecomprimeerd tekstueel overzicht"
 msgid "New packages in "
 msgstr "Nieuwe pakketten in "
 
 msgid "New packages in "
 msgstr "Nieuwe pakketten in "
 

-#: templates/html/search.tmpl:19
+#: templates/html/search.tmpl:20

 #, fuzzy
 msgid "Package Search Results -- %s"
 msgstr "Alle Debianpakketten in \"%s\""
 
 #, fuzzy
 msgid "Package Search Results -- %s"
 msgstr "Alle Debianpakketten in \"%s\""
 

-#: templates/html/search.tmpl:28
+#: templates/html/search.tmpl:29

 #, fuzzy
 msgid "Package Search Results"
 msgstr "Alle Debianpakketten in \"%s\""
 
 #, fuzzy
 msgid "Package Search Results"
 msgstr "Alle Debianpakketten in \"%s\""
 

-#: templates/html/search.tmpl:35
+#: templates/html/search.tmpl:36

 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 

-#: templates/html/search.tmpl:40
+#: templates/html/search.tmpl:41

 msgid "Search in specific suite:"
 msgstr "IN een specifieke suite zoeken:"
 
 msgid "Search in specific suite:"
 msgstr "IN een specifieke suite zoeken:"
 

-#: templates/html/search.tmpl:49
+#: templates/html/search.tmpl:50

 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "Zoek in <a href=\"%s\">alle suites</a>"
 
 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "Zoek in <a href=\"%s\">alle suites</a>"
 

-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:54 templates/html/search_contents.tmpl:58

 msgid "Limit search to a specific architecture:"
 msgstr "Zoeken beperken tot een specifiek platform:"
 
 msgid "Limit search to a specific architecture:"
 msgstr "Zoeken beperken tot een specifiek platform:"
 

-#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+#: templates/html/search.tmpl:63 templates/html/search_contents.tmpl:63

 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "Zoek in <a href=\"%s\">alle platforms</a>"
 
 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "Zoek in <a href=\"%s\">alle platforms</a>"
 

-#: templates/html/search.tmpl:69
+#: templates/html/search.tmpl:70

 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
 
 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "all suites"
 msgstr "alle suites"
 
 msgid "all suites"
 msgstr "alle suites"
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 #, fuzzy
 #| msgid "suite(s) <em>$suite_enc</em>"
 msgid "suite(s) <em>%s</em>"
 msgstr "suite(s) <em>$suite_enc</em>"
 
 #, fuzzy
 #| msgid "suite(s) <em>$suite_enc</em>"
 msgid "suite(s) <em>%s</em>"
 msgstr "suite(s) <em>$suite_enc</em>"
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "all sections"
 msgstr "alle secties"
 
 msgid "all sections"
 msgstr "alle secties"
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "section(s) <em>%s</em>"
 msgstr "sectie(s) <em>%s</em>"
 
 msgid "section(s) <em>%s</em>"
 msgstr "sectie(s) <em>%s</em>"
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "all architectures"
 msgstr "alle platforms"
 
 msgid "all architectures"
 msgstr "alle platforms"
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "architecture(s) <em>%s</em>"
 msgstr "platform(s) <em>%s</em>"
 
 msgid "architecture(s) <em>%s</em>"
 msgstr "platform(s) <em>%s</em>"
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "packages"
 msgstr "pakketten"
 
 msgid "packages"
 msgstr "pakketten"
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "source packages"
 msgstr "bronpakketten"
 
 msgid "source packages"
 msgstr "bronpakketten"
 

-#: templates/html/search.tmpl:83
+#: templates/html/search.tmpl:84

 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 

-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:87

 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/

-#: templates/html/search.tmpl:88
+#: templates/html/search.tmpl:89

 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 

-#: templates/html/search.tmpl:94
+#: templates/html/search.tmpl:95

 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 

-#: templates/html/search.tmpl:99
+#: templates/html/search.tmpl:100

 msgid ""
 "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 keywords."
 msgstr ""
 
 msgid ""
 "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 keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:103
+#: templates/html/search.tmpl:104

 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 
 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:106

 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."
 msgstr ""
 
 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:112 templates/html/search_contents.tmpl:131

 msgid "Sorry, your search gave no results"
 msgstr ""
 
 msgid "Sorry, your search gave no results"
 msgstr ""
 

-#: templates/html/search.tmpl:118
+#: templates/html/search.tmpl:119

 msgid "Package %s"
 msgstr "Pakket %s"
 
 msgid "Package %s"
 msgstr "Pakket %s"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "also provided by:"
 msgstr "ook geboden door:"
 
 msgid "also provided by:"
 msgstr "ook geboden door:"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "provided by:"
 msgstr "geboden door:"
 
 msgid "provided by:"
 msgstr "geboden door:"
 

-#: templates/html/search.tmpl:139
+#: templates/html/search.tmpl:140

 msgid "Source Package %s"
 msgstr "Bronpakket %s"
 
 msgid "Source Package %s"
 msgstr "Bronpakket %s"
 

-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:147

 msgid "Binary packages:"
 msgstr "Binaire pakketten:"
 
 msgid "Binary packages:"
 msgstr "Binaire pakketten:"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 msgid "hide %u binary packages"
 msgstr "verberg %u binaire pakketten"
 
 msgid "hide %u binary packages"
 msgstr "verberg %u binaire pakketten"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 msgid "show %u binary packages"
 msgstr "toon %u binaire pakketten"
 
 msgid "show %u binary packages"
 msgstr "toon %u binaire pakketten"
 

-#: templates/html/search.tmpl:158
+#: templates/html/search.tmpl:159

 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."


@@ -716,6 +743,10 @@ msgstr "Pakket: %s (%s)"
 msgid "essential"
 msgstr "essentieel"
 
 msgid "essential"
 msgstr "essentieel"
 

+#: templates/html/show.tmpl:61
+msgid "package manager will refuse to remove this package by default"
+msgstr ""
+

 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "Verwijzigingen voor %s"
 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "Verwijzigingen voor %s"

diff --git a/po/templates.pot b/po/templates.pot
index 66acb801299ee11063f7290cf4a80a0552e7cf7e..ed0efabd2256a332608065ccc1e3c0878e01e8a9 100644 (file)
--- a/po/templates.pot
+++ b/po/templates.pot
@@ -92,27 +92,51 @@ msgstr ""
 msgid "GNU/kFreeBSD (amd64)"
 msgstr ""
 
 msgid "GNU/kFreeBSD (amd64)"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:178
+#: templates/config/archive_layout.tmpl:14
+msgid "packages that meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:15
+msgid "packages that meet the Debian Free Software Guidelines but need software not in Debian main"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:16
+msgid "packages that do not meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:73
+msgid "volatile packages that need major changes during the life of a stable release"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:95
+msgid "newer packages that have been adapted to stable releases of Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:123
+msgid "ports of packages to architectures not yet available in Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:151

 msgid "North America"
 msgstr ""
 
 msgid "North America"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:179
+#: templates/config/mirrors.tmpl:152

 msgid "South America"
 msgstr ""
 
 msgid "South America"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:180
+#: templates/config/mirrors.tmpl:153

 msgid "Asia"
 msgstr ""
 
 msgid "Asia"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:181
+#: templates/config/mirrors.tmpl:154

 msgid "Australia and New Zealand"
 msgstr ""
 
 msgid "Australia and New Zealand"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:155

 msgid "Europe"
 msgstr ""
 
 msgid "Europe"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:156

 msgid "Africa"
 msgstr ""
 
 msgid "Africa"
 msgstr ""
 


@@ -390,139 +414,139 @@ msgstr ""
 msgid "New packages in "
 msgstr ""
 
 msgid "New packages in "
 msgstr ""
 

-#: templates/html/search.tmpl:19
+#: templates/html/search.tmpl:20

 msgid "Package Search Results -- %s"
 msgstr ""
 
 msgid "Package Search Results -- %s"
 msgstr ""
 

-#: templates/html/search.tmpl:28
+#: templates/html/search.tmpl:29

 msgid "Package Search Results"
 msgstr ""
 
 msgid "Package Search Results"
 msgstr ""
 

-#: templates/html/search.tmpl:35
+#: templates/html/search.tmpl:36

 msgid "You have searched only for words exactly matching your keywords. You can try to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 
 msgid "You have searched only for words exactly matching your keywords. You can try to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 

-#: templates/html/search.tmpl:40
+#: templates/html/search.tmpl:41

 msgid "Search in specific suite:"
 msgstr ""
 
 msgid "Search in specific suite:"
 msgstr ""
 

-#: templates/html/search.tmpl:49
+#: templates/html/search.tmpl:50

 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr ""
 
 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr ""
 

-#: templates/html/search.tmpl:53
+#: templates/html/search.tmpl:54

 #: templates/html/search_contents.tmpl:58
 msgid "Limit search to a specific architecture:"
 msgstr ""
 
 #: templates/html/search_contents.tmpl:58
 msgid "Limit search to a specific architecture:"
 msgstr ""
 

-#: templates/html/search.tmpl:62
+#: templates/html/search.tmpl:63

 #: templates/html/search_contents.tmpl:63
 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr ""
 
 #: templates/html/search_contents.tmpl:63
 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr ""
 

-#: templates/html/search.tmpl:69
+#: templates/html/search.tmpl:70

 msgid "<a href=\"%s\">Some</a> results have not been displayed due to the search parameters."
 msgstr ""
 
 msgid "<a href=\"%s\">Some</a> results have not been displayed due to the search parameters."
 msgstr ""
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "all suites"
 msgstr ""
 
 msgid "all suites"
 msgstr ""
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "suite(s) <em>%s</em>"
 msgstr ""
 
 msgid "suite(s) <em>%s</em>"
 msgstr ""
 

-#: templates/html/search.tmpl:79
+#: templates/html/search.tmpl:80

 #: templates/html/search_contents.tmpl:72
 msgid "all sections"
 msgstr ""
 
 #: templates/html/search_contents.tmpl:72
 msgid "all sections"
 msgstr ""
 

-#: templates/html/search.tmpl:79
+#: templates/html/search.tmpl:80

 #: templates/html/search_contents.tmpl:72
 msgid "section(s) <em>%s</em>"
 msgstr ""
 
 #: templates/html/search_contents.tmpl:72
 msgid "section(s) <em>%s</em>"
 msgstr ""
 

-#: templates/html/search.tmpl:80
+#: templates/html/search.tmpl:81

 #: templates/html/search_contents.tmpl:73
 msgid "all architectures"
 msgstr ""
 
 #: templates/html/search_contents.tmpl:73
 msgid "all architectures"
 msgstr ""
 

-#: templates/html/search.tmpl:80
+#: templates/html/search.tmpl:81

 #: templates/html/search_contents.tmpl:73
 msgid "architecture(s) <em>%s</em>"
 msgstr ""
 
 #: templates/html/search_contents.tmpl:73
 msgid "architecture(s) <em>%s</em>"
 msgstr ""
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "source packages"
 msgstr ""
 
 msgid "source packages"
 msgstr ""
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "packages"
 msgstr ""
 
 msgid "packages"
 msgstr ""
 

-#: templates/html/search.tmpl:83
+#: templates/html/search.tmpl:84

 msgid "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 
 msgid "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 

-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:87

 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/

-#: templates/html/search.tmpl:88
+#: templates/html/search.tmpl:89

 msgid "You have searched for <em>%s</em> in packages names and descriptions in %s, %s, and %s%s."
 msgstr ""
 
 msgid "You have searched for <em>%s</em> in packages names and descriptions in %s, %s, and %s%s."
 msgstr ""
 

-#: templates/html/search.tmpl:94
+#: templates/html/search.tmpl:95

 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 

-#: templates/html/search.tmpl:99
+#: templates/html/search.tmpl:100

 msgid "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 keywords."
 msgstr ""
 
 msgid "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 keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:103
+#: templates/html/search.tmpl:104

 msgid "Your keyword was too generic, for optimizing reasons some results might have been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 
 msgid "Your keyword was too generic, for optimizing reasons some results might have been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:106

 msgid "Your keyword was too generic.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 
 msgid "Your keyword was too generic.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:111
+#: templates/html/search.tmpl:112

 #: templates/html/search_contents.tmpl:131
 msgid "Sorry, your search gave no results"
 msgstr ""
 
 #: templates/html/search_contents.tmpl:131
 msgid "Sorry, your search gave no results"
 msgstr ""
 

-#: templates/html/search.tmpl:118
+#: templates/html/search.tmpl:119

 msgid "Package %s"
 msgstr ""
 
 msgid "Package %s"
 msgstr ""
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "also provided by:"
 msgstr ""
 
 msgid "also provided by:"
 msgstr ""
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "provided by:"
 msgstr ""
 
 msgid "provided by:"
 msgstr ""
 

-#: templates/html/search.tmpl:139
+#: templates/html/search.tmpl:140

 msgid "Source Package %s"
 msgstr ""
 
 msgid "Source Package %s"
 msgstr ""
 

-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:147

 msgid "Binary packages:"
 msgstr ""
 
 msgid "Binary packages:"
 msgstr ""
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 msgid "show %u binary packages"
 msgstr ""
 
 msgid "show %u binary packages"
 msgstr ""
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 msgid "hide %u binary packages"
 msgstr ""
 
 msgid "hide %u binary packages"
 msgstr ""
 

-#: templates/html/search.tmpl:158
+#: templates/html/search.tmpl:159

 msgid "<a href=\"%s\">%u</a> results have not been displayed because you requested only exact matches."
 msgstr ""
 
 msgid "<a href=\"%s\">%u</a> results have not been displayed because you requested only exact matches."
 msgstr ""
 


@@ -637,6 +661,10 @@ msgstr ""
 msgid "essential"
 msgstr ""
 
 msgid "essential"
 msgstr ""
 

+#: templates/html/show.tmpl:61
+msgid "package manager will refuse to remove this package by default"
+msgstr ""
+

 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr ""
 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr ""

diff --git a/po/templates.ru.po b/po/templates.ru.po
index 67cbaa8a484547c9cfd46dd3c1ea897735d5a98c..493543196a5e967d327ec2667364f84640959250 100644 (file)
--- a/po/templates.ru.po
+++ b/po/templates.ru.po
@@ -107,27 +107,54 @@ msgstr "GNU/kFreeBSD (i386)"
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 

-#: templates/config/mirrors.tmpl:178
+#: templates/config/archive_layout.tmpl:14
+msgid "packages that meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:15
+msgid ""
+"packages that meet the Debian Free Software Guidelines but need software not "
+"in Debian main"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:16
+msgid "packages that do not meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:73
+msgid ""
+"volatile packages that need major changes during the life of a stable release"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:95
+msgid "newer packages that have been adapted to stable releases of Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:123
+msgid "ports of packages to architectures not yet available in Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:151

 msgid "North America"
 msgstr "Северная Америка"
 
 msgid "North America"
 msgstr "Северная Америка"
 

-#: templates/config/mirrors.tmpl:179
+#: templates/config/mirrors.tmpl:152

 msgid "South America"
 msgstr "Южная Америка"
 
 msgid "South America"
 msgstr "Южная Америка"
 

-#: templates/config/mirrors.tmpl:180
+#: templates/config/mirrors.tmpl:153

 msgid "Asia"
 msgstr "Азия"
 
 msgid "Asia"
 msgstr "Азия"
 

-#: templates/config/mirrors.tmpl:181
+#: templates/config/mirrors.tmpl:154

 msgid "Australia and New Zealand"
 msgstr "Австралия и Новая Зеландия"
 
 msgid "Australia and New Zealand"
 msgstr "Австралия и Новая Зеландия"
 

-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:155

 msgid "Europe"
 msgstr "Европа"
 
 msgid "Europe"
 msgstr "Европа"
 

-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:156

 msgid "Africa"
 msgstr "Африка"
 
 msgid "Africa"
 msgstr "Африка"
 


@@ -467,15 +494,15 @@ msgstr "сжатый текстовый список"
 msgid "New packages in "
 msgstr "Новые пакеты в "
 
 msgid "New packages in "
 msgstr "Новые пакеты в "
 

-#: templates/html/search.tmpl:19
+#: templates/html/search.tmpl:20

 msgid "Package Search Results -- %s"
 msgstr "Результаты поиска пакетов -- %s"
 
 msgid "Package Search Results -- %s"
 msgstr "Результаты поиска пакетов -- %s"
 

-#: templates/html/search.tmpl:28
+#: templates/html/search.tmpl:29

 msgid "Package Search Results"
 msgstr "Результаты поиска пакетов"
 
 msgid "Package Search Results"
 msgstr "Результаты поиска пакетов"
 

-#: templates/html/search.tmpl:35
+#: templates/html/search.tmpl:36

 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."


@@ -484,23 +511,23 @@ msgstr ""
 "попытаться выполнить поиск с <a href=\"%s\">совпадением отдельных частей "
 "слова</a>."
 
 "попытаться выполнить поиск с <a href=\"%s\">совпадением отдельных частей "
 "слова</a>."
 

-#: templates/html/search.tmpl:40
+#: templates/html/search.tmpl:41

 msgid "Search in specific suite:"
 msgstr "Поиск в заданном комплекте:"
 
 msgid "Search in specific suite:"
 msgstr "Поиск в заданном комплекте:"
 

-#: templates/html/search.tmpl:49
+#: templates/html/search.tmpl:50

 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "Поиск во <a href=\"%s\">всех комплектах</a>"
 
 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "Поиск во <a href=\"%s\">всех комплектах</a>"
 

-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:54 templates/html/search_contents.tmpl:58

 msgid "Limit search to a specific architecture:"
 msgstr "Ограничить поиск определённой архитектурой:"
 
 msgid "Limit search to a specific architecture:"
 msgstr "Ограничить поиск определённой архитектурой:"
 

-#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+#: templates/html/search.tmpl:63 templates/html/search_contents.tmpl:63

 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "Поиск во <a href=\"%s\">всех архитектурах</a>"
 
 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "Поиск во <a href=\"%s\">всех архитектурах</a>"
 

-#: templates/html/search.tmpl:69
+#: templates/html/search.tmpl:70

 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."


@@ -508,51 +535,51 @@ msgstr ""
 "<a href=\"%s\">Некоторые</a> результаты не были показаны из-за параметров "
 "поиска."
 
 "<a href=\"%s\">Некоторые</a> результаты не были показаны из-за параметров "
 "поиска."
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "all suites"
 msgstr "все комплекты"
 
 msgid "all suites"
 msgstr "все комплекты"
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "suite(s) <em>%s</em>"
 msgstr "комплект(ы) <em>%s</em>"
 
 msgid "suite(s) <em>%s</em>"
 msgstr "комплект(ы) <em>%s</em>"
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "all sections"
 msgstr "все секции"
 
 msgid "all sections"
 msgstr "все секции"
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "section(s) <em>%s</em>"
 msgstr "секция(и) <em>%s</em>"
 
 msgid "section(s) <em>%s</em>"
 msgstr "секция(и) <em>%s</em>"
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "all architectures"
 msgstr "все архитектуры"
 
 msgid "all architectures"
 msgstr "все архитектуры"
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "architecture(s) <em>%s</em>"
 msgstr "архитектура(ы) <em>%s</em>"
 
 msgid "architecture(s) <em>%s</em>"
 msgstr "архитектура(ы) <em>%s</em>"
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "packages"
 msgstr "пакеты"
 
 msgid "packages"
 msgstr "пакеты"
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "source packages"
 msgstr "пакеты исходного кода"
 
 msgid "source packages"
 msgstr "пакеты исходного кода"
 

-#: templates/html/search.tmpl:83
+#: templates/html/search.tmpl:84

 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 "Вы искали %s, в именах которых есть <em>%s</em>. Были просмотрены %s, %s и %"
 "s."
 
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 "Вы искали %s, в именах которых есть <em>%s</em>. Были просмотрены %s, %s и %"
 "s."
 

-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:87

 msgid " (including subword matching)"
 msgstr " (включая совпадение части слова)"
 
 #. @translators: I'm really sorry :/
 msgid " (including subword matching)"
 msgstr " (включая совпадение части слова)"
 
 #. @translators: I'm really sorry :/

-#: templates/html/search.tmpl:88
+#: templates/html/search.tmpl:89

 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."


@@ -560,11 +587,11 @@ msgstr ""
 "Вы искали <em>%s</em> в именах пакетов и описаниях. Были просмотрены %s, %s "
 "и %s%s."
 
 "Вы искали <em>%s</em> в именах пакетов и описаниях. Были просмотрены %s, %s "
 "и %s%s."
 

-#: templates/html/search.tmpl:94
+#: templates/html/search.tmpl:95

 msgid "Found <strong>%u</strong> matching packages."
 msgstr "Количество подходящих пакетов: <strong>%u</strong>."
 
 msgid "Found <strong>%u</strong> matching packages."
 msgstr "Количество подходящих пакетов: <strong>%u</strong>."
 

-#: templates/html/search.tmpl:99
+#: templates/html/search.tmpl:100

 msgid ""
 "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 "
 msgid ""
 "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 "


@@ -574,7 +601,7 @@ msgstr ""
 "значимости. Если первые несколько пакетов не то, что вы искали, попробуйте "
 "использовать больше ключевых слов или другие ключевые слова."
 
 "значимости. Если первые несколько пакетов не то, что вы искали, попробуйте "
 "использовать больше ключевых слов или другие ключевые слова."
 

-#: templates/html/search.tmpl:103
+#: templates/html/search.tmpl:104

 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."


@@ -583,7 +610,7 @@ msgstr ""
 "некоторые результаты показаны не будут.<br>Попробуйте использовать более "
 "длинное ключевое слово или введите больше ключевых слов."
 
 "некоторые результаты показаны не будут.<br>Попробуйте использовать более "
 "длинное ключевое слово или введите больше ключевых слов."
 

-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:106

 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."
 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."


@@ -591,39 +618,39 @@ msgstr ""
 "Вы указали слишком общее ключевое слово.<br>Попробуйте использовать более "
 "длинное ключевое слово или введите больше ключевых слов."
 
 "Вы указали слишком общее ключевое слово.<br>Попробуйте использовать более "
 "длинное ключевое слово или введите больше ключевых слов."
 

-#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:112 templates/html/search_contents.tmpl:131

 msgid "Sorry, your search gave no results"
 msgstr "Ничего не найдено"
 
 msgid "Sorry, your search gave no results"
 msgstr "Ничего не найдено"
 

-#: templates/html/search.tmpl:118
+#: templates/html/search.tmpl:119

 msgid "Package %s"
 msgstr "Пакет %s"
 
 msgid "Package %s"
 msgstr "Пакет %s"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "also provided by:"
 msgstr "также предоставляется:"
 
 msgid "also provided by:"
 msgstr "также предоставляется:"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "provided by:"
 msgstr "предоставляется:"
 
 msgid "provided by:"
 msgstr "предоставляется:"
 

-#: templates/html/search.tmpl:139
+#: templates/html/search.tmpl:140

 msgid "Source Package %s"
 msgstr "Пакет исходного кода %s"
 
 msgid "Source Package %s"
 msgstr "Пакет исходного кода %s"
 

-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:147

 msgid "Binary packages:"
 msgstr "Бинарный пакет:"
 
 msgid "Binary packages:"
 msgstr "Бинарный пакет:"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 msgid "hide %u binary packages"
 msgstr "скрыть бинарные пакеты (%u)"
 
 msgid "hide %u binary packages"
 msgstr "скрыть бинарные пакеты (%u)"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 msgid "show %u binary packages"
 msgstr "показать бинарные пакеты (%u)"
 
 msgid "show %u binary packages"
 msgstr "показать бинарные пакеты (%u)"
 

-#: templates/html/search.tmpl:158
+#: templates/html/search.tmpl:159

 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."


@@ -747,6 +774,10 @@ msgstr "Пакет: %s (%s)"
 msgid "essential"
 msgstr "значимый"
 
 msgid "essential"
 msgstr "значимый"
 

+#: templates/html/show.tmpl:61
+msgid "package manager will refuse to remove this package by default"
+msgstr ""
+

 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "Ссылки для %s"
 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "Ссылки для %s"

diff --git a/po/templates.sv.po b/po/templates.sv.po
index 4787883581dc4ad400d79a10e9bf13777a93ce9e..6eca9ba2f59b272afe7a64f3a7a7421fd4565919 100644 (file)
--- a/po/templates.sv.po
+++ b/po/templates.sv.po
@@ -105,27 +105,54 @@ msgstr "GNU/kFreeBSD (i386)"
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 

-#: templates/config/mirrors.tmpl:178
+#: templates/config/archive_layout.tmpl:14
+msgid "packages that meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:15
+msgid ""
+"packages that meet the Debian Free Software Guidelines but need software not "
+"in Debian main"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:16
+msgid "packages that do not meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:73
+msgid ""
+"volatile packages that need major changes during the life of a stable release"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:95
+msgid "newer packages that have been adapted to stable releases of Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:123
+msgid "ports of packages to architectures not yet available in Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:151

 msgid "North America"
 msgstr "Nordamerika"
 
 msgid "North America"
 msgstr "Nordamerika"
 

-#: templates/config/mirrors.tmpl:179
+#: templates/config/mirrors.tmpl:152

 msgid "South America"
 msgstr "Sydamerika"
 
 msgid "South America"
 msgstr "Sydamerika"
 

-#: templates/config/mirrors.tmpl:180
+#: templates/config/mirrors.tmpl:153

 msgid "Asia"
 msgstr "Asien"
 
 msgid "Asia"
 msgstr "Asien"
 

-#: templates/config/mirrors.tmpl:181
+#: templates/config/mirrors.tmpl:154

 msgid "Australia and New Zealand"
 msgstr "Australien och Nya Zeeland"
 
 msgid "Australia and New Zealand"
 msgstr "Australien och Nya Zeeland"
 

-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:155

 msgid "Europe"
 msgstr "Europa"
 
 msgid "Europe"
 msgstr "Europa"
 

-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:156

 msgid "Africa"
 msgstr "Afrika"
 
 msgid "Africa"
 msgstr "Afrika"
 


@@ -469,15 +496,15 @@ msgstr "kompakt komprimerad textlista"
 msgid "New packages in "
 msgstr "Nya paket i "
 
 msgid "New packages in "
 msgstr "Nya paket i "
 

-#: templates/html/search.tmpl:19
+#: templates/html/search.tmpl:20

 msgid "Package Search Results -- %s"
 msgstr "Paketsökresultat -- %s"
 
 msgid "Package Search Results -- %s"
 msgstr "Paketsökresultat -- %s"
 

-#: templates/html/search.tmpl:28
+#: templates/html/search.tmpl:29

 msgid "Package Search Results"
 msgstr "Paketsökresultat"
 
 msgid "Package Search Results"
 msgstr "Paketsökresultat"
 

-#: templates/html/search.tmpl:35
+#: templates/html/search.tmpl:36

 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."


@@ -485,23 +512,23 @@ msgstr ""
 "Du har bara sökt efter ord som exakt träffar dina nyckelord. Du kan försöka "
 "söka med <a href=\"%s\">träff av delord aktiverade</a>."
 
 "Du har bara sökt efter ord som exakt träffar dina nyckelord. Du kan försöka "
 "söka med <a href=\"%s\">träff av delord aktiverade</a>."
 

-#: templates/html/search.tmpl:40
+#: templates/html/search.tmpl:41

 msgid "Search in specific suite:"
 msgstr "Sök i specifik svit:"
 
 msgid "Search in specific suite:"
 msgstr "Sök i specifik svit:"
 

-#: templates/html/search.tmpl:49
+#: templates/html/search.tmpl:50

 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "Sök i <a  href=\"%s\">alla sviter</a>"
 
 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "Sök i <a  href=\"%s\">alla sviter</a>"
 

-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:54 templates/html/search_contents.tmpl:58

 msgid "Limit search to a specific architecture:"
 msgstr "Begränsa sökningen till en specifik arkitektur:"
 
 msgid "Limit search to a specific architecture:"
 msgstr "Begränsa sökningen till en specifik arkitektur:"
 

-#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+#: templates/html/search.tmpl:63 templates/html/search_contents.tmpl:63

 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "Sök i <a  href=\"%s\">alla arkitekturer</a>"
 
 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "Sök i <a  href=\"%s\">alla arkitekturer</a>"
 

-#: templates/html/search.tmpl:69
+#: templates/html/search.tmpl:70

 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."


@@ -509,49 +536,49 @@ msgstr ""
 "<a href=\"%s\">Vissa</a> resultat har inte visats på grund av "
 "sökparametrarna."
 
 "<a href=\"%s\">Vissa</a> resultat har inte visats på grund av "
 "sökparametrarna."
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "all suites"
 msgstr "alla sviter"
 
 msgid "all suites"
 msgstr "alla sviter"
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "suite(s) <em>%s</em>"
 msgstr "svit(en) <em>%s</em>"
 
 msgid "suite(s) <em>%s</em>"
 msgstr "svit(en) <em>%s</em>"
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "all sections"
 msgstr "alla sektioner"
 
 msgid "all sections"
 msgstr "alla sektioner"
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "section(s) <em>%s</em>"
 msgstr "sektion(er) <em>%s</em>"
 
 msgid "section(s) <em>%s</em>"
 msgstr "sektion(er) <em>%s</em>"
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "all architectures"
 msgstr "alla arkitekturer"
 
 msgid "all architectures"
 msgstr "alla arkitekturer"
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "architecture(s) <em>%s</em>"
 msgstr "arkitektur(er) <em>%s</em>"
 
 msgid "architecture(s) <em>%s</em>"
 msgstr "arkitektur(er) <em>%s</em>"
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "packages"
 msgstr "paket"
 
 msgid "packages"
 msgstr "paket"
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "source packages"
 msgstr "källkodspaket"
 
 msgid "source packages"
 msgstr "källkodspaket"
 

-#: templates/html/search.tmpl:83
+#: templates/html/search.tmpl:84

 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr "Du har sökt efter %s vars namn innehåller <em>%s</em> i %s, %s och %s."
 
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr "Du har sökt efter %s vars namn innehåller <em>%s</em> i %s, %s och %s."
 

-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:87

 msgid " (including subword matching)"
 msgstr " (inkluderar delordsträffar)"
 
 #. @translators: I'm really sorry :/
 msgid " (including subword matching)"
 msgstr " (inkluderar delordsträffar)"
 
 #. @translators: I'm really sorry :/

-#: templates/html/search.tmpl:88
+#: templates/html/search.tmpl:89

 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."


@@ -559,11 +586,11 @@ msgstr ""
 "Du har sökt efter <em>%s</em> i paketnamn och beskrivningar i %s, %s och %s%"
 "s."
 
 "Du har sökt efter <em>%s</em> i paketnamn och beskrivningar i %s, %s och %s%"
 "s."
 

-#: templates/html/search.tmpl:94
+#: templates/html/search.tmpl:95

 msgid "Found <strong>%u</strong> matching packages."
 msgstr "Hittade <strong>%u</strong> paket."
 
 msgid "Found <strong>%u</strong> matching packages."
 msgstr "Hittade <strong>%u</strong> paket."
 

-#: templates/html/search.tmpl:99
+#: templates/html/search.tmpl:100

 msgid ""
 "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 "
 msgid ""
 "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 "


@@ -573,7 +600,7 @@ msgstr ""
 "de första paketen inte är det du sökte efter, försök använda fler eller "
 "andra nyckelord."
 
 "de första paketen inte är det du sökte efter, försök använda fler eller "
 "andra nyckelord."
 

-#: templates/html/search.tmpl:103
+#: templates/html/search.tmpl:104

 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."


@@ -581,7 +608,7 @@ msgstr ""
 "Ditt nyckelord var för allmänt, och på grund av optimeringar kan vissa "
 "resultat ha dolts.<br>FÖrsök använda ett längre, eller flera, nyckelord."
 
 "Ditt nyckelord var för allmänt, och på grund av optimeringar kan vissa "
 "resultat ha dolts.<br>FÖrsök använda ett längre, eller flera, nyckelord."
 

-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:106

 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."
 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."


@@ -589,39 +616,39 @@ msgstr ""
 "Ditt nyckelord var för allmänt<br>FÖrsök använda ett längre, eller flera,"
 "nyckelord."
 
 "Ditt nyckelord var för allmänt<br>FÖrsök använda ett längre, eller flera,"
 "nyckelord."
 

-#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:112 templates/html/search_contents.tmpl:131

 msgid "Sorry, your search gave no results"
 msgstr "Din sökning gav dessvärre inga resultat"
 
 msgid "Sorry, your search gave no results"
 msgstr "Din sökning gav dessvärre inga resultat"
 

-#: templates/html/search.tmpl:118
+#: templates/html/search.tmpl:119

 msgid "Package %s"
 msgstr "Paketet %s"
 
 msgid "Package %s"
 msgstr "Paketet %s"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "also provided by:"
 msgstr "tillhandahålls också av:"
 
 msgid "also provided by:"
 msgstr "tillhandahålls också av:"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "provided by:"
 msgstr "tillhandahålls av:"
 
 msgid "provided by:"
 msgstr "tillhandahålls av:"
 

-#: templates/html/search.tmpl:139
+#: templates/html/search.tmpl:140

 msgid "Source Package %s"
 msgstr "Källkodspaketet %s"
 
 msgid "Source Package %s"
 msgstr "Källkodspaketet %s"
 

-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:147

 msgid "Binary packages:"
 msgstr "Binärpaket:"
 
 msgid "Binary packages:"
 msgstr "Binärpaket:"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 msgid "hide %u binary packages"
 msgstr "dölj %u binärpaket"
 
 msgid "hide %u binary packages"
 msgstr "dölj %u binärpaket"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 msgid "show %u binary packages"
 msgstr "visa %u binärpaket"
 
 msgid "show %u binary packages"
 msgstr "visa %u binärpaket"
 

-#: templates/html/search.tmpl:158
+#: templates/html/search.tmpl:159

 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."


@@ -743,6 +770,10 @@ msgstr "Paket: %s (%s)"
 msgid "essential"
 msgstr "systemkritiskt"
 
 msgid "essential"
 msgstr "systemkritiskt"
 

+#: templates/html/show.tmpl:61
+msgid "package manager will refuse to remove this package by default"
+msgstr ""
+

 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "Länkar för %s"
 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "Länkar för %s"

diff --git a/po/templates.uk.po b/po/templates.uk.po
index 3f267c3a96aed6547800bc2c6ae8b149234f2c74..4994494742eceea2777017642d4e16c98825a05a 100644 (file)
--- a/po/templates.uk.po
+++ b/po/templates.uk.po
@@ -108,27 +108,54 @@ msgstr ""
 msgid "GNU/kFreeBSD (amd64)"
 msgstr ""
 
 msgid "GNU/kFreeBSD (amd64)"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:178
+#: templates/config/archive_layout.tmpl:14
+msgid "packages that meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:15
+msgid ""
+"packages that meet the Debian Free Software Guidelines but need software not "
+"in Debian main"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:16
+msgid "packages that do not meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:73
+msgid ""
+"volatile packages that need major changes during the life of a stable release"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:95
+msgid "newer packages that have been adapted to stable releases of Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:123
+msgid "ports of packages to architectures not yet available in Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:151

 msgid "North America"
 msgstr ""
 
 msgid "North America"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:179
+#: templates/config/mirrors.tmpl:152

 msgid "South America"
 msgstr ""
 
 msgid "South America"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:180
+#: templates/config/mirrors.tmpl:153

 msgid "Asia"
 msgstr ""
 
 msgid "Asia"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:181
+#: templates/config/mirrors.tmpl:154

 msgid "Australia and New Zealand"
 msgstr ""
 
 msgid "Australia and New Zealand"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:155

 msgid "Europe"
 msgstr ""
 
 msgid "Europe"
 msgstr ""
 

-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:156

 msgid "Africa"
 msgstr ""
 
 msgid "Africa"
 msgstr ""
 


@@ -498,162 +525,162 @@ msgstr "компактний стислий список"
 msgid "New packages in "
 msgstr "Нові пакунки в дистрибутиві „%s“"
 
 msgid "New packages in "
 msgstr "Нові пакунки в дистрибутиві „%s“"
 

-#: templates/html/search.tmpl:19
+#: templates/html/search.tmpl:20

 #, fuzzy
 msgid "Package Search Results -- %s"
 msgstr "Всі пакунки Debian в дистрибутиві „%s“"
 
 #, fuzzy
 msgid "Package Search Results -- %s"
 msgstr "Всі пакунки Debian в дистрибутиві „%s“"
 

-#: templates/html/search.tmpl:28
+#: templates/html/search.tmpl:29

 #, fuzzy
 msgid "Package Search Results"
 msgstr "Всі пакунки Debian в дистрибутиві „%s“"
 
 #, fuzzy
 msgid "Package Search Results"
 msgstr "Всі пакунки Debian в дистрибутиві „%s“"
 

-#: templates/html/search.tmpl:35
+#: templates/html/search.tmpl:36

 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 

-#: templates/html/search.tmpl:40
+#: templates/html/search.tmpl:41

 msgid "Search in specific suite:"
 msgstr ""
 
 msgid "Search in specific suite:"
 msgstr ""
 

-#: templates/html/search.tmpl:49
+#: templates/html/search.tmpl:50

 #, fuzzy
 #| msgid "Search for <a href=\"%s\">other versions of %s</a>"
 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "Шукати на <a href=\"%s\">інші версії %s</a>"
 
 #, fuzzy
 #| msgid "Search for <a href=\"%s\">other versions of %s</a>"
 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "Шукати на <a href=\"%s\">інші версії %s</a>"
 

-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:54 templates/html/search_contents.tmpl:58

 msgid "Limit search to a specific architecture:"
 msgstr ""
 
 msgid "Limit search to a specific architecture:"
 msgstr ""
 

-#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+#: templates/html/search.tmpl:63 templates/html/search_contents.tmpl:63

 #, fuzzy
 #| msgid "Search for <a href=\"%s\">other versions of %s</a>"
 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "Шукати на <a href=\"%s\">інші версії %s</a>"
 
 #, fuzzy
 #| msgid "Search for <a href=\"%s\">other versions of %s</a>"
 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "Шукати на <a href=\"%s\">інші версії %s</a>"
 

-#: templates/html/search.tmpl:69
+#: templates/html/search.tmpl:70

 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
 
 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "all suites"
 msgstr ""
 
 msgid "all suites"
 msgstr ""
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "suite(s) <em>%s</em>"
 msgstr ""
 
 msgid "suite(s) <em>%s</em>"
 msgstr ""
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 #, fuzzy
 msgid "all sections"
 msgstr "Розділ"
 
 #, fuzzy
 msgid "all sections"
 msgstr "Розділ"
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "section(s) <em>%s</em>"
 msgstr ""
 
 msgid "section(s) <em>%s</em>"
 msgstr ""
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 #, fuzzy
 msgid "all architectures"
 msgstr "Архітектура"
 
 #, fuzzy
 msgid "all architectures"
 msgstr "Архітектура"
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "architecture(s) <em>%s</em>"
 msgstr ""
 
 msgid "architecture(s) <em>%s</em>"
 msgstr ""
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 #, fuzzy
 msgid "packages"
 msgstr "Розмір пакунка"
 
 #, fuzzy
 msgid "packages"
 msgstr "Розмір пакунка"
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 #, fuzzy
 msgid "source packages"
 msgstr "Джерельний пакунок"
 
 #, fuzzy
 msgid "source packages"
 msgstr "Джерельний пакунок"
 

-#: templates/html/search.tmpl:83
+#: templates/html/search.tmpl:84

 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 

-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:87

 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/

-#: templates/html/search.tmpl:88
+#: templates/html/search.tmpl:89

 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 

-#: templates/html/search.tmpl:94
+#: templates/html/search.tmpl:95

 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 

-#: templates/html/search.tmpl:99
+#: templates/html/search.tmpl:100

 msgid ""
 "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 keywords."
 msgstr ""
 
 msgid ""
 "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 keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:103
+#: templates/html/search.tmpl:104

 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 
 msgid ""
 "Your keyword was too generic, for optimizing reasons some results might have "
 "been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:106

 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."
 msgstr ""
 
 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."
 msgstr ""
 

-#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:112 templates/html/search_contents.tmpl:131

 msgid "Sorry, your search gave no results"
 msgstr ""
 
 msgid "Sorry, your search gave no results"
 msgstr ""
 

-#: templates/html/search.tmpl:118
+#: templates/html/search.tmpl:119

 #, fuzzy
 msgid "Package %s"
 msgstr "Пакунок: %s (%s)"
 
 #, fuzzy
 msgid "Package %s"
 msgstr "Пакунок: %s (%s)"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 #, fuzzy
 msgid "also provided by:"
 msgstr "віртуальний пакунок"
 
 #, fuzzy
 msgid "also provided by:"
 msgstr "віртуальний пакунок"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "provided by:"
 msgstr ""
 
 msgid "provided by:"
 msgstr ""
 

-#: templates/html/search.tmpl:139
+#: templates/html/search.tmpl:140

 #, fuzzy
 msgid "Source Package %s"
 msgstr "Джерельний пакунок"
 
 #, fuzzy
 msgid "Source Package %s"
 msgstr "Джерельний пакунок"
 

-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:147

 #, fuzzy
 msgid "Binary packages:"
 msgstr "віртуальний пакунок"
 
 #, fuzzy
 msgid "Binary packages:"
 msgstr "віртуальний пакунок"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 #, fuzzy
 msgid "hide %u binary packages"
 msgstr "Розмір пакунка"
 
 #, fuzzy
 msgid "hide %u binary packages"
 msgstr "Розмір пакунка"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 #, fuzzy
 msgid "show %u binary packages"
 msgstr "Розмір пакунка"
 
 #, fuzzy
 msgid "show %u binary packages"
 msgstr "Розмір пакунка"
 

-#: templates/html/search.tmpl:158
+#: templates/html/search.tmpl:159

 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."


@@ -783,6 +810,10 @@ msgstr "Пакунок: %s (%s)"
 msgid "essential"
 msgstr "Необхідний"
 
 msgid "essential"
 msgstr "Необхідний"
 

+#: templates/html/show.tmpl:61
+msgid "package manager will refuse to remove this package by default"
+msgstr ""
+

 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr ""
 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr ""

diff --git a/po/templates.zh-cn.po b/po/templates.zh-cn.po
index d92f9b06e8adb50e72514499c7686643fa9e8516..adda21641294d8259c62c6e9f783e4201a8e04ac 100644 (file)
--- a/po/templates.zh-cn.po
+++ b/po/templates.zh-cn.po
@@ -103,27 +103,54 @@ msgstr "GNU/kFreeBSD (i386)"
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 

-#: templates/config/mirrors.tmpl:178
+#: templates/config/archive_layout.tmpl:14
+msgid "packages that meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:15
+msgid ""
+"packages that meet the Debian Free Software Guidelines but need software not "
+"in Debian main"
+msgstr ""
+
+#: templates/config/archive_layout.tmpl:16
+msgid "packages that do not meet the Debian Free Software Guidelines"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:73
+msgid ""
+"volatile packages that need major changes during the life of a stable release"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:95
+msgid "newer packages that have been adapted to stable releases of Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:123
+msgid "ports of packages to architectures not yet available in Debian"
+msgstr ""
+
+#: templates/config/mirrors.tmpl:151

 msgid "North America"
 msgstr "北美洲"
 
 msgid "North America"
 msgstr "北美洲"
 

-#: templates/config/mirrors.tmpl:179
+#: templates/config/mirrors.tmpl:152

 msgid "South America"
 msgstr "南美洲"
 
 msgid "South America"
 msgstr "南美洲"
 

-#: templates/config/mirrors.tmpl:180
+#: templates/config/mirrors.tmpl:153

 msgid "Asia"
 msgstr "亚洲"
 
 msgid "Asia"
 msgstr "亚洲"
 

-#: templates/config/mirrors.tmpl:181
+#: templates/config/mirrors.tmpl:154

 msgid "Australia and New Zealand"
 msgstr "澳洲和大洋洲"
 
 msgid "Australia and New Zealand"
 msgstr "澳洲和大洋洲"
 

-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:155

 msgid "Europe"
 msgstr "欧洲"
 
 msgid "Europe"
 msgstr "欧洲"
 

-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:156

 msgid "Africa"
 msgstr "非洲"
 
 msgid "Africa"
 msgstr "非洲"
 


@@ -447,15 +474,15 @@ msgstr "经过压缩的文本清单"
 msgid "New packages in "
 msgstr "所属的新进软件包"
 
 msgid "New packages in "
 msgstr "所属的新进软件包"
 

-#: templates/html/search.tmpl:19
+#: templates/html/search.tmpl:20

 msgid "Package Search Results -- %s"
 msgstr "软件包搜索结果 -- %s"
 
 msgid "Package Search Results -- %s"
 msgstr "软件包搜索结果 -- %s"
 

-#: templates/html/search.tmpl:28
+#: templates/html/search.tmpl:29

 msgid "Package Search Results"
 msgstr "软件包搜索结果"
 
 msgid "Package Search Results"
 msgstr "软件包搜索结果"
 

-#: templates/html/search.tmpl:35
+#: templates/html/search.tmpl:36

 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."


@@ -463,27 +490,27 @@ msgstr ""
 "您刚才搜索的仅限于完整匹配您指定关键字的内容。您还可以尝试搜索<a href=\"%s\">"
 "部分匹配</a>您指定关键字的内容。"
 
 "您刚才搜索的仅限于完整匹配您指定关键字的内容。您还可以尝试搜索<a href=\"%s\">"
 "部分匹配</a>您指定关键字的内容。"
 

-#: templates/html/search.tmpl:40
+#: templates/html/search.tmpl:41

 #, fuzzy
 #| msgid "Search in other suite:"
 msgid "Search in specific suite:"
 msgstr "在其他的发行版中搜索:"
 
 #, fuzzy
 #| msgid "Search in other suite:"
 msgid "Search in specific suite:"
 msgstr "在其他的发行版中搜索:"
 

-#: templates/html/search.tmpl:49
+#: templates/html/search.tmpl:50

 #, fuzzy
 #| msgid "Search in <a href=\"%s\">all architectures</a>"
 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "在<a href=\"%s\">所有硬件架构</a>中搜索"
 
 #, fuzzy
 #| msgid "Search in <a href=\"%s\">all architectures</a>"
 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr "在<a href=\"%s\">所有硬件架构</a>中搜索"
 

-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:54 templates/html/search_contents.tmpl:58

 msgid "Limit search to a specific architecture:"
 msgstr "只搜索某一种硬件架构:"
 
 msgid "Limit search to a specific architecture:"
 msgstr "只搜索某一种硬件架构:"
 

-#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+#: templates/html/search.tmpl:63 templates/html/search_contents.tmpl:63

 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "在<a href=\"%s\">所有硬件架构</a>中搜索"
 
 msgid "Search in <a href=\"%s\">all architectures</a>"
 msgstr "在<a href=\"%s\">所有硬件架构</a>中搜索"
 

-#: templates/html/search.tmpl:69
+#: templates/html/search.tmpl:70

 #, fuzzy
 #| msgid ""
 #| "<a href=\"%s\">%u</a> results have not been displayed due to the search "
 #, fuzzy
 #| msgid ""
 #| "<a href=\"%s\">%u</a> results have not been displayed due to the search "


@@ -494,51 +521,51 @@ msgid ""
 msgstr ""
 "由于参数界定了搜索范围，导致 <a href=\"%s\">%u</a> 个相关结果没有列出。"
 
 msgstr ""
 "由于参数界定了搜索范围，导致 <a href=\"%s\">%u</a> 个相关结果没有列出。"
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 msgid "all suites"
 msgstr "所有发行版"
 
 msgid "all suites"
 msgstr "所有发行版"
 

-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79

 #, fuzzy
 #| msgid "section(s) <em>%s</em>"
 msgid "suite(s) <em>%s</em>"
 msgstr " <em>%s</em> 版面"
 
 #, fuzzy
 #| msgid "section(s) <em>%s</em>"
 msgid "suite(s) <em>%s</em>"
 msgstr " <em>%s</em> 版面"
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "all sections"
 msgstr "所有版面"
 
 msgid "all sections"
 msgstr "所有版面"
 

-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:72

 msgid "section(s) <em>%s</em>"
 msgstr " <em>%s</em> 版面"
 
 msgid "section(s) <em>%s</em>"
 msgstr " <em>%s</em> 版面"
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "all architectures"
 msgstr "所有硬件架构"
 
 msgid "all architectures"
 msgstr "所有硬件架构"
 

-#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:81 templates/html/search_contents.tmpl:73

 msgid "architecture(s) <em>%s</em>"
 msgstr " <em>%s</em> 硬件架构"
 
 msgid "architecture(s) <em>%s</em>"
 msgstr " <em>%s</em> 硬件架构"
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "packages"
 msgstr "软件包"
 
 msgid "packages"
 msgstr "软件包"
 

-#: templates/html/search.tmpl:82
+#: templates/html/search.tmpl:83

 msgid "source packages"
 msgstr "源码包"
 
 msgid "source packages"
 msgstr "源码包"
 

-#: templates/html/search.tmpl:83
+#: templates/html/search.tmpl:84

 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr "您在%3中%5下%4里，指定关键字 <em>%2</em> 在%1名称中搜索的结果。"
 
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr "您在%3中%5下%4里，指定关键字 <em>%2</em> 在%1名称中搜索的结果。"
 

-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:87

 msgid " (including subword matching)"
 msgstr "(包括部分关键字匹配)"
 
 #. @translators: I'm really sorry :/
 msgid " (including subword matching)"
 msgstr "(包括部分关键字匹配)"
 
 #. @translators: I'm really sorry :/

-#: templates/html/search.tmpl:88
+#: templates/html/search.tmpl:89

 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."


@@ -546,11 +573,11 @@ msgstr ""
 "您在%2中%4下%3里，指定关键字 <em>%1</em> 在软件包名称和描述信息中搜索的结果%"
 "5。"
 
 "您在%2中%4下%3里，指定关键字 <em>%1</em> 在软件包名称和描述信息中搜索的结果%"
 "5。"
 

-#: templates/html/search.tmpl:94
+#: templates/html/search.tmpl:95

 msgid "Found <strong>%u</strong> matching packages."
 msgstr "找到 <strong>%u</strong> 个匹配的软件包。"
 
 msgid "Found <strong>%u</strong> matching packages."
 msgstr "找到 <strong>%u</strong> 个匹配的软件包。"
 

-#: templates/html/search.tmpl:99
+#: templates/html/search.tmpl:100

 msgid ""
 "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 "
 msgid ""
 "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 "


@@ -559,7 +586,7 @@ msgstr ""
 "注意: 这里列出的是最符合搜索关键字要求的结果，并按相关性作了排序。如果前几个"
 "包不是您要找的，请尝试更多的或者其它的关键字。"
 
 "注意: 这里列出的是最符合搜索关键字要求的结果，并按相关性作了排序。如果前几个"
 "包不是您要找的，请尝试更多的或者其它的关键字。"
 

-#: templates/html/search.tmpl:103
+#: templates/html/search.tmpl:104

 #, fuzzy
 #| msgid ""
 #| "Your search was too wide so we will only display exact matches. At least "
 #, fuzzy
 #| msgid ""
 #| "Your search was too wide so we will only display exact matches. At least "


@@ -572,7 +599,7 @@ msgstr ""
 "由于您的搜索范围太大我们只列出了能完整匹配搜索关键字的结果。至少有 <em>%u</"
 "em> 个相关结果没有被列出。请考虑更换一个更准确的关键字或者添加更多的关键字。"
 
 "由于您的搜索范围太大我们只列出了能完整匹配搜索关键字的结果。至少有 <em>%u</"
 "em> 个相关结果没有被列出。请考虑更换一个更准确的关键字或者添加更多的关键字。"
 

-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:106

 #, fuzzy
 #| msgid ""
 #| "Note: Your search was too wide so we will only display only the first "
 #, fuzzy
 #| msgid ""
 #| "Note: Your search was too wide so we will only display only the first "


@@ -585,43 +612,43 @@ msgstr ""
 "注意: 由于您的搜索范围太大我们只列出了前 100 个结果。请考虑更换一个更准确的关"
 "键字或者添加更多的关键字。"
 
 "注意: 由于您的搜索范围太大我们只列出了前 100 个结果。请考虑更换一个更准确的关"
 "键字或者添加更多的关键字。"
 

-#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:112 templates/html/search_contents.tmpl:131

 msgid "Sorry, your search gave no results"
 msgstr "很遗憾，您没能搜索到任何结果"
 
 msgid "Sorry, your search gave no results"
 msgstr "很遗憾，您没能搜索到任何结果"
 

-#: templates/html/search.tmpl:118
+#: templates/html/search.tmpl:119

 msgid "Package %s"
 msgstr "软件包 %s"
 
 msgid "Package %s"
 msgstr "软件包 %s"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "also provided by:"
 msgstr "同时提供该包的还有:"
 
 msgid "also provided by:"
 msgstr "同时提供该包的还有:"
 

-#: templates/html/search.tmpl:130
+#: templates/html/search.tmpl:131

 msgid "provided by:"
 msgstr "由这些包填实:"
 
 msgid "provided by:"
 msgstr "由这些包填实:"
 

-#: templates/html/search.tmpl:139
+#: templates/html/search.tmpl:140

 msgid "Source Package %s"
 msgstr "源码包 %s"
 
 msgid "Source Package %s"
 msgstr "源码包 %s"
 

-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:147

 msgid "Binary packages:"
 msgstr "二进制包:"
 
 msgid "Binary packages:"
 msgstr "二进制包:"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 #, fuzzy
 #| msgid "%u binary packages"
 msgid "hide %u binary packages"
 msgstr "%u 个二进制包"
 
 #, fuzzy
 #| msgid "%u binary packages"
 msgid "hide %u binary packages"
 msgstr "%u 个二进制包"
 

-#: templates/html/search.tmpl:148
+#: templates/html/search.tmpl:149

 #, fuzzy
 #| msgid "%u binary packages"
 msgid "show %u binary packages"
 msgstr "%u 个二进制包"
 
 #, fuzzy
 #| msgid "%u binary packages"
 msgid "show %u binary packages"
 msgstr "%u 个二进制包"
 

-#: templates/html/search.tmpl:158
+#: templates/html/search.tmpl:159

 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."


@@ -743,6 +770,10 @@ msgstr "软件包: %s (%s)"
 msgid "essential"
 msgstr "必备"
 
 msgid "essential"
 msgstr "必备"
 

+#: templates/html/show.tmpl:61
+msgid "package manager will refuse to remove this package by default"
+msgstr ""
+

 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "%s 的相关链接"
 #: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "%s 的相关链接"

diff --git a/templates/config/archive_layout.tmpl b/templates/config/archive_layout.tmpl
index 6e501c7ababaf3983d2b0c7f1cb8f3d506a1b00c..30c28501fa39671a1774c9998cbc7d54a034dfc5 100644 (file)
--- a/templates/config/archive_layout.tmpl
+++ b/templates/config/archive_layout.tmpl
@@ -9,4 +9,11 @@
                lenny => 'testing',
                sid => 'unstable',
                   }
                lenny => 'testing',
                sid => 'unstable',
                   }

+
+   section_titles = {
+                main => g('packages that meet the Debian Free Software Guidelines'),
+                contrib => g('packages that meet the Debian Free Software Guidelines but need software not in Debian main'),
+                'non-free' => g('packages that do not meet the Debian Free Software Guidelines'),
+        }
+

 %]
 %]

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index 8a0d18e464f02b7057a5ddb463f4d17f6a119e13..d10f12499594622cec81ecfb1e137eff0d380ae5 100644 (file)
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -155,12 +155,4 @@ continents = {
                europa        => g('Europe'),
                africa        => g('Africa'),
        }
                europa        => g('Europe'),
                africa        => g('Africa'),
        }

-
-section_titles = {
-               'main' => g('packages that meet the Debian Free Software Guidelines'),
-               'contrib' => g('packages that meet the Debian Free Software Guidelines but need software not in Debian main'),
-               'non-free' => g('packages that do not meet the Debian Free Software Guidelines'),
-       }
-

 %]
 %]

-

diff --git a/templates/html/search.tmpl b/templates/html/search.tmpl
index ede09eaa90c2dcb97bcbc27c7d46743774e1ae07..4503526eced2bfe981ce1d8620e1b7380f507bab 100644 (file)
--- a/templates/html/search.tmpl
+++ b/templates/html/search.tmpl
@@ -1,4 +1,5 @@
 [%- PROCESS 'config/archive_layout.tmpl' -%]
 [%- PROCESS 'config/archive_layout.tmpl' -%]

+[%- PROCESS 'config/mirrors.tmpl' -%]

 [%- keyword_str = search_keywords.join(' ');
    keyword_esc = uri_escape(keyword_str);
    keyword_enc = html_encode(keyword_str);
 [%- keyword_str = search_keywords.join(' ');
    keyword_esc = uri_escape(keyword_str);
    keyword_enc = html_encode(keyword_str);