diff --git a/ddportfolioservice/controllers/ddportfolio.py b/ddportfolioservice/controllers/ddportfolio.py index ef30451..4063f87 100644 --- a/ddportfolioservice/controllers/ddportfolio.py +++ b/ddportfolioservice/controllers/ddportfolio.py @@ -71,11 +71,6 @@ developer name on all bug logs)'), 'piuparts': N_('piuparts'), 'patchtracker': N_('Debian patch tracking system'), }, - 'upload': { - 'label': N_('Upload'), - 'keylog': N_('''keylog (per-key upload list) -(note: uses key fingerprint)'''), - }, 'lists': { 'label': N_('Mailing Lists'), 'dolists': N_('lists.d.o'), diff --git a/ddportfolioservice/i18n/ddportfolioservice.pot b/ddportfolioservice/i18n/ddportfolioservice.pot index ff0cf77..8d56957 100644 --- a/ddportfolioservice/i18n/ddportfolioservice.pot +++ b/ddportfolioservice/i18n/ddportfolioservice.pot @@ -7,9 +7,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ddportfolioservice 0.2.5\n" +"Project-Id-Version: ddportfolioservice 0.2.6\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-03-24 22:06+0100\n" +"POT-Creation-Date: 2012-03-26 17:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -100,127 +100,117 @@ msgid "Debian patch tracking system" msgstr "" #: ddportfolioservice/controllers/ddportfolio.py:75 -msgid "Upload" -msgstr "" - -#: ddportfolioservice/controllers/ddportfolio.py:76 -msgid "" -"keylog (per-key upload list)\n" -"(note: uses key fingerprint)" -msgstr "" - -#: ddportfolioservice/controllers/ddportfolio.py:80 msgid "Mailing Lists" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:81 +#: ddportfolioservice/controllers/ddportfolio.py:76 msgid "lists.d.o" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:82 +#: ddportfolioservice/controllers/ddportfolio.py:77 msgid "lists.a.d.o" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:83 +#: ddportfolioservice/controllers/ddportfolio.py:78 msgid "gmane" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:86 +#: ddportfolioservice/controllers/ddportfolio.py:81 msgid "Files" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:87 +#: ddportfolioservice/controllers/ddportfolio.py:82 msgid "people.d.o" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:88 +#: ddportfolioservice/controllers/ddportfolio.py:83 msgid "oldpeople" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:89 -#: ddportfolioservice/controllers/ddportfolio.py:96 +#: ddportfolioservice/controllers/ddportfolio.py:84 +#: ddportfolioservice/controllers/ddportfolio.py:91 msgid "Alioth" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:92 +#: ddportfolioservice/controllers/ddportfolio.py:87 msgid "Membership" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:93 +#: ddportfolioservice/controllers/ddportfolio.py:88 msgid "NM" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:94 +#: ddportfolioservice/controllers/ddportfolio.py:89 msgid "DB information via finger" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:95 +#: ddportfolioservice/controllers/ddportfolio.py:90 msgid "DB information via HTTP" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:97 +#: ddportfolioservice/controllers/ddportfolio.py:92 msgid "Wiki" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:98 +#: ddportfolioservice/controllers/ddportfolio.py:93 msgid "Forum" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:101 +#: ddportfolioservice/controllers/ddportfolio.py:96 msgid "Miscellaneous" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:102 +#: ddportfolioservice/controllers/ddportfolio.py:97 msgid "debtags" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:103 +#: ddportfolioservice/controllers/ddportfolio.py:98 msgid "links" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:104 +#: ddportfolioservice/controllers/ddportfolio.py:99 msgid "Debian website" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:105 +#: ddportfolioservice/controllers/ddportfolio.py:100 msgid "Debian search" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:106 +#: ddportfolioservice/controllers/ddportfolio.py:101 msgid "GPG public key via finger" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:107 +#: ddportfolioservice/controllers/ddportfolio.py:102 msgid "GPG public key via HTTP" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:108 +#: ddportfolioservice/controllers/ddportfolio.py:103 msgid "NM, AM participation" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:111 +#: ddportfolioservice/controllers/ddportfolio.py:106 msgid "Information reachable via ssh (for Debian Members)" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:112 +#: ddportfolioservice/controllers/ddportfolio.py:107 msgid "owned debian.net domains" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:113 +#: ddportfolioservice/controllers/ddportfolio.py:108 msgid "" "MIA database " "information" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:115 +#: ddportfolioservice/controllers/ddportfolio.py:110 msgid "Group membership information" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:118 +#: ddportfolioservice/controllers/ddportfolio.py:113 msgid "Ubuntu" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:119 +#: ddportfolioservice/controllers/ddportfolio.py:114 msgid "Available patches from Ubuntu" msgstr "" diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo index b7b03e0..7695ee0 100644 Binary files a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo and b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo differ diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po index bed6158..c240abb 100644 --- a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po +++ b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: ddportfolioservice 0.2.1\n" "Report-Msgid-Bugs-To: jan@dittberner.info\n" "POT-Creation-Date: 2009-01-20 23:13+0100\n" -"PO-Revision-Date: 2012-03-24 22:07+0100\n" +"PO-Revision-Date: 2012-03-26 17:58+0200\n" "Last-Translator: Jan Dittberner \n" "Language-Team: de \n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -110,115 +110,103 @@ msgid "Debian patch tracking system" msgstr "Debian Nachverfolgungssystem für Patches" #: ddportfolioservice/controllers/ddportfolio.py:75 -msgid "Upload" -msgstr "Upload" - -#: ddportfolioservice/controllers/ddportfolio.py:76 -msgid "" -"keylog (per-key upload list)\n" -"(note: uses key fingerprint)" -msgstr "" -"Keylog\n" -"(Anmerkung: verwendet den Fingerabdruck des Schlüssels)" - -#: ddportfolioservice/controllers/ddportfolio.py:80 msgid "Mailing Lists" msgstr "Mailinglisten" -#: ddportfolioservice/controllers/ddportfolio.py:81 +#: ddportfolioservice/controllers/ddportfolio.py:76 msgid "lists.d.o" msgstr "lists.d.o" -#: ddportfolioservice/controllers/ddportfolio.py:82 +#: ddportfolioservice/controllers/ddportfolio.py:77 msgid "lists.a.d.o" msgstr "lists.a.d.o" -#: ddportfolioservice/controllers/ddportfolio.py:83 +#: ddportfolioservice/controllers/ddportfolio.py:78 msgid "gmane" msgstr "Gmane" -#: ddportfolioservice/controllers/ddportfolio.py:86 +#: ddportfolioservice/controllers/ddportfolio.py:81 msgid "Files" msgstr "Dateien" -#: ddportfolioservice/controllers/ddportfolio.py:87 +#: ddportfolioservice/controllers/ddportfolio.py:82 msgid "people.d.o" msgstr "people.d.o" -#: ddportfolioservice/controllers/ddportfolio.py:88 +#: ddportfolioservice/controllers/ddportfolio.py:83 msgid "oldpeople" msgstr "oldpeople" -#: ddportfolioservice/controllers/ddportfolio.py:89 -#: ddportfolioservice/controllers/ddportfolio.py:96 +#: ddportfolioservice/controllers/ddportfolio.py:84 +#: ddportfolioservice/controllers/ddportfolio.py:91 msgid "Alioth" msgstr "Alioth" -#: ddportfolioservice/controllers/ddportfolio.py:92 +#: ddportfolioservice/controllers/ddportfolio.py:87 msgid "Membership" msgstr "Mitgliedschaft" -#: ddportfolioservice/controllers/ddportfolio.py:93 +#: ddportfolioservice/controllers/ddportfolio.py:88 msgid "NM" msgstr "NM" -#: ddportfolioservice/controllers/ddportfolio.py:94 +#: ddportfolioservice/controllers/ddportfolio.py:89 msgid "DB information via finger" msgstr "DB-Informationen per finger" -#: ddportfolioservice/controllers/ddportfolio.py:95 +#: ddportfolioservice/controllers/ddportfolio.py:90 msgid "DB information via HTTP" msgstr "DB-Informationen per HTTP" -#: ddportfolioservice/controllers/ddportfolio.py:97 +#: ddportfolioservice/controllers/ddportfolio.py:92 msgid "Wiki" msgstr "Wiki" -#: ddportfolioservice/controllers/ddportfolio.py:98 +#: ddportfolioservice/controllers/ddportfolio.py:93 msgid "Forum" msgstr "Forum" -#: ddportfolioservice/controllers/ddportfolio.py:101 +#: ddportfolioservice/controllers/ddportfolio.py:96 msgid "Miscellaneous" msgstr "Sonstiges" -#: ddportfolioservice/controllers/ddportfolio.py:102 +#: ddportfolioservice/controllers/ddportfolio.py:97 msgid "debtags" msgstr "debtags" -#: ddportfolioservice/controllers/ddportfolio.py:103 +#: ddportfolioservice/controllers/ddportfolio.py:98 msgid "links" msgstr "Links" -#: ddportfolioservice/controllers/ddportfolio.py:104 +#: ddportfolioservice/controllers/ddportfolio.py:99 msgid "Debian website" msgstr "Debian Webseite" -#: ddportfolioservice/controllers/ddportfolio.py:105 +#: ddportfolioservice/controllers/ddportfolio.py:100 msgid "Debian search" msgstr "Debian-Suche" -#: ddportfolioservice/controllers/ddportfolio.py:106 +#: ddportfolioservice/controllers/ddportfolio.py:101 msgid "GPG public key via finger" msgstr "öffentlicher GPG-Schlüssel per finger" -#: ddportfolioservice/controllers/ddportfolio.py:107 +#: ddportfolioservice/controllers/ddportfolio.py:102 msgid "GPG public key via HTTP" msgstr "öffentlicher GPG-Schlüssel per HTTP" -#: ddportfolioservice/controllers/ddportfolio.py:108 +#: ddportfolioservice/controllers/ddportfolio.py:103 msgid "NM, AM participation" msgstr "NM-, AM-Teilnahme" -#: ddportfolioservice/controllers/ddportfolio.py:111 +#: ddportfolioservice/controllers/ddportfolio.py:106 msgid "Information reachable via ssh (for Debian Members)" msgstr "Per ssh erreichbare Informationen (für Debian Mitglieder)" -#: ddportfolioservice/controllers/ddportfolio.py:112 +#: ddportfolioservice/controllers/ddportfolio.py:107 msgid "owned debian.net domains" msgstr "Besitz von debian.net-Domains" -#: ddportfolioservice/controllers/ddportfolio.py:113 +#: ddportfolioservice/controllers/ddportfolio.py:108 msgid "" "MIA database" " information" @@ -226,15 +214,15 @@ msgstr "" "Informationen in der MIA-Datenbank" -#: ddportfolioservice/controllers/ddportfolio.py:115 +#: ddportfolioservice/controllers/ddportfolio.py:110 msgid "Group membership information" msgstr "Information über Gruppenmitgliedschaften" -#: ddportfolioservice/controllers/ddportfolio.py:118 +#: ddportfolioservice/controllers/ddportfolio.py:113 msgid "Ubuntu" msgstr "Ubuntu" -#: ddportfolioservice/controllers/ddportfolio.py:119 +#: ddportfolioservice/controllers/ddportfolio.py:114 msgid "Available patches from Ubuntu" msgstr "Verfügbare Patches aus Ubuntu" diff --git a/ddportfolioservice/model/ddportfolio.ini b/ddportfolioservice/model/ddportfolio.ini index 2811abd..b7df712 100644 --- a/ddportfolioservice/model/ddportfolio.ini +++ b/ddportfolioservice/model/ddportfolio.ini @@ -20,7 +20,7 @@ # [DEFAULT] keyring.dir=~/debian/keyring.debian.org/keyrings -urlbuilder.sections=overview,bugs,build,qa,upload,lists,files,membership, +urlbuilder.sections=overview,bugs,build,qa,lists,files,membership, miscellaneous,ssh,ubuntu [overview] @@ -49,11 +49,6 @@ lintianfull.pattern=http://lintian.debian.org/full/%(email)s.html piuparts.pattern=http://piuparts.debian.org/sid/maintainer/%(firstchar)s/%(email)s.html patchtracker.pattern=http://patch-tracker.debian.org/email/%(email)s -[upload] -urls=keylog -keylog.pattern=http://merkel.debian.org/~enrico/keylog/%(gpgfp)s.html -keylog.optional=true - [lists] urls=dolists,adolists,gmane dolists.pattern=http://lists.debian.org/cgi-bin/search?author=%(name)s&sort=date