Merge branch 'master' into ubuntu-master

diff --git a/TODO b/TODO
index ef302932d49072fae9fae31da4f854cb77cbe502..f2b50f720eae4da6540ae1ba86fa73dd6d1a4b71 100644 (file)
--- a/TODO
+++ b/TODO
@@ -60,6 +60,13 @@ General:
   Bugs      -- not needed
   Task
   Python-Version(s) -- not needed
+- screenshots - http://bugs.debian.org/262617. Possible filtering for not
+  displaying the screenshot part:
+  * http://screenshots.debian.net/json/screenshots contains all available
+    screenshots (for potential filtered out ones to force-display them)
+  * filter on debtags: interface::3d interface::framebuffer interface::svga
+    interface::text-mode interface::web interface::x11
+  * filter on sections: libs, oldlibs, debug, ... Ask for input.
 
 Cron:
 - Verify Release files

diff --git a/po/langs.fr.po b/po/langs.fr.po
index 8fb3a36bde55fb4a4a8c02e2f7c4291ee94468f1..277f315e916e4bc1a86afb61efb6ca8a8b4c4082 100644 (file)
--- a/po/langs.fr.po
+++ b/po/langs.fr.po
@@ -1,21 +1,25 @@
 # Translations of language names for the Debian web site.
 # Copyright (C) 2002 SPI, Inc.
-# Martin Quinson <Martin.Quinson@tuxfamily.org>, 2002.
-# Denis Barbier <barbier@linuxfr.org>, 2005. 
 #
 # Check http://www.ethnologue.com/iso639/codes.asp for translations
 #
+# Martin Quinson <Martin.Quinson@tuxfamily.org>, 2002.
+# Denis Barbier <barbier@linuxfr.org>, 2005.
+# Simon Paillard <simon.paillard@resel.enst-bretagne.fr>, 2008.
+# David Prévot <david@tilapin.org>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: debian/webwml/langs.po\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-10-03 12:09+0200\n"
-"PO-Revision-Date: 2008-02-26 18:55+0100\n"
-"Last-Translator: Simon Paillard <simon.paillard@resel.enst-bretagne.fr>\n"
+"PO-Revision-Date: 2010-08-16 10:00-0400\n"
+"Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: lib/Packages/I18N/LanguageNames.pm:15
 msgid "Arabic"
@@ -67,7 +71,7 @@ msgstr "japonais"
 
 #: lib/Packages/I18N/LanguageNames.pm:27
 msgid "Khmer"
-msgstr ""
+msgstr "khmer"
 
 #: lib/Packages/I18N/LanguageNames.pm:28
 msgid "Korean"
@@ -168,3 +172,4 @@ msgstr "bulgare"
 #: lib/Packages/I18N/LanguageNames.pm:53
 msgid "Ukrainian"
 msgstr "ukrainien"
+

diff --git a/po/templates.de.po b/po/templates.de.po
index c63f9c948630d98199cc648169b64d5880d687ff..62e8d51aa477c2f1b9515b19076e7ad7f1fa9662 100644 (file)
--- a/po/templates.de.po
+++ b/po/templates.de.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: packages.git c82c758c8\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-10-13 19:05+0200\n"
-"PO-Revision-Date: 2010-01-21 20:36+0100\n"
+"PO-Revision-Date: 2010-08-17 21:57+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: debian-l10n-german <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgstr ","
 
 #: templates/config.tmpl:71
 msgid ","
-msgstr " "
+msgstr "."
 
 #: templates/config/architectures.tmpl:4
 msgid "Intel x86"
@@ -118,7 +118,7 @@ msgid ""
 "in Debian main"
 msgstr ""
 "Pakete, die die Debian-Richtlinien für Freie Software erfüllen, aber "
-"Software benötigen, die nicht in Main ist"
+"Software benötigen, die nicht in Main enthalten ist"
 
 #: templates/config/archive_layout.tmpl:16
 msgid "packages that do not meet the Debian Free Software Guidelines"
@@ -128,7 +128,7 @@ msgstr "Pakete, die die Debian-Richtlinien für Freie Software nicht erfüllen"
 msgid ""
 "volatile packages that need major changes during the life of a stable release"
 msgstr ""
-"unbeständige Pakete, die größere Änderungen während der Lebensdauer einer "
+"unstetige Pakete, die größere Änderungen während der Lebensdauer einer "
 "stabilen Veröffentlichung benötigen"
 
 #: templates/config/mirrors.tmpl:135
@@ -233,7 +233,7 @@ msgid ""
 "cause data loss. Please be sure to consult the changelog and other possible "
 "documentation before using it."
 msgstr ""
-"Warnung: Dieses Paket ist aus der <strong>Experimental</strong>-"
+"Warnung: Dieses Paket stammt aus der <strong>Experimental</strong>-"
 "Distribution. Dies bedeutet, dass es höchstwahrscheinlich instabil oder "
 "fehlerhaft ist und sogar Datenverlust verursachen kann. Bitte lesen Sie den "
 "Changelog und andere möglicherweise verfügbare Dokumentation, bevor Sie es "
@@ -383,7 +383,7 @@ msgstr "Dieser Service wird von <a href=\"%s\">%s</a> unterstützt."
 #: templates/html/head.tmpl:47 templates/html/homepage.tmpl:38
 #: templates/html/homepage.tmpl:45 templates/html/homepage.tmpl:90
 msgid "Search"
-msgstr "Suche"
+msgstr "Suchen"
 
 #: templates/html/head.tmpl:50
 msgid "package names"
@@ -472,7 +472,7 @@ msgstr "Zurücksetzen"
 
 #: templates/html/homepage.tmpl:47
 msgid "Search on:"
-msgstr "Suche in:"
+msgstr "Suchen in:"
 
 #: templates/html/homepage.tmpl:49
 msgid "Package names only"
@@ -488,7 +488,7 @@ msgstr "Quellcodepaketnamen"
 
 #: templates/html/homepage.tmpl:55
 msgid "Only show exact matches:"
-msgstr "Zeige nur genaue Treffer:"
+msgstr "Nur genaue Treffer anzeigen:"
 
 #: templates/html/homepage.tmpl:63 templates/html/homepage.tmpl:70
 #: templates/html/homepage.tmpl:116
@@ -514,7 +514,7 @@ msgstr "<code>%ssrc:<var>Name</var></code> für die Suche in Quellpaketnamen."
 
 #: templates/html/homepage.tmpl:81
 msgid "Search the contents of packages"
-msgstr "Durchsuche Paketinhalte"
+msgstr "Durchsuchen des Inhalts von Paketen"
 
 #: templates/html/homepage.tmpl:83
 msgid ""
@@ -529,7 +529,7 @@ msgstr ""
 
 #: templates/html/homepage.tmpl:93
 msgid "Display:"
-msgstr "Zeige:"
+msgstr "Anzeigen:"
 
 #: templates/html/homepage.tmpl:96
 msgid "packages that contain files named like this"
@@ -654,19 +654,19 @@ msgstr ""
 
 #: templates/html/search.tmpl:41
 msgid "Search in specific suite:"
-msgstr "Suche in bestimmter Suite:"
+msgstr "Suchen in bestimmter Suite:"
 
 #: templates/html/search.tmpl:50
 msgid "Search in <a href=\"%s\">all suites</a>"
-msgstr "Suche in <a href=\"%s\">allen Suites</a>"
+msgstr "Suchen in <a href=\"%s\">allen Suites</a>"
 
 #: 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:"
+msgstr "Suche auf bestimmte Architekturen einschränken:"
 
 #: 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>"
+msgstr "Suchen in <a href=\"%s\">allen Architekturen</a>"
 
 #: templates/html/search.tmpl:70
 msgid ""
@@ -801,31 +801,31 @@ msgstr ""
 
 #: templates/html/search_contents.tmpl:14
 msgid "Package Contents Search Results -- %s"
-msgstr "Ergebnisse der Debian-Inhalts-Paketsuche -- %s"
+msgstr "Ergebnisse der Debian-Suche nach Paketinhalten -- %s"
 
 #: templates/html/search_contents.tmpl:17
 msgid "Package Contents Search Results"
-msgstr "Ergebnisse der Debian-Inhalts-Paketsuche "
+msgstr "Ergebnisse der Debian-Suche nach Paketinhalten"
 
 #: templates/html/search_contents.tmpl:34
 msgid "Search for <em>%s</em> within filenames"
-msgstr "Suche nach <em>%s</em> in Dateinamen"
+msgstr "Nach <em>%s</em> in Dateinamen suchen"
 
 #: templates/html/search_contents.tmpl:39
 msgid "Search exact filename <em>%s</em>"
-msgstr "Suche exakten Dateinamen <em>%s</em>"
+msgstr "Nach exaktem Dateinamen <em>%s</em> suchen"
 
 #: templates/html/search_contents.tmpl:44
 msgid "Search for paths ending with <em>%s</em>"
-msgstr "Suche nach Pfaden, die auf <em>%s</em> enden"
+msgstr "Nach Pfaden suchen, die auf <em>%s</em> enden"
 
 #: templates/html/search_contents.tmpl:48
 msgid "Search in other suite:"
-msgstr "Suche in anderer Suite:"
+msgstr "In anderer Suite suchen:"
 
 #: templates/html/search_contents.tmpl:74
 msgid "paths that end with"
-msgstr "Pfade die wie folgt enden:"
+msgstr "Pfaden, die wie folgt enden:"
 
 #: templates/html/search_contents.tmpl:76
 msgid "filenames that contain"
@@ -856,7 +856,7 @@ msgstr ""
 
 #: templates/html/search_contents.tmpl:97
 msgid "Sort results by filename"
-msgstr "Sortiere Ergebnisse nach Dateinamen"
+msgstr "Ergebnisse werden nach Dateinamen sortiert"
 
 #: templates/html/search_contents.tmpl:98
 #: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:345
@@ -865,7 +865,7 @@ msgstr "Datei"
 
 #: templates/html/search_contents.tmpl:99
 msgid "Sort results by package name"
-msgstr "Sortiere Ergebnisse nach Paketnamen"
+msgstr "Ergebnisse werden nach Paketnamen sortiert"
 
 #: templates/html/search_contents.tmpl:114
 msgid "not %s"
@@ -999,7 +999,7 @@ msgid ""
 "cause data loss. Please be sure to consult the <a href=\"%s\">changelog</a> "
 "and other possible documentation before using it."
 msgstr ""
-"Warnung: Dieses Paket ist aus der <strong>Experimental</strong>-"
+"Warnung: Dieses Paket stammt aus der <strong>Experimental</strong>-"
 "Distribution. Dies bedeutet, dass es höchstwahrscheinlich instabil oder "
 "fehlerhaft ist und sogar Datenverlust verursachen kann. Bitte lesen Sie den "
 "<a href=\"%s\">Changelog</a> und andere möglicherweise verfügbare "
@@ -1012,7 +1012,7 @@ msgid ""
 "packages</a>."
 msgstr ""
 "Dies ist ein <em>virtuelles Paket</em>. Sehen Sie in die <a href=\"%s"
-"\">Debian-Richtlinien</a> für eine <a href=\"%sch-binary.html#s-virtual_pkg"
+"\">Debian-Richtlinien</a> bezüglich einer <a href=\"%sch-binary.html#s-virtual_pkg"
 "\">Definition von virtuellen Paketen</a>."
 
 #: templates/html/show.tmpl:202

diff --git a/po/templates.ru.po b/po/templates.ru.po
index 4939006b558b645208d01f701487f08d168ae9ca..41d46a4863ab4a5d791b2df3c4db1433c5cd3683 100644 (file)
--- a/po/templates.ru.po
+++ b/po/templates.ru.po
@@ -1,19 +1,19 @@
 # translation of templates.ru.po to Russian
 # Yuri Kozlov <kozlov.y@gmail.com>, 2007, 2008.
-# Yuri Kozlov <yuray@komyakino.ru>, 2009.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian webwml templates\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-07-11 12:48+0400\n"
+"PO-Revision-Date: 2010-08-08 21:48+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/config.tmpl:44
 msgid "Debian Web Mailinglist"
@@ -35,7 +35,7 @@ msgstr ""
 "Это экспериментальная версия <a href=\"http://%s/\">%s</a>. Возможны ошибки "
 "и устаревшая информация"
 
-#. @translators: . = decimal_point , = thousands_sep, see Number::Format 
+#. @translators: . = decimal_point , = thousands_sep, see Number::Format
 #: templates/config.tmpl:70
 msgid "."
 msgstr ","
@@ -161,7 +161,7 @@ msgstr "Азия"
 
 #: templates/config/mirrors.tmpl:196
 msgid "Oceania"
-msgstr ""
+msgstr "Океания"
 
 #: templates/config/mirrors.tmpl:197
 msgid "Europe"
@@ -830,7 +830,7 @@ msgstr "имена файлов, содержащих"
 msgid "files named"
 msgstr "файлы с именем"
 
-#. @translators: I'm really sorry :/ 
+#. @translators: I'm really sorry :/
 #: templates/html/search_contents.tmpl:81
 msgid "You have searched for %s <em>%s</em> in suite <em>%s</em>, %s, and %s."
 msgstr ""
@@ -940,7 +940,6 @@ msgid "Debian Source Repository"
 msgstr "Репозиторий исходного кода Debian"
 
 #: templates/html/show.tmpl:96 templates/html/show.tmpl:102
-#, fuzzy
 #| msgid "%s Patch Tracking"
 msgid "%s Patch Tracker"
 msgstr "Отслеживание заплат %s"

diff --git a/static/packages.css.sed.in b/static/packages.css.sed.in
index dc2ef7d9793d941648bd4c5bbe171367b2e4b743..b9af1f41fd05890e4d1b61a65f4a621571276888 100644 (file)
--- a/static/packages.css.sed.in
+++ b/static/packages.css.sed.in
@@ -40,6 +40,10 @@ h1 {
        margin-left: 1em;
        margin-right: 1em;
 }
+#screenshot {
+        display: block;
+        text-align: center;
+}
 #pmoreinfo { 
              font-size: smaller;
              margin-left: 1em;

diff --git a/templates/config.tmpl b/templates/config.tmpl
index ef9c4a64f80a965c9da3b5314f57a95fa0e4b48c..ee419ee2a8d13315ad30e61df6f42f6879d42065 100644 (file)
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -25,6 +25,8 @@
    policy_url = 'http://www.debian.org/doc/debian-policy/'
 #   cn_help_url = project_homepage _ 'intro/cn'
 #   patch_tracking_url = 'http://patch-tracker.debian.org/package'
+#   screenshots_url = 'http://screenshots.debian.net/package/'
+#   screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail/'
    logo = {
        url => project_homepage,
         src => '/Pics/openlogo-nd-25.png',

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index 8c7fad0ec26639c0ae3edb13a34d2e9298da1111..9b31bb2c31f7c9a451a8952abe8c0fad6b695316 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -63,6 +63,9 @@
 [% UNLESS is_virtual %]
 <div id="pmoreinfo">
 <h2>[% g('Links for %s', pkg) %]</h2>
+[% IF screenshots_url && screenshots_thumb_url && !is_source %]
+<a id="screenshot" href="[% screenshots_url _ pkg %]"><img src="[% screenshots_thumb_url _ pkg %]" alt="Screenshot" border="0"/></a>
+[% END %]
 <h3>[% g('%s Resources:', organisation) %]</h3>
 <ul>
 <li><a href="[% launchpad_url _ (is_source ? pkg : src.pkg) _ '/+bugs' %]">[% g('Bug Reports') %]</a></li>