Merge branch 'master' into pylons0.10
authorJan Dittberner <jan@dittberner.info>
Sat, 12 Jun 2010 21:28:45 +0000 (23:28 +0200)
committerJan Dittberner <jan@dittberner.info>
Sat, 12 Jun 2010 21:28:45 +0000 (23:28 +0200)
* master:
  add support for finger command line for db.debian.org query

1  2 
ddportfolioservice/controllers/ddportfolio.py
ddportfolioservice/i18n/ddportfolioservice.pot
ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo
ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
ddportfolioservice/model/ddportfolio.ini

@@@ -7,9 -7,9 +7,9 @@@
  #, fuzzy
  msgid ""
  msgstr ""
 -"Project-Id-Version: ddportfolioservice 0.1\n"
 +"Project-Id-Version: ddportfolioservice 0.2\n"
  "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
- "POT-Creation-Date: 2010-06-12 00:52+0200\n"
 -"POT-Creation-Date: 2010-06-12 23:22+0200\n"
++"POT-Creation-Date: 2010-06-12 23: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"
@@@ -145,8 -145,8 +145,8 @@@ msgstr "
  msgid "oldpeople"
  msgstr ""
  
 -#: ddportfolioservice/controllers/ddportfolio.py:86
 -#: ddportfolioservice/controllers/ddportfolio.py:93
 +#: ddportfolioservice/controllers/ddportfolio.py:91
- #: ddportfolioservice/controllers/ddportfolio.py:97
++#: ddportfolioservice/controllers/ddportfolio.py:98
  msgid "Alioth"
  msgstr ""
  
@@@ -158,69 -158,73 +158,73 @@@ msgstr "
  msgid "NM"
  msgstr ""
  
 -#: ddportfolioservice/controllers/ddportfolio.py:91
 +#: ddportfolioservice/controllers/ddportfolio.py:96
- msgid "DB"
+ msgid "DB information via finger"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:98
- msgid "Wiki"
 -#: ddportfolioservice/controllers/ddportfolio.py:92
++#: ddportfolioservice/controllers/ddportfolio.py:97
+ msgid "DB information via HTTP"
  msgstr ""
  
 -#: ddportfolioservice/controllers/ddportfolio.py:94
 +#: ddportfolioservice/controllers/ddportfolio.py:99
+ msgid "Wiki"
+ msgstr ""
 -#: ddportfolioservice/controllers/ddportfolio.py:95
++#: ddportfolioservice/controllers/ddportfolio.py:100
  msgid "Forum"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:102
 -#: ddportfolioservice/controllers/ddportfolio.py:98
++#: ddportfolioservice/controllers/ddportfolio.py:103
  msgid "Miscellaneous"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:103
 -#: ddportfolioservice/controllers/ddportfolio.py:99
++#: ddportfolioservice/controllers/ddportfolio.py:104
  msgid "debtags"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:104
 -#: ddportfolioservice/controllers/ddportfolio.py:100
++#: ddportfolioservice/controllers/ddportfolio.py:105
  msgid "links"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:105
 -#: ddportfolioservice/controllers/ddportfolio.py:101
++#: ddportfolioservice/controllers/ddportfolio.py:106
  msgid "Debian website"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:106
 -#: ddportfolioservice/controllers/ddportfolio.py:102
++#: ddportfolioservice/controllers/ddportfolio.py:107
  msgid "Debian search"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:107
 -#: ddportfolioservice/controllers/ddportfolio.py:103
++#: ddportfolioservice/controllers/ddportfolio.py:108
  msgid "GPG public key via finger"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:108
 -#: ddportfolioservice/controllers/ddportfolio.py:104
++#: ddportfolioservice/controllers/ddportfolio.py:109
  msgid "GPG public key via HTTP"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:111
 -#: ddportfolioservice/controllers/ddportfolio.py:107
++#: ddportfolioservice/controllers/ddportfolio.py:112
  msgid "Information reachable via ssh (for DDs)"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:112
 -#: ddportfolioservice/controllers/ddportfolio.py:108
++#: ddportfolioservice/controllers/ddportfolio.py:113
  msgid "owned debian.net domains"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:113
 -#: ddportfolioservice/controllers/ddportfolio.py:109
++#: ddportfolioservice/controllers/ddportfolio.py:114
  msgid ""
  "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database "
  "information"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:114
 -#: ddportfolioservice/controllers/ddportfolio.py:110
++#: ddportfolioservice/controllers/ddportfolio.py:115
  msgid "Group membership information"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:117
 -#: ddportfolioservice/controllers/ddportfolio.py:113
++#: ddportfolioservice/controllers/ddportfolio.py:118
  msgid "Ubuntu"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:118
 -#: ddportfolioservice/controllers/ddportfolio.py:114
++#: ddportfolioservice/controllers/ddportfolio.py:119
  msgid "Available patches from Ubuntu"
  msgstr ""
  
@@@ -6,10 -6,10 +6,10 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: ddportfolioservice 0.1\n"
 +"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-06-12 00:53+0200\n"
 -"PO-Revision-Date: 2010-06-12 23:23+0200\n"
++"PO-Revision-Date: 2010-06-12 23:28+0200\n"
  "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
  "Language-Team: de <de@li.org>\n"
  "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@@ -157,8 -157,8 +157,8 @@@ msgstr "people.d.o
  msgid "oldpeople"
  msgstr "oldpeople"
  
 -#: ddportfolioservice/controllers/ddportfolio.py:86
 -#: ddportfolioservice/controllers/ddportfolio.py:93
 +#: ddportfolioservice/controllers/ddportfolio.py:91
- #: ddportfolioservice/controllers/ddportfolio.py:97
++#: ddportfolioservice/controllers/ddportfolio.py:98
  msgid "Alioth"
  msgstr "Alioth"
  
@@@ -170,55 -170,59 +170,59 @@@ msgstr "Mitgliedschaft
  msgid "NM"
  msgstr "NM"
  
 -#: ddportfolioservice/controllers/ddportfolio.py:91
 +#: ddportfolioservice/controllers/ddportfolio.py:96
- msgid "DB"
- msgstr "DB"
+ msgid "DB information via finger"
+ msgstr "DB-Informationen per finger"
  
- #: ddportfolioservice/controllers/ddportfolio.py:98
 -#: ddportfolioservice/controllers/ddportfolio.py:92
++#: ddportfolioservice/controllers/ddportfolio.py:97
+ msgid "DB information via HTTP"
+ msgstr "DB-Informationen per HTTP"
 -#: ddportfolioservice/controllers/ddportfolio.py:94
++#: ddportfolioservice/controllers/ddportfolio.py:99
  msgid "Wiki"
  msgstr "Wiki"
  
- #: ddportfolioservice/controllers/ddportfolio.py:99
 -#: ddportfolioservice/controllers/ddportfolio.py:95
++#: ddportfolioservice/controllers/ddportfolio.py:100
  msgid "Forum"
  msgstr "Forum"
  
- #: ddportfolioservice/controllers/ddportfolio.py:102
 -#: ddportfolioservice/controllers/ddportfolio.py:98
++#: ddportfolioservice/controllers/ddportfolio.py:103
  msgid "Miscellaneous"
  msgstr "Sonstiges"
  
- #: ddportfolioservice/controllers/ddportfolio.py:103
 -#: ddportfolioservice/controllers/ddportfolio.py:99
++#: ddportfolioservice/controllers/ddportfolio.py:104
  msgid "debtags"
  msgstr "debtags"
  
- #: ddportfolioservice/controllers/ddportfolio.py:104
 -#: ddportfolioservice/controllers/ddportfolio.py:100
++#: ddportfolioservice/controllers/ddportfolio.py:105
  msgid "links"
  msgstr "Links"
  
- #: ddportfolioservice/controllers/ddportfolio.py:105
 -#: ddportfolioservice/controllers/ddportfolio.py:101
++#: ddportfolioservice/controllers/ddportfolio.py:106
  msgid "Debian website"
  msgstr "Debian Webseite"
  
- #: ddportfolioservice/controllers/ddportfolio.py:106
 -#: ddportfolioservice/controllers/ddportfolio.py:102
++#: ddportfolioservice/controllers/ddportfolio.py:107
  msgid "Debian search"
  msgstr "Debian-Suche"
  
- #: ddportfolioservice/controllers/ddportfolio.py:107
 -#: ddportfolioservice/controllers/ddportfolio.py:103
++#: ddportfolioservice/controllers/ddportfolio.py:108
  msgid "GPG public key via finger"
  msgstr "öffentlicher GPG-Schlüssel per finger"
  
- #: ddportfolioservice/controllers/ddportfolio.py:108
 -#: ddportfolioservice/controllers/ddportfolio.py:104
++#: ddportfolioservice/controllers/ddportfolio.py:109
  msgid "GPG public key via HTTP"
  msgstr "öffentlicher GPG-Schlüssel per HTTP"
  
- #: ddportfolioservice/controllers/ddportfolio.py:111
 -#: ddportfolioservice/controllers/ddportfolio.py:107
++#: ddportfolioservice/controllers/ddportfolio.py:112
  msgid "Information reachable via ssh (for DDs)"
  msgstr "Per ssh erreichbare Informationen (für DDs)"
  
- #: ddportfolioservice/controllers/ddportfolio.py:112
 -#: ddportfolioservice/controllers/ddportfolio.py:108
++#: ddportfolioservice/controllers/ddportfolio.py:113
  msgid "owned debian.net domains"
  msgstr "Besitz von debian.net-Domains"
  
- #: ddportfolioservice/controllers/ddportfolio.py:113
 -#: ddportfolioservice/controllers/ddportfolio.py:109
++#: ddportfolioservice/controllers/ddportfolio.py:114
  msgid ""
  "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database"
  " information"
@@@ -226,15 -230,15 +230,15 @@@ msgstr "
  "Informationen in der <a "
  "href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>-Datenbank"
  
- #: ddportfolioservice/controllers/ddportfolio.py:114
 -#: ddportfolioservice/controllers/ddportfolio.py:110
++#: ddportfolioservice/controllers/ddportfolio.py:115
  msgid "Group membership information"
  msgstr "Information über Gruppenmitgliedschaften"
  
- #: ddportfolioservice/controllers/ddportfolio.py:117
 -#: ddportfolioservice/controllers/ddportfolio.py:113
++#: ddportfolioservice/controllers/ddportfolio.py:118
  msgid "Ubuntu"
  msgstr "Ubuntu"
  
- #: ddportfolioservice/controllers/ddportfolio.py:118
 -#: ddportfolioservice/controllers/ddportfolio.py:114
++#: ddportfolioservice/controllers/ddportfolio.py:119
  msgid "Available patches from Ubuntu"
  msgstr "Verfügbare Patches aus Ubuntu"