Merge branch 'master' into ubuntu-master

Conflicts:
	config.sh.sed.in
	cron.d/100syncarchive_debports
	static/index.tmpl
	templates/config/mirrors.tmpl

diff --git a/bin/parse-contents b/bin/parse-contents
index 26f715108530bc1e4ea80e123c018bddc6287a37..ac88420da74c5834f7e4304533248509e355ac68 100755 (executable)
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@ -144,7 +144,7 @@ for my $suite (@suites) {
 
            activate($filelist_db);
            #FIXME: hardcoded archs. (debports has no contrib/non-free)
-           if ($arch ne 'm68k') {
+           if ($arch ne 'avr32' and $arch ne 'm68k') {
                system("ln", "-sf", basename($filelist_db),
                       "$DBDIR/filelists_${suite}_all.db") == 0
                           or die "Oops";

diff --git a/po/debtags.de.po b/po/debtags.de.po
index 4275d55f65f4038a76e5b8e7355361e78ded326e..5d832b2251ea7f3e7d39f02c36cd2387bb7db848 100644 (file)
--- a/po/debtags.de.po
+++ b/po/debtags.de.po
@@ -3,13 +3,18 @@ msgstr ""
 "Project-Id-Version: debtags.git c82c758c8\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-10-13 19:05+0200\n"
-"PO-Revision-Date: 2009-02-07 16:00+0100\n"
+"PO-Revision-Date: 2009-06-07 21:46+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Tag: x11::xserver, long desc
+#: files/debtags/vocabulary
+msgid " X servers and drivers for the X server (input and video)"
+msgstr " X-Server und -Treiber für den X-Server (Eingabe und Video)"
+
 #. Tag: special::not-yet-tagged, short desc
 #: files/debtags/vocabulary
 msgid "!Not yet tagged packages!"
@@ -74,7 +79,7 @@ msgstr "Buchführung und Finanzsoftware"
 #. Tag: game::arcade, short desc
 #: files/debtags/vocabulary
 msgid "Action and Arcade"
-msgstr ""
+msgstr "Action und Arkade"
 
 #. Tag: implemented-in::ada, short desc
 #: files/debtags/vocabulary
@@ -134,7 +139,7 @@ msgstr "Apache"
 #. Tag: x11::applet, short desc
 #: files/debtags/vocabulary
 msgid "Applet"
-msgstr ""
+msgstr "Applet"
 
 #. Tag: scope::application, short desc
 #. Tag: web::application, short desc
@@ -180,7 +185,7 @@ msgstr "Arabisch"
 #. Tag: junior::arcade, short desc
 #: files/debtags/vocabulary
 msgid "Arcade Games"
-msgstr ""
+msgstr "Arkade-Spiele"
 
 #. Tag: works-with::archive, short desc
 #: files/debtags/vocabulary
@@ -222,7 +227,7 @@ msgstr ""
 #. Tag: uitoolkit::athena, short desc
 #: files/debtags/vocabulary
 msgid "Athena Widgets"
-msgstr ""
+msgstr "Athena Widgets"
 
 #. Tag: made-of::audio, short desc
 #. Tag: works-with::audio, short desc
@@ -268,12 +273,12 @@ msgstr "Baskisch"
 #. Tag: admin::benchmarking, short desc
 #: files/debtags/vocabulary
 msgid "Benchmarking"
-msgstr ""
+msgstr "Leistungsmessung"
 
 #. Tag: culture::bengali, short desc
 #: files/debtags/vocabulary
 msgid "Bengali"
-msgstr ""
+msgstr "Bengalisch"
 
 #. Tag: suite::bsd, long desc
 #: files/debtags/vocabulary
@@ -333,6 +338,14 @@ msgid ""
 "Link: http://www.bittorrent.com/ Link: http://en.wikipedia.org/wiki/"
 "BitTorrent"
 msgstr ""
+"BitTorrent ist ein Protokoll für Dateienverteilung über direkte "
+"Netzverbindungen.\n"
+"Obwohl der eigentliche Datentransport zwischen BitTorrent-Clients "
+"stattfindet, wird ein zentraler Knoten, der sogenannte Tracker, benötigt, um "
+"eine Liste aller Clients zu bewahren, die die gleiche Datei herunterladen "
+"oder zur Verfügung stellen.\n"
+"Link: http://www.bittorrent.com/ Link: http://de.wikipedia.org/wiki/"
+"BitTorrent"
 
 #. Tag: web::blog, short desc
 #: files/debtags/vocabulary
@@ -357,7 +370,7 @@ msgstr "Brasilianisch"
 #. Tag: culture::british, short desc
 #: files/debtags/vocabulary
 msgid "British"
-msgstr ""
+msgstr "Britisch"
 
 #. Tag: scope::application, long desc
 #: files/debtags/vocabulary
@@ -403,7 +416,7 @@ msgstr "Bulgarisch"
 #. Tag: bbs, short desc
 #: files/debtags/vocabulary
 msgid "Bulletin Board Systems"
-msgstr ""
+msgstr "Forum-Systeme"
 
 #. Tag: implemented-in::c, short desc
 #: files/debtags/vocabulary
@@ -1558,7 +1571,7 @@ msgstr ""
 #. Tag: devel::i18n, short desc
 #: files/debtags/vocabulary
 msgid "Internationalization"
-msgstr ""
+msgstr "Internationalisierung"
 
 #. Tag: protocol::imap, long desc
 #: files/debtags/vocabulary
@@ -2003,6 +2016,11 @@ msgstr "Meta-Paket"
 msgid "Metapackages"
 msgstr "Meta-Pakete"
 
+#. Tag: field::meteorology, short desc
+#: files/debtags/vocabulary
+msgid "Meteorology"
+msgstr "Meteorologie"
+
 #. Tag: sound::mixer, short desc
 #: files/debtags/vocabulary
 msgid "Mixing"
@@ -2455,7 +2473,7 @@ msgstr "POP3-Protokoll"
 #. Tag: devel::lang:posix-shell, short desc
 #: files/debtags/vocabulary
 msgid "POSIX shell"
-msgstr ""
+msgstr "POSIX-Shell"
 
 #. Tag: admin::package-management, short desc
 #: files/debtags/vocabulary
@@ -2504,7 +2522,7 @@ msgstr "Paketierung"
 #. Tag: devel::code-generator, long desc
 #: files/debtags/vocabulary
 msgid "Parser, lexer and other code generators"
-msgstr ""
+msgstr "Parser, Lexer und andere Codegeneratoren"
 
 #. Tag: devel::lang:pascal, short desc
 #: files/debtags/vocabulary
@@ -2646,7 +2664,7 @@ msgstr "PostgreSQL"
 #. Tag: hardware::power, short desc
 #: files/debtags/vocabulary
 msgid "Power Management"
-msgstr ""
+msgstr "Energieverwaltung"
 
 #. Tag: office::presentation, short desc
 #: files/debtags/vocabulary
@@ -3592,6 +3610,13 @@ msgid ""
 "Link: http://en.wikipedia.org/wiki/Line_Printer_Daemon_protocol Link: http://"
 "www.ietf.org/rfc/rfc1179.txt"
 msgstr ""
+"Das »Line Printer Daemon«-Protokoll dient dem Zugriff oder der "
+"Bereitstellung von Netzdruckdiensten in einem Unix-Netz, kann aber auch für "
+"lokale Installationen verwandt werden.\n"
+"CUPS, das »Common Unix Printing System«, wurde als Ersatz für das alte LPD-/"
+"LPR-System unter Beibehaltung der Rückwärtskompatibilität entwickelt.\n"
+"Link: http://de.wikipedia.org/wiki/Berkeley_Printing_System Link: http://www."
+"ietf.org/rfc/rfc1179.txt"
 
 #. Tag: protocol::msn-messenger, long desc
 #: files/debtags/vocabulary
@@ -3616,6 +3641,13 @@ msgid ""
 "Link: http://en.wikipedia.org/wiki/Finger_protocol Link: http://www.ietf.org/"
 "rfc/rfc1288.txt"
 msgstr ""
+"Das Name/Finger-Protokoll ist ein einfaches Netzprotokoll, um umfangreiche "
+"öffentliche Informationen über Benutzer eines Computers, wie E-Mail-"
+"Adressen, Telefonnummern, vollständige Namen usw. bereitzustellen.\n"
+"Aufgrund von Datenschutzfragen wird das Finger-Protokoll nicht mehr viel "
+"verwandt, während der Einsatz in den frühen Neunzigern verbreitet war.\n"
+"Link: http://de.wikipedia.org/wiki/Finger_(Internetprotokoll) Link: http://"
+"www.ietf.org/rfc/rfc1288.txt"
 
 #. Tag: protocol::yahoo-messenger, long desc
 #: files/debtags/vocabulary
@@ -3688,7 +3720,7 @@ msgstr ""
 #. Tag: works-with::im, long desc
 #: files/debtags/vocabulary
 msgid "The package can connect to some IM network (or networks)."
-msgstr ""
+msgstr "Das Paket kann sich mit einigen IM-Netz(en) verbinden."
 
 #. Tag: suite::netscape, long desc
 #: files/debtags/vocabulary
@@ -3698,7 +3730,7 @@ msgstr "Netscape-Browser vor Version 6.0"
 #. Tag: x11::theme, short desc
 #: files/debtags/vocabulary
 msgid "Theme"
-msgstr ""
+msgstr "Thema"
 
 #. Facet: works-with, long desc
 #: files/debtags/vocabulary
@@ -3828,7 +3860,7 @@ msgstr ""
 #. Tag: works-with::graphs, short desc
 #: files/debtags/vocabulary
 msgid "Trees and Graphs"
-msgstr ""
+msgstr "Bäume und Graphen"
 
 #. Tag: protocol::tftp, long desc
 #: files/debtags/vocabulary
@@ -3840,6 +3872,14 @@ msgid ""
 "Link: http://en.wikipedia.org/wiki/Trivial_File_Transfer_Protocol Link: "
 "http://www.ietf.org/rfc/rfc1350.txt"
 msgstr ""
+"»Trivial File Transfer Protocol«, ein einfaches Dateiübertragungsprotokoll. "
+"TFTP erlaubt es Clients, eine Datei von einem Rechner in der Ferne abzuholen "
+"oder dort abzulegen. Eines der Haupteinsatzzwecke ist das Booten von "
+"Rechnern ohne Festplatten über Netz in einem »Local Area Network« (lokalen "
+"Netz). Entwicklungsziel war die einfache Implementierung, so dass es ins ROM "
+"passt.\n"
+"Link: http://de.wikipedia.org/wiki/Trivial_File_Transfer_Protocol Link: "
+"http://www.ietf.org/rfc/rfc1350.txt"
 
 #. Tag: culture::turkish, short desc
 #: files/debtags/vocabulary
@@ -3912,6 +3952,12 @@ msgid ""
 "Link: http://en.wikipedia.org/wiki/User_Datagram_Protocol Link: http://www."
 "ietf.org/rfc/rfc768.txt"
 msgstr ""
+"»User Datagram Protocol«, ein Kernprotokoll der Internet-Protokoll-Suite, "
+"wird für den Datentransport eingesetzt.\n"
+"UDP ist nicht so zuverlässig wie TCP, aber schneller und daher für "
+"zeitkritische Zwecke wie das DNS-Protokoll oder VoIP besser geeignet.\n"
+"Link: http://de.wikipedia.org/wiki/User_Datagram_Protocol Link: http://www."
+"ietf.org/rfc/rfc768.txt"
 
 #. Tag: devel::ui-builder, short desc
 #. Facet: interface, short desc
@@ -4078,8 +4124,8 @@ msgstr "World Wide Web"
 
 #. Tag: x11::xserver, short desc
 #: files/debtags/vocabulary
-msgid "X Server"
-msgstr "X-Server"
+msgid "X Server and Drivers"
+msgstr "X-Server und -Treiber"
 
 #. Tag: interface::x11, short desc
 #. Facet: x11, short desc
@@ -4161,11 +4207,20 @@ msgid ""
 "* DNS-SD for service discovery\n"
 "Link: http://www.zeroconf.org Link: http://en.wikipedia.org/wiki/Zeroconf"
 msgstr ""
+"»Zero Configuration Networking« (Zeroconfig) ist eine Sammlung von "
+"Techniken, die automatisch ein benutzbares IP-Netz ohne Konfiguration oder "
+"spezielle Server erstellt.\n"
+"Diese Markierung wird für Pakete verwandt, die eines oder mehrere der "
+"folgenden Punkte implementieren:\n"
+"* IPv4LL zur Adressauswahl\n"
+"* mDNS für die Namensauflösung\n"
+"* DNS-SD für die Diensteerkennung\n"
+"Link: http://www.zeroconf.org Link: http://de.wikipedia.org/wiki/Zeroconf"
 
 #. Tag: protocol::zeroconf, short desc
 #: files/debtags/vocabulary
 msgid "Zeroconf"
-msgstr ""
+msgstr "Zeroconf"
 
 #. Tag: works-with-format::zip, short desc
 #: files/debtags/vocabulary
@@ -4197,29 +4252,32 @@ msgstr "wxWidgets"
 msgid "xDSL Modem"
 msgstr "xDSL-Modem"
 
-#~ msgid "Source code"
-#~ msgstr "Quellcode"
+#~ msgid ""
+#~ "Direct Client to Client protocol used by Internet Relay Chat clients."
+#~ msgstr ""
+#~ "Direktes Client-zu-Client-Protokoll, verwendet von Clients für Internet "
+#~ "Relay Chat"
 
-#~ msgid "Windows file and printer sharing (SMB)"
-#~ msgstr "Datei- und Druckerfreigabe von Windows (SMB)"
+#~ msgid "File Transfer"
+#~ msgstr "Datei-Übertragung"
 
-#~ msgid "Secure File Transfer Protocol"
-#~ msgstr "Secure File Transfer Protocol"
+#~ msgid "File Transfer Protocol"
+#~ msgstr "File Transfer Protocol"
+
+#~ msgid "HyperText Transfer Protocol"
+#~ msgstr "HyperText Transfer Protocol"
 
 #~ msgid "SMB and CIFS"
 #~ msgstr "SMB und CIFS"
 
-#~ msgid "HyperText Transfer Protocol"
-#~ msgstr "HyperText Transfer Protocol"
+#~ msgid "Secure File Transfer Protocol"
+#~ msgstr "Secure File Transfer Protocol"
 
-#~ msgid "File Transfer Protocol"
-#~ msgstr "File Transfer Protocol"
+#~ msgid "Windows file and printer sharing (SMB)"
+#~ msgstr "Datei- und Druckerfreigabe von Windows (SMB)"
 
-#~ msgid "File Transfer"
-#~ msgstr "Datei-Übertragung"
+#~ msgid "Source code"
+#~ msgstr "Quellcode"
 
-#~ msgid ""
-#~ "Direct Client to Client protocol used by Internet Relay Chat clients."
-#~ msgstr ""
-#~ "Direktes Client-zu-Client-Protokoll, verwendet von Clients für Internet "
-#~ "Relay Chat"
+#~ msgid "X Server"
+#~ msgstr "X-Server"

diff --git a/po/debtags.fi.po b/po/debtags.fi.po
index 0682813c1a62ddab7ba4009e5d538046936ae2e1..d2f86aede790e0a932f3fccbc8bdfa339bf6fba5 100644 (file)
--- a/po/debtags.fi.po
+++ b/po/debtags.fi.po
@@ -10,6 +10,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Tag: x11::xserver, long desc
+#: files/debtags/vocabulary
+msgid " X servers and drivers for the X server (input and video)"
+msgstr ""
+
 #. Tag: special::not-yet-tagged, short desc
 #: files/debtags/vocabulary
 msgid "!Not yet tagged packages!"
@@ -1877,6 +1882,11 @@ msgstr ""
 msgid "Metapackages"
 msgstr ""
 
+#. Tag: field::meteorology, short desc
+#: files/debtags/vocabulary
+msgid "Meteorology"
+msgstr ""
+
 #. Tag: sound::mixer, short desc
 #: files/debtags/vocabulary
 msgid "Mixing"
@@ -3802,7 +3812,7 @@ msgstr ""
 
 #. Tag: x11::xserver, short desc
 #: files/debtags/vocabulary
-msgid "X Server"
+msgid "X Server and Drivers"
 msgstr ""
 
 #. Tag: interface::x11, short desc

diff --git a/po/debtags.fr.po b/po/debtags.fr.po
index 47a9cb328c8f94e2a6566cb85d908a96c207fad6..bd6276911627b3388dad0c5400c7e9426c3482d4 100644 (file)
--- a/po/debtags.fr.po
+++ b/po/debtags.fr.po
@@ -3,6 +3,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Tag: x11::xserver, long desc
+#: files/debtags/vocabulary
+msgid " X servers and drivers for the X server (input and video)"
+msgstr ""
+
 #. Tag: special::not-yet-tagged, short desc
 #: files/debtags/vocabulary
 msgid "!Not yet tagged packages!"
@@ -1870,6 +1875,11 @@ msgstr ""
 msgid "Metapackages"
 msgstr ""
 
+#. Tag: field::meteorology, short desc
+#: files/debtags/vocabulary
+msgid "Meteorology"
+msgstr ""
+
 #. Tag: sound::mixer, short desc
 #: files/debtags/vocabulary
 msgid "Mixing"
@@ -3793,7 +3803,7 @@ msgstr ""
 
 #. Tag: x11::xserver, short desc
 #: files/debtags/vocabulary
-msgid "X Server"
+msgid "X Server and Drivers"
 msgstr ""
 
 #. Tag: interface::x11, short desc

diff --git a/po/debtags.hu.po b/po/debtags.hu.po
index 47a9cb328c8f94e2a6566cb85d908a96c207fad6..bd6276911627b3388dad0c5400c7e9426c3482d4 100644 (file)
--- a/po/debtags.hu.po
+++ b/po/debtags.hu.po
@@ -3,6 +3,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Tag: x11::xserver, long desc
+#: files/debtags/vocabulary
+msgid " X servers and drivers for the X server (input and video)"
+msgstr ""
+
 #. Tag: special::not-yet-tagged, short desc
 #: files/debtags/vocabulary
 msgid "!Not yet tagged packages!"
@@ -1870,6 +1875,11 @@ msgstr ""
 msgid "Metapackages"
 msgstr ""
 
+#. Tag: field::meteorology, short desc
+#: files/debtags/vocabulary
+msgid "Meteorology"
+msgstr ""
+
 #. Tag: sound::mixer, short desc
 #: files/debtags/vocabulary
 msgid "Mixing"
@@ -3793,7 +3803,7 @@ msgstr ""
 
 #. Tag: x11::xserver, short desc
 #: files/debtags/vocabulary
-msgid "X Server"
+msgid "X Server and Drivers"
 msgstr ""
 
 #. Tag: interface::x11, short desc

diff --git a/po/debtags.ja.po b/po/debtags.ja.po
index 627d61db9515d231a0bf373de6de74bb03fe4dfc..8ae93a57a4f7887330b36f9a9bb372b38422fd5c 100644 (file)
--- a/po/debtags.ja.po
+++ b/po/debtags.ja.po
@@ -14,6 +14,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Tag: x11::xserver, long desc
+#: files/debtags/vocabulary
+msgid " X servers and drivers for the X server (input and video)"
+msgstr ""
+
 #. Tag: special::not-yet-tagged, short desc
 #: files/debtags/vocabulary
 msgid "!Not yet tagged packages!"
@@ -1921,6 +1926,13 @@ msgstr "メタパッケージ"
 msgid "Metapackages"
 msgstr "メタパッケージ"
 
+#. Tag: field::meteorology, short desc
+#: files/debtags/vocabulary
+#, fuzzy
+#| msgid "Geology"
+msgid "Meteorology"
+msgstr "地質学"
+
 #. Tag: sound::mixer, short desc
 #: files/debtags/vocabulary
 msgid "Mixing"
@@ -3942,8 +3954,8 @@ msgstr "World Wide Web"
 
 #. Tag: x11::xserver, short desc
 #: files/debtags/vocabulary
-msgid "X Server"
-msgstr "X サーバ"
+msgid "X Server and Drivers"
+msgstr ""
 
 #. Tag: interface::x11, short desc
 #. Facet: x11, short desc
@@ -4055,51 +4067,54 @@ msgstr "wxWidgets"
 msgid "xDSL Modem"
 msgstr "xDSL モデム"
 
-#~ msgid "Audrio"
-#~ msgstr "音声"
+#~ msgid ""
+#~ "Direct Client to Client protocol used by Internet Relay Chat clients."
+#~ msgstr ""
+#~ "インターネット・リレー・チャット (IRC) クライアントが使用する Direct "
+#~ "Client-to-Client プロトコル。"
 
-#~ msgid "ZOPE"
-#~ msgstr "Zope"
+#~ msgid "File Transfer"
+#~ msgstr "ファイル転送"
 
-# TRANSLATION-FIXME: Why "Windowing"?
-#~ msgid "X Windowing System"
-#~ msgstr "X ウィンドウシステム"
+#~ msgid "File Transfer Protocol"
+#~ msgstr "ファイル転送プロトコル (File Transfer Protocol)"
 
-#~ msgid "SAMBA"
-#~ msgstr "Samba"
+#~ msgid "HyperText Transfer Protocol"
+#~ msgstr "ハイパーテキスト転送プロトコル (HyperText Transfer Protocol)"
 
-#~ msgid "GNUStep"
-#~ msgstr "GNUstep"
+#~ msgid "SMB and CIFS"
+#~ msgstr "SMB や CIFS"
 
-#~ msgid "TK"
-#~ msgstr "TK"
+#~ msgid "Secure File Transfer Protocol"
+#~ msgstr "Secure File Transfer Protocol"
 
-#~ msgid "Source code"
-#~ msgstr "ソースコード"
+#~ msgid "Windows file and printer sharing (SMB)"
+#~ msgstr "Windows ファイル・プリンタ共有 (SMB)"
 
 #~ msgid "QT"
 #~ msgstr "QT"
 
-#~ msgid "Windows file and printer sharing (SMB)"
-#~ msgstr "Windows ファイル・プリンタ共有 (SMB)"
+#~ msgid "Source code"
+#~ msgstr "ソースコード"
 
-#~ msgid "Secure File Transfer Protocol"
-#~ msgstr "Secure File Transfer Protocol"
+#~ msgid "TK"
+#~ msgstr "TK"
 
-#~ msgid "SMB and CIFS"
-#~ msgstr "SMB や CIFS"
+#~ msgid "GNUStep"
+#~ msgstr "GNUstep"
 
-#~ msgid "HyperText Transfer Protocol"
-#~ msgstr "ハイパーテキスト転送プロトコル (HyperText Transfer Protocol)"
+#~ msgid "SAMBA"
+#~ msgstr "Samba"
 
-#~ msgid "File Transfer Protocol"
-#~ msgstr "ファイル転送プロトコル (File Transfer Protocol)"
+# TRANSLATION-FIXME: Why "Windowing"?
+#~ msgid "X Windowing System"
+#~ msgstr "X ウィンドウシステム"
 
-#~ msgid "File Transfer"
-#~ msgstr "ファイル転送"
+#~ msgid "ZOPE"
+#~ msgstr "Zope"
 
-#~ msgid ""
-#~ "Direct Client to Client protocol used by Internet Relay Chat clients."
-#~ msgstr ""
-#~ "インターネット・リレー・チャット (IRC) クライアントが使用する Direct "
-#~ "Client-to-Client プロトコル。"
+#~ msgid "Audrio"
+#~ msgstr "音声"
+
+#~ msgid "X Server"
+#~ msgstr "X サーバ"

diff --git a/po/debtags.nl.po b/po/debtags.nl.po
index 79554511ed9e8d58f2aa67b91c784b3e4926ce5e..02075ba2fffbc2e84874a9015185577aef2057a9 100644 (file)
--- a/po/debtags.nl.po
+++ b/po/debtags.nl.po
@@ -11,6 +11,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#. Tag: x11::xserver, long desc
+#: files/debtags/vocabulary
+msgid " X servers and drivers for the X server (input and video)"
+msgstr ""
+
 #. Tag: special::not-yet-tagged, short desc
 #: files/debtags/vocabulary
 msgid "!Not yet tagged packages!"
@@ -1888,6 +1893,11 @@ msgstr ""
 msgid "Metapackages"
 msgstr ""
 
+#. Tag: field::meteorology, short desc
+#: files/debtags/vocabulary
+msgid "Meteorology"
+msgstr ""
+
 #. Tag: sound::mixer, short desc
 #: files/debtags/vocabulary
 msgid "Mixing"
@@ -3815,8 +3825,8 @@ msgstr ""
 
 #. Tag: x11::xserver, short desc
 #: files/debtags/vocabulary
-msgid "X Server"
-msgstr "X Server"
+msgid "X Server and Drivers"
+msgstr ""
 
 #. Tag: interface::x11, short desc
 #. Facet: x11, short desc
@@ -3928,17 +3938,20 @@ msgstr "wxWidgets"
 msgid "xDSL Modem"
 msgstr "xDSL Modem"
 
-#~ msgid "TK"
-#~ msgstr "TK"
+#~ msgid "File Transfer Protocol"
+#~ msgstr "File Transfer Protocol"
 
-#~ msgid "QT"
-#~ msgstr "QT"
+#~ msgid "HyperText Transfer Protocol"
+#~ msgstr "HyperText Transfer Protocol"
 
 #~ msgid "SMB and CIFS"
 #~ msgstr "SMB en CIFS"
 
-#~ msgid "HyperText Transfer Protocol"
-#~ msgstr "HyperText Transfer Protocol"
+#~ msgid "QT"
+#~ msgstr "QT"
 
-#~ msgid "File Transfer Protocol"
-#~ msgstr "File Transfer Protocol"
+#~ msgid "TK"
+#~ msgstr "TK"
+
+#~ msgid "X Server"
+#~ msgstr "X Server"

diff --git a/po/debtags.pot b/po/debtags.pot
index 3798cd79956562bff2122d8b3065f4b063676a2e..461b46de7d2bebb185459a6a14801d3ba928975b 100644 (file)
--- a/po/debtags.pot
+++ b/po/debtags.pot
@@ -1112,6 +1112,11 @@ msgstr ""
 msgid "Medical Imaging"
 msgstr ""
 
+#. Tag: field::meteorology, short desc
+#: files/debtags/vocabulary
+msgid "Meteorology"
+msgstr ""
+
 #. Tag: field::physics, short desc
 #: files/debtags/vocabulary
 msgid "Physics"
@@ -3576,7 +3581,12 @@ msgstr ""
 
 #. Tag: x11::xserver, short desc
 #: files/debtags/vocabulary
-msgid "X Server"
+msgid "X Server and Drivers"
+msgstr ""
+
+#. Tag: x11::xserver, long desc
+#: files/debtags/vocabulary
+msgid " X servers and drivers for the X server (input and video)"
 msgstr ""
 
 #. Tag: bbs, short desc

diff --git a/po/debtags.ru.po b/po/debtags.ru.po
index 72f577c9212cdffb9997fc74adcf6281df0c0de0..28890532c8e3fbe1af7aba0952ee3d2c6308a223 100644 (file)
--- a/po/debtags.ru.po
+++ b/po/debtags.ru.po
@@ -17,6 +17,11 @@ msgstr ""
 "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"
 
+#. Tag: x11::xserver, long desc
+#: files/debtags/vocabulary
+msgid " X servers and drivers for the X server (input and video)"
+msgstr ""
+
 #. Tag: special::not-yet-tagged, short desc
 #: files/debtags/vocabulary
 msgid "!Not yet tagged packages!"
@@ -2080,6 +2085,13 @@ msgstr "Метапакет"
 msgid "Metapackages"
 msgstr "Метапакеты"
 
+#. Tag: field::meteorology, short desc
+#: files/debtags/vocabulary
+#, fuzzy
+#| msgid "Geology"
+msgid "Meteorology"
+msgstr "Геология"
+
 #. Tag: sound::mixer, short desc
 #: files/debtags/vocabulary
 msgid "Mixing"
@@ -4283,8 +4295,8 @@ msgstr "World Wide Web"
 
 #. Tag: x11::xserver, short desc
 #: files/debtags/vocabulary
-msgid "X Server"
-msgstr "X-сервер"
+msgid "X Server and Drivers"
+msgstr ""
 
 #. Tag: interface::x11, short desc
 #. Facet: x11, short desc
@@ -4400,33 +4412,36 @@ msgstr "wxWidgets"
 msgid "xDSL Modem"
 msgstr "xDSL модем"
 
-#~ msgid "TK"
-#~ msgstr "TK"
+#~ msgid ""
+#~ "Direct Client to Client protocol used by Internet Relay Chat clients."
+#~ msgstr "Протокол прямой передачи клиент-клиент используется клиентами IRC."
 
-#~ msgid "QT"
-#~ msgstr "QT"
+#~ msgid "File Transfer"
+#~ msgstr "Передача файлов"
 
-#~ msgid "Source code"
-#~ msgstr "Ð\98Ñ\81Ñ\85однÑ\8bй код"
+#~ msgid "File Transfer Protocol"
+#~ msgstr "Ð\9fÑ\80оÑ\82окол пеÑ\80едаÑ\87и Ñ\84айлов"
 
-#~ msgid "Windows file and printer sharing (SMB)"
-#~ msgstr "Общий доступ к файлам и принтерам Windows (SMB)"
+#~ msgid "HyperText Transfer Protocol"
+#~ msgstr "Протокол передачи гипертекста"
+
+#~ msgid "SMB and CIFS"
+#~ msgstr "SMB и CIFS"
 
 #~ msgid "Secure File Transfer Protocol"
 #~ msgstr "Протокол безопасной передачи файлов"
 
-#~ msgid "SMB and CIFS"
-#~ msgstr "SMB и CIFS"
+#~ msgid "Windows file and printer sharing (SMB)"
+#~ msgstr "Общий доступ к файлам и принтерам Windows (SMB)"
 
-#~ msgid "HyperText Transfer Protocol"
-#~ msgstr "Ð\9fÑ\80оÑ\82окол пеÑ\80едаÑ\87и гипеÑ\80Ñ\82екÑ\81Ñ\82а"
+#~ msgid "Source code"
+#~ msgstr "Ð\98Ñ\81Ñ\85однÑ\8bй код"
 
-#~ msgid "File Transfer Protocol"
-#~ msgstr "Протокол передачи файлов"
+#~ msgid "QT"
+#~ msgstr "QT"
 
-#~ msgid "File Transfer"
-#~ msgstr "Передача файлов"
+#~ msgid "TK"
+#~ msgstr "TK"
 
-#~ msgid ""
-#~ "Direct Client to Client protocol used by Internet Relay Chat clients."
-#~ msgstr "Протокол прямой передачи клиент-клиент используется клиентами IRC."
+#~ msgid "X Server"
+#~ msgstr "X-сервер"

diff --git a/po/debtags.sv.po b/po/debtags.sv.po
index 3aa201054a57c552abaf240cd9b2c72d05d8fc37..a78e07de443b2583e813d99dc315e379ec2dc616 100644 (file)
--- a/po/debtags.sv.po
+++ b/po/debtags.sv.po
@@ -8,6 +8,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Tag: x11::xserver, long desc
+#: files/debtags/vocabulary
+msgid " X servers and drivers for the X server (input and video)"
+msgstr ""
+
 #. Tag: special::not-yet-tagged, short desc
 #: files/debtags/vocabulary
 msgid "!Not yet tagged packages!"
@@ -1907,6 +1912,11 @@ msgstr ""
 msgid "Metapackages"
 msgstr ""
 
+#. Tag: field::meteorology, short desc
+#: files/debtags/vocabulary
+msgid "Meteorology"
+msgstr ""
+
 #. Tag: sound::mixer, short desc
 #: files/debtags/vocabulary
 msgid "Mixing"
@@ -3854,7 +3864,7 @@ msgstr ""
 
 #. Tag: x11::xserver, short desc
 #: files/debtags/vocabulary
-msgid "X Server"
+msgid "X Server and Drivers"
 msgstr ""
 
 #. Tag: interface::x11, short desc
@@ -3967,116 +3977,116 @@ msgstr ""
 msgid "xDSL Modem"
 msgstr ""
 
-#~ msgid "Armenian"
-#~ msgstr "armeniska"
-
-#~ msgid "English"
-#~ msgstr "engelska"
-
-#~ msgid "Portuguese (Brazilian)"
-#~ msgstr "portugisiska (Brasilien)"
-
-#~ msgid "Chinese (China)"
-#~ msgstr "kinesiska (Kina)"
+#~ msgid "Gallegan"
+#~ msgstr "galiciska"
 
-#~ msgid "Chinese (Hong Kong)"
-#~ msgstr "kinesiska (Hongkong)"
+#~ msgid "Zulu"
+#~ msgstr "zulu"
 
-#~ msgid "Chinese (Taiwan)"
-#~ msgstr "kinesiska (Taiwan)"
+#~ msgid "Yiddish"
+#~ msgstr "jiddisch"
 
-#~ msgid "Chinese (Traditional)"
-#~ msgstr "kinesiska (traditionell)"
+#~ msgid "Xhosa"
+#~ msgstr "xhosa"
 
-#~ msgid "Chinese (Simplified)"
-#~ msgstr "kinesiska (förenklad)"
+#~ msgid "Vietnamese"
+#~ msgstr "vietnamesiska"
 
-#~ msgid "Indonesian"
-#~ msgstr "indonesiska"
+#~ msgid "Twi"
+#~ msgstr "twi"
 
-#~ msgid "Lithuanian"
-#~ msgstr "litauiska"
+#~ msgid "Tonga"
+#~ msgstr "tonga"
 
-#~ msgid "Slovene"
+#~ msgid "Slovenian"
 #~ msgstr "slovenska"
 
-#~ msgid "Albanian"
-#~ msgstr "albaniska"
+#~ msgid "Persian"
+#~ msgstr "persiska"
 
-#~ msgid "Amharic"
-#~ msgstr "amhariska"
+#~ msgid "Occitan (post 1500)"
+#~ msgstr "occitanska (efter 1500)"
 
-#~ msgid "Azerbaijani"
-#~ msgstr "azerbajdzjanska"
+#~ msgid "Maori"
+#~ msgstr "maori"
 
-#~ msgid "Belarusian"
-#~ msgstr "vitryska"
+#~ msgid "Manx"
+#~ msgstr "manx"
 
-#~ msgid "Breton"
-#~ msgstr "bretonska"
+#~ msgid "Maltese"
+#~ msgstr "maltesiska"
 
-#~ msgid "Cornish"
-#~ msgstr "corniska"
+#~ msgid "Malayalam"
+#~ msgstr "malayalam"
 
-#~ msgid "Gaelic (Scots)"
-#~ msgstr "skotska"
+#~ msgid "Malay"
+#~ msgstr "malajiska"
 
-#~ msgid "Galician"
-#~ msgstr "galiciska"
+#~ msgid "Macedonian"
+#~ msgstr "makedoniska"
 
-#~ msgid "Kalaallisut"
-#~ msgstr "grönländska"
+#~ msgid "Kurdish"
+#~ msgstr "kurdiska"
 
 #~ msgid "Kannada"
 #~ msgstr "kanaresiska"
 
-#~ msgid "Kurdish"
-#~ msgstr "kurdiska"
+#~ msgid "Kalaallisut"
+#~ msgstr "grönländska"
 
-#~ msgid "Macedonian"
-#~ msgstr "makedoniska"
+#~ msgid "Galician"
+#~ msgstr "galiciska"
 
-#~ msgid "Malay"
-#~ msgstr "malajiska"
+#~ msgid "Gaelic (Scots)"
+#~ msgstr "skotska"
 
-#~ msgid "Malayalam"
-#~ msgstr "malayalam"
+#~ msgid "Cornish"
+#~ msgstr "corniska"
 
-#~ msgid "Maltese"
-#~ msgstr "maltesiska"
+#~ msgid "Breton"
+#~ msgstr "bretonska"
 
-#~ msgid "Manx"
-#~ msgstr "manx"
+#~ msgid "Belarusian"
+#~ msgstr "vitryska"
 
-#~ msgid "Maori"
-#~ msgstr "maori"
+#~ msgid "Azerbaijani"
+#~ msgstr "azerbajdzjanska"
 
-#~ msgid "Occitan (post 1500)"
-#~ msgstr "occitanska (efter 1500)"
+#~ msgid "Amharic"
+#~ msgstr "amhariska"
 
-#~ msgid "Persian"
-#~ msgstr "persiska"
+#~ msgid "Albanian"
+#~ msgstr "albaniska"
 
-#~ msgid "Slovenian"
+#~ msgid "Slovene"
 #~ msgstr "slovenska"
 
-#~ msgid "Tonga"
-#~ msgstr "tonga"
+#~ msgid "Lithuanian"
+#~ msgstr "litauiska"
 
-#~ msgid "Twi"
-#~ msgstr "twi"
+#~ msgid "Indonesian"
+#~ msgstr "indonesiska"
 
-#~ msgid "Vietnamese"
-#~ msgstr "vietnamesiska"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "kinesiska (förenklad)"
 
-#~ msgid "Xhosa"
-#~ msgstr "xhosa"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "kinesiska (traditionell)"
 
-#~ msgid "Yiddish"
-#~ msgstr "jiddisch"
+#~ msgid "Chinese (Taiwan)"
+#~ msgstr "kinesiska (Taiwan)"
 
-#~ msgid "Zulu"
-#~ msgstr "zulu"
+#~ msgid "Chinese (Hong Kong)"
+#~ msgstr "kinesiska (Hongkong)"
 
-#~ msgid "Gallegan"
-#~ msgstr "galiciska"
+#~ msgid "Chinese (China)"
+#~ msgstr "kinesiska (Kina)"
+
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "portugisiska (Brasilien)"
+
+#~ msgid "English"
+#~ msgstr "engelska"
+
+#~ msgid "Armenian"
+#~ msgstr "armeniska"

diff --git a/po/debtags.uk.po b/po/debtags.uk.po
index 47a9cb328c8f94e2a6566cb85d908a96c207fad6..bd6276911627b3388dad0c5400c7e9426c3482d4 100644 (file)
--- a/po/debtags.uk.po
+++ b/po/debtags.uk.po
@@ -3,6 +3,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Tag: x11::xserver, long desc
+#: files/debtags/vocabulary
+msgid " X servers and drivers for the X server (input and video)"
+msgstr ""
+
 #. Tag: special::not-yet-tagged, short desc
 #: files/debtags/vocabulary
 msgid "!Not yet tagged packages!"
@@ -1870,6 +1875,11 @@ msgstr ""
 msgid "Metapackages"
 msgstr ""
 
+#. Tag: field::meteorology, short desc
+#: files/debtags/vocabulary
+msgid "Meteorology"
+msgstr ""
+
 #. Tag: sound::mixer, short desc
 #: files/debtags/vocabulary
 msgid "Mixing"
@@ -3793,7 +3803,7 @@ msgstr ""
 
 #. Tag: x11::xserver, short desc
 #: files/debtags/vocabulary
-msgid "X Server"
+msgid "X Server and Drivers"
 msgstr ""
 
 #. Tag: interface::x11, short desc

diff --git a/po/debtags.zh-cn.po b/po/debtags.zh-cn.po
index 47a9cb328c8f94e2a6566cb85d908a96c207fad6..bd6276911627b3388dad0c5400c7e9426c3482d4 100644 (file)
--- a/po/debtags.zh-cn.po
+++ b/po/debtags.zh-cn.po
@@ -3,6 +3,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Tag: x11::xserver, long desc
+#: files/debtags/vocabulary
+msgid " X servers and drivers for the X server (input and video)"
+msgstr ""
+
 #. Tag: special::not-yet-tagged, short desc
 #: files/debtags/vocabulary
 msgid "!Not yet tagged packages!"
@@ -1870,6 +1875,11 @@ msgstr ""
 msgid "Metapackages"
 msgstr ""
 
+#. Tag: field::meteorology, short desc
+#: files/debtags/vocabulary
+msgid "Meteorology"
+msgstr ""
+
 #. Tag: sound::mixer, short desc
 #: files/debtags/vocabulary
 msgid "Mixing"
@@ -3793,7 +3803,7 @@ msgstr ""
 
 #. Tag: x11::xserver, short desc
 #: files/debtags/vocabulary
-msgid "X Server"
+msgid "X Server and Drivers"
 msgstr ""
 
 #. Tag: interface::x11, short desc

diff --git a/po/sections.de.po b/po/sections.de.po
index c85542890f90b08f73b177440c9fd0d83db0890c..96495ed4a05e29c069c8e708486581c04117170c 100644 (file)
--- a/po/sections.de.po
+++ b/po/sections.de.po
@@ -1,11 +1,12 @@
 # Copyright (C) 2007 Frank Lichtenheld
+# Copyright (C) 2007,2009 Helge Kreutzmann
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: packages.git 2cd81017ac27717adcda738074294c4f5cd9e4cd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-03-15 18:49+0100\n"
-"PO-Revision-Date: 2007-10-28 17:15+0100\n"
+"PO-Revision-Date: 2009-05-28 19:19+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"
@@ -32,11 +33,11 @@ msgstr "Allgemeine, von jedem Debian-System benötigte (Hilfs-)Programme"
 
 #: lib/Packages/Sections.pm:16
 msgid "Mono/CLI"
-msgstr ""
+msgstr "Mono/CLI"
 
 #: lib/Packages/Sections.pm:17
 msgid "Everything about Mono and the Common Language Infrastructure."
-msgstr ""
+msgstr "Alles rund um Mono und die »Common Language Infrastructure«."
 
 #: lib/Packages/Sections.pm:18
 msgid "Communication Programs"
@@ -48,23 +49,23 @@ msgstr "Software, um Ihr Modem auf altmodische Art zu verwenden."
 
 #: lib/Packages/Sections.pm:20
 msgid "Databases"
-msgstr ""
+msgstr "Datenbanken"
 
 #: lib/Packages/Sections.pm:21
 msgid "Database Servers and Clients."
-msgstr ""
+msgstr "Datenbankserver und -clients"
 
 #: lib/Packages/Sections.pm:22
-#, fuzzy
-#| msgid "Virtual packages"
 msgid "Debug packages"
-msgstr "Virtuelle Pakete"
+msgstr "Debug-Pakete"
 
 #: lib/Packages/Sections.pm:23
 msgid ""
 "Packages providing debugging information for executables and shared "
 "libraries."
 msgstr ""
+"Pakete, die Debug-Informationen für Programme und Laufzeitbibliotheken bereit "
+"stellen."
 
 #: lib/Packages/Sections.pm:24
 msgid "Development"
@@ -138,19 +139,20 @@ msgstr ""
 
 #: lib/Packages/Sections.pm:38
 msgid "GNU R"
-msgstr ""
+msgstr "GNU R"
 
 #: lib/Packages/Sections.pm:39
 msgid "Everything about GNU R, a statistical computation and graphics system."
 msgstr ""
+"Alles rund um GNU R, einem statistischen Berechnungs- und Graphiksystem."
 
 #: lib/Packages/Sections.pm:40
 msgid "GNUstep"
-msgstr ""
+msgstr "GNUstep"
 
 #: lib/Packages/Sections.pm:41
 msgid "The GNUstep environment."
-msgstr ""
+msgstr "Die GNUstep-Umgebung."
 
 #: lib/Packages/Sections.pm:42
 msgid "Graphics"
@@ -171,31 +173,27 @@ msgstr "Software für Amateurfunker."
 
 #: lib/Packages/Sections.pm:46
 msgid "Fonts"
-msgstr ""
+msgstr "Schriften"
 
 #: lib/Packages/Sections.pm:47
-#, fuzzy
-#| msgid "Virtual packages."
 msgid "Font packages."
-msgstr "Virtuelle Pakete."
+msgstr "Schriftpakete."
 
 #: lib/Packages/Sections.pm:48
 msgid "Haskell"
-msgstr ""
+msgstr "Haskell"
 
 #: lib/Packages/Sections.pm:49
 msgid "Everything about Haskell."
-msgstr ""
+msgstr "Alles rund um Haskell."
 
 #: lib/Packages/Sections.pm:50
-#, fuzzy
-#| msgid "Web Software"
 msgid "Web Servers"
-msgstr "Web-Software"
+msgstr "Webserver"
 
 #: lib/Packages/Sections.pm:51
 msgid "Web servers and their modules."
-msgstr ""
+msgstr "Webserver und ihre Module."
 
 #: lib/Packages/Sections.pm:52
 msgid "Interpreters"
@@ -209,19 +207,19 @@ msgstr ""
 
 #: lib/Packages/Sections.pm:54
 msgid "Java"
-msgstr ""
+msgstr "Java"
 
 #: lib/Packages/Sections.pm:55
 msgid "Everything about Java."
-msgstr ""
+msgstr "Alles rund um Java."
 
 #: lib/Packages/Sections.pm:56
 msgid "Kernels"
-msgstr ""
+msgstr "Kernel"
 
 #: lib/Packages/Sections.pm:57
 msgid "Operating System Kernels and related modules."
-msgstr ""
+msgstr "Betriebssystem-Kernel und zugehörige Module."
 
 #: lib/Packages/Sections.pm:58
 msgid "KDE"
@@ -257,19 +255,19 @@ msgstr ""
 
 #: lib/Packages/Sections.pm:64
 msgid "Lisp"
-msgstr ""
+msgstr "Lisp"
 
 #: lib/Packages/Sections.pm:65
 msgid "Everything about Lisp."
-msgstr ""
+msgstr "Alles rund um Lisp."
 
 #: lib/Packages/Sections.pm:66
 msgid "Language packs"
-msgstr ""
+msgstr "Sprachpakete"
 
 #: lib/Packages/Sections.pm:67
 msgid "Localization support for big software packages."
-msgstr ""
+msgstr "Lokalisierungsunterstützung für große Softwarepakete."
 
 #: lib/Packages/Sections.pm:68
 msgid "Mail"
@@ -328,11 +326,11 @@ msgstr ""
 
 #: lib/Packages/Sections.pm:80
 msgid "OCaml"
-msgstr ""
+msgstr "OCaml"
 
 #: lib/Packages/Sections.pm:81
 msgid "Everything about OCaml, an ML language implementation."
-msgstr ""
+msgstr "Alles rund um OCaml, einer ML-Sprachimplementierung."
 
 #: lib/Packages/Sections.pm:82
 msgid "Other OS's and file systems"
@@ -357,11 +355,11 @@ msgstr "Alles rund um Perl, einer interpretierten Skriptsprache."
 
 #: lib/Packages/Sections.pm:86
 msgid "PHP"
-msgstr ""
+msgstr "PHP"
 
 #: lib/Packages/Sections.pm:87
 msgid "Everything about PHP."
-msgstr ""
+msgstr "Alles rund um PHP."
 
 #: lib/Packages/Sections.pm:88
 msgid "Python"
@@ -372,22 +370,18 @@ msgid ""
 "Everything about Python, an interpreted, interactive object oriented "
 "language."
 msgstr ""
-"Alles rund um Python, einer interpretierten, interaktiven, objekt-"
-"orientierten Programmiersprache."
+"Alles rund um Python, einer interpretierten, interaktiven, objektorientierten "
+"Programmiersprache."
 
 #: lib/Packages/Sections.pm:90
 msgid "Ruby"
-msgstr ""
+msgstr "Ruby"
 
 #: lib/Packages/Sections.pm:91
-#, fuzzy
-#| msgid ""
-#| "Everything about Python, an interpreted, interactive object oriented "
-#| "language."
 msgid "Everything about Ruby, an interpreted object oriented language."
 msgstr ""
-"Alles rund um Python, einer interpretierten, interaktiven, objekt-"
-"orientierten Programmiersprache."
+"Alles rund um Ruby, einer interpretierten objekt-orientierten "
+"Programmiersprache."
 
 #: lib/Packages/Sections.pm:92
 msgid "Science"
@@ -454,19 +448,19 @@ msgstr ""
 
 #: lib/Packages/Sections.pm:106
 msgid "Version Control Systems"
-msgstr ""
+msgstr "Versionskontrollsysteme"
 
 #: lib/Packages/Sections.pm:107
 msgid "Version control systems and related utilities."
-msgstr ""
+msgstr "Versionskontrollsysteme und zugehörige Hilfswerkzeuge."
 
 #: lib/Packages/Sections.pm:108
 msgid "Video"
-msgstr ""
+msgstr "Video"
 
 #: lib/Packages/Sections.pm:109
 msgid "Video viewers, editors, recording, streaming."
-msgstr ""
+msgstr "Videobetrachter, -editoren, -rekorder, -sender."
 
 #: lib/Packages/Sections.pm:110
 msgid "Virtual packages"
@@ -498,19 +492,19 @@ msgstr ""
 
 #: lib/Packages/Sections.pm:116
 msgid "Xfce"
-msgstr ""
+msgstr "Xfce"
 
 #: lib/Packages/Sections.pm:117
 msgid "Xfce, a fast and lightweight Desktop Environment."
-msgstr ""
+msgstr "Xfce, eine schnelle und leichtgewichtige Desktop-Umgebung."
 
 #: lib/Packages/Sections.pm:118
 msgid "Zope/Plone Framework"
-msgstr ""
+msgstr "Zope/Plone-Rahmenwerk"
 
 #: lib/Packages/Sections.pm:119
 msgid "Zope Application Server and Plone Content Managment System."
-msgstr ""
+msgstr "Zope-Anwendungs-Server und Plone-Inhaltsverwaltungsystem"
 
 #: lib/Packages/Sections.pm:120
 msgid "debian-installer udeb packages"

diff --git a/po/templates.de.po b/po/templates.de.po
index f5a6842c76f4d381aac26f08045f49bcdae5341f..4b0b833d1043c67596a9bca21f1fda7a90fb7465 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: 2008-11-17 23:00+0100\n"
+"PO-Revision-Date: 2009-04-14 22:53+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"
@@ -136,8 +136,8 @@ msgstr ""
 msgid ""
 "ports of packages to architectures not yet or not anymore available in Debian"
 msgstr ""
-"Portierungen von Paketen auf Architekturen, die noch nicht oder nicht mehr in"
-" Debian verfügbar sind"
+"Portierungen von Paketen auf Architekturen, die noch nicht oder nicht mehr in "
+"Debian verfügbar sind"
 
 #: templates/config/mirrors.tmpl:185
 msgid "North America"
@@ -278,18 +278,12 @@ msgstr ""
 "bitte auch unsere <a href=\"%s\">komplette Spiegelliste</a>."
 
 #: templates/html/download.tmpl:97
-#, fuzzy
-#| msgid ""
-#| "Note that %s is not officially included in the %s archive yet, but the %s "
-#| "porter group keeps their archive in sync with the official archive as "
-#| "close as possible. See the <a href=\"%s\">%s ports page</a> for current "
-#| "information."
 msgid ""
 "Note that %s is not officially included in the %s archive, but the %s porter "
 "group keeps their archive in sync with the official archive as close as "
 "possible. See the <a href=\"%s\">%s ports page</a> for current information."
 msgstr ""
-"Beachten Sie, dass %s noch nicht offiziell im %s-Archiv ist, aber die "
+"Beachten Sie, dass %s nicht offiziell im %s-Archiv enthalten ist, aber die "
 "Portierungsgruppe %s ihr Archiv mit dem offiziellen Archiv so eng wie "
 "möglich synchron hält. Lesen Sie die <a href=\"%s\">Portierungsseiten von %"
 "s</a> für aktuelle Informationen."
@@ -379,7 +373,7 @@ msgstr "Mehr Informationen über diese Site"
 
 #: templates/html/foot.tmpl:41
 msgid "This service is sponsored by <a href=\"%s\">%s</a>."
-msgstr "Dieser Service wird unterstützt von <a href=\"%s\">%s</a>."
+msgstr "Dieser Service wird von <a href=\"%s\">%s</a> unterstützt."
 
 #: templates/html/head.tmpl:47
 msgid "Search"

diff --git a/po/templates.ru.po b/po/templates.ru.po
index 5fd8df0a98fa439f5ce369f3dded523a5f7a5d41..6568f5a61a1d9f09ea918c942eef0afb7d353371 100644 (file)
--- a/po/templates.ru.po
+++ b/po/templates.ru.po
@@ -1,18 +1,18 @@
 # translation of templates.ru.po to Russian
 # Yuri Kozlov <kozlov.y@gmail.com>, 2007, 2008.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian webwml templates\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-05-11 10:06+0400\n"
-"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
+"PO-Revision-Date: 2009-06-06 17:03+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"
+"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:43
 msgid "Debian Web Mailinglist"
@@ -34,7 +34,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:69
 msgid "."
 msgstr ","
@@ -109,31 +109,33 @@ msgstr "GNU/kFreeBSD (amd64)"
 
 #: templates/config/archive_layout.tmpl:14
 msgid "packages that meet the Debian Free Software Guidelines"
-msgstr ""
+msgstr "пакеты, удовлетворяющие критериям Debian по определению свободного ПО"
 
 #: templates/config/archive_layout.tmpl:15
 msgid ""
 "packages that meet the Debian Free Software Guidelines but need software not "
 "in Debian main"
 msgstr ""
+"пакеты, удовлетворяющие критериям Debian по определению "
+"свободного ПО, но требующие ПО не из раздела Debian main"
 
 #: templates/config/archive_layout.tmpl:16
 msgid "packages that do not meet the Debian Free Software Guidelines"
-msgstr ""
+msgstr "пакеты, не удовлетворяющие критериям Debian по определению свободного ПО"
 
 #: templates/config/mirrors.tmpl:92
-msgid ""
-"volatile packages that need major changes during the life of a stable release"
+msgid "volatile packages that need major changes during the life of a stable release"
 msgstr ""
+"изменчивые пакеты, для работы в них нужно вносить значительные изменения "
+"на всём времени существования стабильного выпуска"
 
 #: templates/config/mirrors.tmpl:132
 msgid "newer packages that have been adapted to stable releases of Debian"
-msgstr ""
+msgstr "новейшие пакеты, которые были адаптированы для стабильных выпусков Debian"
 
 #: templates/config/mirrors.tmpl:160
-msgid ""
-"ports of packages to architectures not yet or not anymore available in Debian"
-msgstr ""
+msgid "ports of packages to architectures not yet or not anymore available in Debian"
+msgstr "переносы пакетов под архитектуры, которых ещё или уже недоступны в Debian"
 
 #: templates/config/mirrors.tmpl:185
 msgid "North America"
@@ -251,8 +253,7 @@ msgstr ""
 "сайтов:"
 
 #: templates/html/download.tmpl:80
-msgid ""
-"You can download the requested file from the <tt>%s</tt> subdirectory at:"
+msgid "You can download the requested file from the <tt>%s</tt> subdirectory at:"
 msgstr "Вы можете скачать требуемый файл из подкаталога <tt>%s</tt> c:"
 
 #: templates/html/download.tmpl:82
@@ -270,7 +271,6 @@ msgstr ""
 "href=\"%s\">полного списка серверов-зеркал</a>."
 
 #: templates/html/download.tmpl:97
-#, fuzzy
 #| msgid ""
 #| "Note that %s is not officially included in the %s archive yet, but the %s "
 #| "porter group keeps their archive in sync with the official archive as "
@@ -281,10 +281,10 @@ msgid ""
 "group keeps their archive in sync with the official archive as close as "
 "possible. See the <a href=\"%s\">%s ports page</a> for current information."
 msgstr ""
-"Ð\97амеÑ\82им, Ñ\87Ñ\82о %s пока оÑ\84иÑ\86иалÑ\8cно не вклÑ\8eÑ\87Ñ\91н в аÑ\80Ñ\85ив %s, но гÑ\80Ñ\83ппа пеÑ\80еноÑ\81а %s "
-"поддеÑ\80живаеÑ\82 Ñ\81вой аÑ\80Ñ\85ив Ñ\81инÑ\85Ñ\80онизиÑ\80ованнÑ\8bм Ñ\81 оÑ\84иÑ\86иалÑ\8cнÑ\8bм аÑ\80Ñ\85ивом как можно "
-"более Ñ\82оÑ\87но. Ð\9e Ñ\82екÑ\83Ñ\89ем Ñ\81оÑ\81Ñ\82оÑ\8fнии можно Ñ\83знаÑ\82Ñ\8c Ñ\81о <a href=\"%s\">Ñ\81Ñ\82Ñ\80аниÑ\86Ñ\8b "
-"переноса на %s</a>."
+"Ð\97амеÑ\82им, Ñ\87Ñ\82о %s оÑ\84иÑ\86иалÑ\8cно не вклÑ\8eÑ\87Ñ\91н в аÑ\80Ñ\85ив %s, но команда по "
+"пеÑ\80еноÑ\81Ñ\83 %s поддеÑ\80живаеÑ\82 Ñ\81вой аÑ\80Ñ\85ив Ñ\81инÑ\85Ñ\80онизиÑ\80ованнÑ\8bм Ñ\81 оÑ\84иÑ\86иалÑ\8cнÑ\8bм "
+"аÑ\80Ñ\85ивом как можно более полно. Ð\9e Ñ\82екÑ\83Ñ\89ем Ñ\81оÑ\81Ñ\82оÑ\8fнии можно "
+"узнать со <a href=\"%s\">страницы переноса на %s</a>."
 
 #: templates/html/download.tmpl:101
 msgid ""
@@ -329,22 +329,21 @@ msgid "Filelist of package %s/%s/%s"
 msgstr "Список файлов пакета %s/%s/%s"
 
 #: templates/html/filelist.tmpl:3
-msgid ""
-"Filelist of package <em>%s</em> in <em>%s</em> of architecture <em>%s</em>"
-msgstr ""
-"Список файлов пакета <em>%s</em> в <em>%s</em> для архитектуры <em>%s</em>"
+msgid "Filelist of package <em>%s</em> in <em>%s</em> of architecture <em>%s</em>"
+msgstr "Список файлов пакета <em>%s</em> в <em>%s</em> для архитектуры <em>%s</em>"
 
 #: templates/html/filelist.tmpl:8
 msgid "Filelist"
 msgstr "Список файлов"
 
 #: templates/html/foot.tmpl:11
-#, fuzzy
 #| msgid "How to set <a href=\"%s\">the default document language</a>"
 msgid ""
 "This page is also available in the following languages (How to set <a href="
 "\"%s\">the default document language</a>):"
-msgstr "Как установить <a href=\"%s\">язык по умолчанию</a>"
+msgstr ""
+"Эта страница также доступна на следующих языках (Как "
+"установить <a href=\"%s\">язык по умолчанию</a>):"
 
 #: templates/html/foot.tmpl:28
 msgid ""
@@ -369,10 +368,9 @@ msgid "Learn more about this site"
 msgstr "Об этом сайте"
 
 #: templates/html/foot.tmpl:41
-#, fuzzy
 #| msgid "Download Source Package <a href=\"%s\">%s</a>:"
 msgid "This service is sponsored by <a href=\"%s\">%s</a>."
-msgstr "Ð\97агÑ\80Ñ\83зка пакеÑ\82а иÑ\81Ñ\85одного кода <a href=\"%s\">%s</a>:"
+msgstr "СпонÑ\81оÑ\80 Ñ\81айÑ\82а <a href=\"%s\">%s</a>."
 
 #: templates/html/head.tmpl:47
 msgid "Search"
@@ -466,15 +464,13 @@ msgstr " Также их можно увидеть <a href=\"%s\">отсорти
 
 #: templates/html/newpkg.tmpl:20
 msgid " You can also display this list <a href=\"%s\">sorted by age</a>."
-msgstr ""
-" Также их можно увидеть <a href=\"%s\">отсортированными по возрасту</a>."
+msgstr " Также их можно увидеть <a href=\"%s\">отсортированными по возрасту</a>."
 
 #: templates/html/newpkg.tmpl:22
 msgid ""
 "This information is also available as an <a href=\"newpkg?format=rss\">RSS "
 "feed</a>"
-msgstr ""
-"Эта информация также доступна на <a href=\"newpkg?format=rss\">ленте RSS</a>"
+msgstr "Эта информация также доступна на <a href=\"newpkg?format=rss\">ленте RSS</a>"
 
 #: templates/html/newpkg.tmpl:23
 msgid "[RSS 1.0 Feed]"
@@ -574,8 +570,7 @@ msgid "source packages"
 msgstr "пакеты исходного кода"
 
 #: templates/html/search.tmpl:84
-msgid ""
-"You have searched for %s that names contain <em>%s</em> in %s, %s, and %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."
@@ -612,7 +607,7 @@ 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 ""
-"Указанное ключевое слово слишком часто используется, с целью оптимизаци "
+"Указанное ключевое слово слишком часто используется, с целью оптимизации "
 "некоторые результаты показаны не будут.<br>Попробуйте использовать более "
 "длинное ключевое слово или введите больше ключевых слов."
 
@@ -700,11 +695,10 @@ 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 ""
-"Вы искали %s <em>%s</em> в комплекте <em>%s</em>. Были просмотрены %s и %s."
+msgstr "Вы искали %s <em>%s</em> в комплекте <em>%s</em>. Были просмотрены %s и %s."
 
 #: templates/html/search_contents.tmpl:85
 msgid "Found <strong>%u results</strong>."
@@ -782,7 +776,7 @@ msgstr "значимый"
 
 #: templates/html/show.tmpl:61
 msgid "package manager will refuse to remove this package by default"
-msgstr ""
+msgstr "программа управления пакетами не станет удалять этот пакет по умолчанию"
 
 #: templates/html/show.tmpl:65
 msgid "Links for %s"
@@ -794,7 +788,7 @@ msgstr "Ресурсы %s:"
 
 #: templates/html/show.tmpl:68
 msgid "Bug Reports"
-msgstr "Ð\9eÑ\82Ñ\87Ñ\91Ñ\82Ñ\8b об ошибках"
+msgstr "СообÑ\89ениÑ\8f об ошибках"
 
 #: templates/html/show.tmpl:71 templates/html/show.tmpl:73
 msgid "Developer Information (PTS)"
@@ -814,11 +808,11 @@ msgstr "Репозиторий исходного кода Debian"
 
 #: templates/html/show.tmpl:96 templates/html/show.tmpl:102
 msgid "%s Patch Tracking"
-msgstr ""
+msgstr "Отслеживание заплат %s"
 
 #: templates/html/show.tmpl:110
 msgid "Download Source Package <a href=\"%s\">%s</a>:"
-msgstr "Ð\97агÑ\80Ñ\83зка пакеÑ\82а иÑ\81Ñ\85одного кода <a href=\"%s\">%s</a>:"
+msgstr "Ð\98Ñ\81Ñ\85однÑ\8bй код <a href=\"%s\">%s</a>:"
 
 #: templates/html/show.tmpl:117
 msgid "Not found"
@@ -1009,12 +1003,12 @@ msgid ""
 "Debian Package Source Repository (<acronym title=\"Version Control System"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
 msgstr ""
-"Репозиторий пакетов исходных кодов Debian (<acronym title=\"Version Control "
+"Репозиторий пакетов исходного кода Debian (<acronym title=\"Version Control "
 "System\">VCS</acronym>: <a href=\"%s\">%s</a>)"
 
 #: templates/html/show.tmpl:371
 msgid "Debian Package Source Repository (Browsable)"
-msgstr "Репозиторий пакетов исходных кодов Debian (просмотр)"
+msgstr "Репозиторий пакетов исходного кода Debian (доступен просмотр)"
 
 #: templates/html/suite_index.tmpl:3
 msgid "Index"
@@ -1084,11 +1078,3 @@ msgstr "Сгенерирована:"
 msgid "See <URL:%s> for the license terms."
 msgstr "Об условиях лицензии смотрите <URL:%s>."
 
-#~ msgid "Packages search page"
-#~ msgstr "Страница поиска пакетов"
-
-#~ msgid "Back to:"
-#~ msgstr "Вернуться:"
-
-#~ msgid "This page is also available in the following languages:"
-#~ msgstr "Эта страница также доступна на следующих языках:"

diff --git a/templates/config/architectures.tmpl b/templates/config/architectures.tmpl
index 41434a3404dfd1869bdfd696b49bd6c083d92730..8d52739e5f7f6fa6fd31f4ce43558853a33f8137 100644 (file)
--- a/templates/config/architectures.tmpl
+++ b/templates/config/architectures.tmpl
@@ -17,6 +17,7 @@ architectures = {
        armel   => g('EABI ARM'),
        "kfreebsd-i386" => g('GNU/kFreeBSD (i386)'),
        "kfreebsd-amd64" => g('GNU/kFreeBSD (amd64)'),
+       avr32   => g('AVR32'),
 }
 
 %]