gratuxri/debianmemberportfolio
1
0
Fork 0
forked from jan/debianmemberportfolio
Code Issues Pull requests Releases Wiki Activity

Merge branch 'newrules' into pylons0.10

Browse source 
* newrules:
  updated translations
  add ideas for SSH functions as comment
  add idea for debconf list search as comment
  add Debian search
  add website google search
  add patch tracker
  add piuparts
  add support for "firstchar" in patterns
  add ubuntudiff to new group Ubuntu

Resolved conflicts:
	ddportfolioservice/i18n/ddportfolioservice.pot
	ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo
	ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
	ddportfolioservice/model/ddportfolio.ini
This commit is contained in:
Jan Dittberner 2010-05-10 21:33:50 +02:00
commit 03954ba7e9
6 changed files with 123 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

62
ddportfolioservice/i18n/ddportfolioservice.pot
View file

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ddportfolioservice 0.2\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2010-04-18 21:15+0200\n"
"POT-Creation-Date: 2010-05-10 21:26+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -99,73 +99,97 @@ msgstr ""
msgid "DEHS (Debian External Health Status)"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:75
#: ddportfolioservice/controllers/ddportfolio.py:73
msgid "piuparts"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:74
msgid "Debian patch tracking system"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:77
msgid "Upload"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:76
#: ddportfolioservice/controllers/ddportfolio.py:78
msgid ""
"keylog (per-key upload list)\n"
"(note: uses key fingerprint)"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:80
#: ddportfolioservice/controllers/ddportfolio.py:82
msgid "Mailing Lists"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:81
#: ddportfolioservice/controllers/ddportfolio.py:83
msgid "lists.d.o"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:82
#: ddportfolioservice/controllers/ddportfolio.py:84
msgid "lists.a.d.o"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:83
#: ddportfolioservice/controllers/ddportfolio.py:85
msgid "gmane"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:86
#: ddportfolioservice/controllers/ddportfolio.py:88
msgid "Files"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:87
#: ddportfolioservice/controllers/ddportfolio.py:89
msgid "people.d.o"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:88
#: ddportfolioservice/controllers/ddportfolio.py:90
msgid "oldpeople"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:89
#: ddportfolioservice/controllers/ddportfolio.py:95
#: ddportfolioservice/controllers/ddportfolio.py:91
#: ddportfolioservice/controllers/ddportfolio.py:97
msgid "Alioth"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:92
#: ddportfolioservice/controllers/ddportfolio.py:94
msgid "Membership"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:93
#: ddportfolioservice/controllers/ddportfolio.py:95
msgid "NM"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:94
#: ddportfolioservice/controllers/ddportfolio.py:96
msgid "DB"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:98
#: ddportfolioservice/controllers/ddportfolio.py:100
msgid "Miscellaneous"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:99
#: ddportfolioservice/controllers/ddportfolio.py:101
msgid "debtags"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:100
#: ddportfolioservice/controllers/ddportfolio.py:102
msgid "links"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:103
msgid "Debian website"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:104
msgid "Debian search"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:107
msgid "Ubuntu"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:108
msgid "Available patches from Ubuntu"
msgstr ""
#: ddportfolioservice/model/urlbuilder.py:40
msgid "Email address"
msgstr ""
@ -190,7 +214,7 @@ msgstr ""
msgid "Alioth user name"
msgstr ""
#: ddportfolioservice/model/urlbuilder.py:73
#: ddportfolioservice/model/urlbuilder.py:74
#, python-format
msgid "Missing input: %s"
msgstr ""

BIN
ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo
View file

Binary file not shown.

62
ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
View file

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: ddportfolioservice 0.2\n"
"Report-Msgid-Bugs-To: jan@dittberner.info\n"
"POT-Creation-Date: 2009-01-20 23:13+0100\n"
"PO-Revision-Date: 2010-04-18 21:15+0200\n"
"PO-Revision-Date: 2010-05-10 21:30+0200\n"
"Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
"Language-Team: de <LL@li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
@ -109,11 +109,19 @@ msgstr ""
msgid "DEHS (Debian External Health Status)"
msgstr "DEHS (Debian External Health Status)"
#: ddportfolioservice/controllers/ddportfolio.py:75
#: ddportfolioservice/controllers/ddportfolio.py:73
msgid "piuparts"
msgstr "piuparts"
#: ddportfolioservice/controllers/ddportfolio.py:74
msgid "Debian patch tracking system"
msgstr "Debian Nachverfolgungssystem für Patches"
#: ddportfolioservice/controllers/ddportfolio.py:77
msgid "Upload"
msgstr "Upload"
#: ddportfolioservice/controllers/ddportfolio.py:76
#: ddportfolioservice/controllers/ddportfolio.py:78
msgid ""
"keylog (per-key upload list)\n"
"(note: uses key fingerprint)"
@ -121,63 +129,79 @@ msgstr ""
"Keylog\n"
"(Anmerkung: verwendet den Fingerabdruck des Schlüssels)"
#: ddportfolioservice/controllers/ddportfolio.py:80
#: ddportfolioservice/controllers/ddportfolio.py:82
msgid "Mailing Lists"
msgstr "Mailinglisten"
#: ddportfolioservice/controllers/ddportfolio.py:81
#: ddportfolioservice/controllers/ddportfolio.py:83
msgid "lists.d.o"
msgstr "lists.d.o"
#: ddportfolioservice/controllers/ddportfolio.py:82
#: ddportfolioservice/controllers/ddportfolio.py:84
msgid "lists.a.d.o"
msgstr "lists.a.d.o"
#: ddportfolioservice/controllers/ddportfolio.py:83
#: ddportfolioservice/controllers/ddportfolio.py:85
msgid "gmane"
msgstr "Gmane"
#: ddportfolioservice/controllers/ddportfolio.py:86
#: ddportfolioservice/controllers/ddportfolio.py:88
msgid "Files"
msgstr "Dateien"
#: ddportfolioservice/controllers/ddportfolio.py:87
#: ddportfolioservice/controllers/ddportfolio.py:89
msgid "people.d.o"
msgstr "people.d.o"
#: ddportfolioservice/controllers/ddportfolio.py:88
#: ddportfolioservice/controllers/ddportfolio.py:90
msgid "oldpeople"
msgstr "oldpeople"
#: ddportfolioservice/controllers/ddportfolio.py:89
#: ddportfolioservice/controllers/ddportfolio.py:95
#: ddportfolioservice/controllers/ddportfolio.py:91
#: ddportfolioservice/controllers/ddportfolio.py:97
msgid "Alioth"
msgstr "Alioth"
#: ddportfolioservice/controllers/ddportfolio.py:92
#: ddportfolioservice/controllers/ddportfolio.py:94
msgid "Membership"
msgstr "Mitgliedschaft"
#: ddportfolioservice/controllers/ddportfolio.py:93
#: ddportfolioservice/controllers/ddportfolio.py:95
msgid "NM"
msgstr "NM"
#: ddportfolioservice/controllers/ddportfolio.py:94
#: ddportfolioservice/controllers/ddportfolio.py:96
msgid "DB"
msgstr "DB"
#: ddportfolioservice/controllers/ddportfolio.py:98
#: ddportfolioservice/controllers/ddportfolio.py:100
msgid "Miscellaneous"
msgstr "Sonstiges"
#: ddportfolioservice/controllers/ddportfolio.py:99
#: ddportfolioservice/controllers/ddportfolio.py:101
msgid "debtags"
msgstr "debtags"
#: ddportfolioservice/controllers/ddportfolio.py:100
#: ddportfolioservice/controllers/ddportfolio.py:102
msgid "links"
msgstr "Links"
#: ddportfolioservice/controllers/ddportfolio.py:103
msgid "Debian website"
msgstr "Debian Webseite"
#: ddportfolioservice/controllers/ddportfolio.py:104
msgid "Debian search"
msgstr "Debian-Suche"
#: ddportfolioservice/controllers/ddportfolio.py:107
msgid "Ubuntu"
msgstr "Ubuntu"
#: ddportfolioservice/controllers/ddportfolio.py:108
msgid "Available patches from Ubuntu"
msgstr "Verfügbare Patches aus Ubuntu"
#: ddportfolioservice/model/urlbuilder.py:40
msgid "Email address"
msgstr "E-Mailadresse"
@ -202,7 +226,7 @@ msgstr "Nicht-DD E-Mailadresse:"
msgid "Alioth user name"
msgstr "Alioth-Benutzername"
#: ddportfolioservice/model/urlbuilder.py:73
#: ddportfolioservice/model/urlbuilder.py:74
#, python-format
msgid "Missing input: %s"
msgstr "Fehlende Eingabe: %s"