Merge branch 'master' into pylons0.10
authorJan Dittberner <jan@dittberner.info>
Fri, 11 Jun 2010 22:54:50 +0000 (00:54 +0200)
committerJan Dittberner <jan@dittberner.info>
Fri, 11 Jun 2010 22:54:50 +0000 (00:54 +0200)
* master:
  add support for GPG key lookup finger command and HTTP URL

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:22+0200\n"
 -"POT-Creation-Date: 2010-06-12 00:46+0200\n"
++"POT-Creation-Date: 2010-06-12 00:52+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"
@@@ -190,29 -190,37 +190,37 @@@ msgstr "
  msgid "Debian search"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:109
 -#: ddportfolioservice/controllers/ddportfolio.py:102
++#: ddportfolioservice/controllers/ddportfolio.py:107
+ msgid "GPG public key via finger"
+ msgstr ""
 -#: ddportfolioservice/controllers/ddportfolio.py:103
++#: ddportfolioservice/controllers/ddportfolio.py:108
+ msgid "GPG public key via HTTP"
+ msgstr ""
 -#: ddportfolioservice/controllers/ddportfolio.py:106
++#: ddportfolioservice/controllers/ddportfolio.py:111
  msgid "Information reachable via ssh (for DDs)"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:110
 -#: ddportfolioservice/controllers/ddportfolio.py:107
++#: ddportfolioservice/controllers/ddportfolio.py:112
  msgid "owned debian.net domains"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:111
 -#: ddportfolioservice/controllers/ddportfolio.py:108
++#: ddportfolioservice/controllers/ddportfolio.py:113
  msgid ""
  "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database "
  "information"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:112
 -#: ddportfolioservice/controllers/ddportfolio.py:109
++#: ddportfolioservice/controllers/ddportfolio.py:114
  msgid "Group membership information"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:115
 -#: ddportfolioservice/controllers/ddportfolio.py:112
++#: ddportfolioservice/controllers/ddportfolio.py:117
  msgid "Ubuntu"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:116
 -#: ddportfolioservice/controllers/ddportfolio.py:113
++#: ddportfolioservice/controllers/ddportfolio.py:118
  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:23+0200\n"
 -"PO-Revision-Date: 2010-06-12 00:47+0200\n"
++"PO-Revision-Date: 2010-06-12 00:53+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"
@@@ -202,15 -202,23 +202,23 @@@ msgstr "Debian Webseite
  msgid "Debian search"
  msgstr "Debian-Suche"
  
- #: ddportfolioservice/controllers/ddportfolio.py:109
 -#: ddportfolioservice/controllers/ddportfolio.py:102
++#: ddportfolioservice/controllers/ddportfolio.py:107
+ msgid "GPG public key via finger"
+ msgstr "öffentlicher GPG-Schlüssel per finger"
 -#: ddportfolioservice/controllers/ddportfolio.py:103
++#: ddportfolioservice/controllers/ddportfolio.py:108
+ msgid "GPG public key via HTTP"
+ msgstr "öffentlicher GPG-Schlüssel per HTTP"
 -#: ddportfolioservice/controllers/ddportfolio.py:106
++#: ddportfolioservice/controllers/ddportfolio.py:111
  msgid "Information reachable via ssh (for DDs)"
  msgstr "Per ssh erreichbare Informationen (für DDs)"
  
- #: ddportfolioservice/controllers/ddportfolio.py:110
 -#: ddportfolioservice/controllers/ddportfolio.py:107
++#: ddportfolioservice/controllers/ddportfolio.py:112
  msgid "owned debian.net domains"
  msgstr "Besitz von debian.net-Domains"
  
- #: ddportfolioservice/controllers/ddportfolio.py:111
 -#: ddportfolioservice/controllers/ddportfolio.py:108
++#: ddportfolioservice/controllers/ddportfolio.py:113
  msgid ""
  "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database"
  " information"
@@@ -218,15 -226,15 +226,15 @@@ msgstr "
  "Informationen in der <a "
  "href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>-Datenbank"
  
- #: ddportfolioservice/controllers/ddportfolio.py:112
 -#: ddportfolioservice/controllers/ddportfolio.py:109
++#: ddportfolioservice/controllers/ddportfolio.py:114
  msgid "Group membership information"
  msgstr "Information über Gruppenmitgliedschaften"
  
- #: ddportfolioservice/controllers/ddportfolio.py:115
 -#: ddportfolioservice/controllers/ddportfolio.py:112
++#: ddportfolioservice/controllers/ddportfolio.py:117
  msgid "Ubuntu"
  msgstr "Ubuntu"
  
- #: ddportfolioservice/controllers/ddportfolio.py:116
 -#: ddportfolioservice/controllers/ddportfolio.py:113
++#: ddportfolioservice/controllers/ddportfolio.py:118
  msgid "Available patches from Ubuntu"
  msgstr "Verfügbare Patches aus Ubuntu"