From: Gerfried Fuchs Date: Fri, 20 Aug 2010 09:16:15 +0000 (+0200) Subject: Merge branch 'master' into debian-master X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=e57357f1ae9ac49cf273d8976d23c9c54d12d00f;hp=596d2c3f7d3ea6c5b2d334818a2893eb42002b8b;p=deb%2Fpackages.git Merge branch 'master' into debian-master --- diff --git a/TODO b/TODO index ef30293..f2b50f7 100644 --- 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 8fb3a36..277f315 100644 --- 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 , 2002. -# Denis Barbier , 2005. # # Check http://www.ethnologue.com/iso639/codes.asp for translations # +# Martin Quinson , 2002. +# Denis Barbier , 2005. +# Simon Paillard , 2008. +# David Prévot , 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 \n" +"PO-Revision-Date: 2010-08-16 10:00-0400\n" +"Last-Translator: David Prévot \n" "Language-Team: French \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 c63f9c9..62e8d51 100644 --- 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 \n" "Language-Team: debian-l10n-german \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 Experimental-" +"Warnung: Dieses Paket stammt aus der Experimental-" "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 %s 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 "%ssrc:Name 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 all suites" -msgstr "Suche in allen Suites" +msgstr "Suchen in allen Suites" #: 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 all architectures" -msgstr "Suche in allen Architekturen" +msgstr "Suchen in allen Architekturen" #: 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 %s within filenames" -msgstr "Suche nach %s in Dateinamen" +msgstr "Nach %s in Dateinamen suchen" #: templates/html/search_contents.tmpl:39 msgid "Search exact filename %s" -msgstr "Suche exakten Dateinamen %s" +msgstr "Nach exaktem Dateinamen %s suchen" #: templates/html/search_contents.tmpl:44 msgid "Search for paths ending with %s" -msgstr "Suche nach Pfaden, die auf %s enden" +msgstr "Nach Pfaden suchen, die auf %s 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 changelog " "and other possible documentation before using it." msgstr "" -"Warnung: Dieses Paket ist aus der Experimental-" +"Warnung: Dieses Paket stammt aus der Experimental-" "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 " @@ -1012,7 +1012,7 @@ msgid "" "packages." msgstr "" "Dies ist ein virtuelles Paket. Sehen Sie in die Debian-Richtlinien für eine Debian-Richtlinien bezüglich einer Definition von virtuellen Paketen." #: templates/html/show.tmpl:202 diff --git a/po/templates.ru.po b/po/templates.ru.po index 4939006..41d46a4 100644 --- a/po/templates.ru.po +++ b/po/templates.ru.po @@ -1,19 +1,19 @@ # translation of templates.ru.po to Russian # Yuri Kozlov , 2007, 2008. -# Yuri Kozlov , 2009. +# Yuri Kozlov , 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 \n" "Language-Team: Russian \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 "" "Это экспериментальная версия %s. Возможны ошибки " "и устаревшая информация" -#. @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 %s in suite %s, %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 ca44350..18a8b3b 100644 --- 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 26d6e85..92d18d0 100644 --- a/templates/config.tmpl +++ b/templates/config.tmpl @@ -23,6 +23,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 e680b1c..c03f50e 100644 --- a/templates/html/show.tmpl +++ b/templates/html/show.tmpl @@ -63,6 +63,9 @@ [% UNLESS is_virtual %]

[% g('Links for %s', pkg) %]

+[% IF screenshots_url && screenshots_thumb_url && !is_source %] +Screenshot +[% END %]

[% g('%s Resources:', organisation) %]