Merge branch 'feature/transifexlink' into develop

* feature/transifexlink:
  update ChangeLog
  update message catalog and german translation
  add Transifex link to the footer
This commit is contained in:
Jan Dittberner 2012-12-08 13:09:24 +01:00
commit 6e352f54cd
11 changed files with 53 additions and 26 deletions

View file

@ -1,6 +1,7 @@
2012-12-08 Jan Dittberner <jan@dittberner.info>
* include patch for Debian URL checker by Paul Wise
* add link to Transifex translation project
2012-11-21 Jan Dittberner <jan@dittberner.info>

View file

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ddportfolioservice 0.2.10\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2012-12-08 12:49+0100\n"
"POT-Creation-Date: 2012-12-08 13:05+0100\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"
@ -282,7 +282,10 @@ msgid ""
" the License, or (at your option) any later version. You can <a "
"href=\"%(browseurl)s\" title=\"Gitweb repository browser URL\">browse the "
"source code</a> or clone it from <a href=\"%(cloneurl)s\" title=\"git clone "
"URL\">%(cloneurl)s</a> using <a href=\"http://git-scm.com/\">git</a>."
"URL\">%(cloneurl)s</a> using <a href=\"http://git-scm.com/\">git</a>. If you "
"want to translate this service to your language you can contribute at <a "
"href=\"%(transifexurl)s\" title=\"Debian Member Portfolio Service at "
"Transifex\">Transifex</a>."
msgstr ""
#: ddportfolioservice/templates/base.mako:49

View file

@ -1,15 +1,15 @@
# German translations for ddportfolioservice.
# Copyright (C) 2009, 2010, 2011 Jan Dittberner
# Copyright (C) 2009, 2010, 2011, 2012 Jan Dittberner
# This file is distributed under the same license as the ddportfolioservice
# project.
# Jan Dittberner <jan@dittberner.info>, 2009, 2010, 2011.
# Jan Dittberner <jan@dittberner.info>, 2009, 2010, 2011, 2012.
#
msgid ""
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-12-08 12:52+0100\n"
"PO-Revision-Date: 2012-12-08 13:07+0100\n"
"Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
"Language-Team: de <de@li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
@ -300,17 +300,10 @@ msgid ""
"href=\"%(browseurl)s\" title=\"Gitweb repository browser URL\">browse the"
" source code</a> or clone it from <a href=\"%(cloneurl)s\" title=\"git "
"clone URL\">%(cloneurl)s</a> using <a href=\"http://git-"
"scm.com/\">git</a>."
msgstr ""
"Dieser Dienst wird unter den Bedingungen der <a "
"href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public "
"License</a>, so wie sie von der Free Software Foundation veröffentlicht "
"ist, bereitgestellt. Sie können entweder Version 3 oder (auf Ihren Wunsch"
" hin) jede spätere Version der Lizenz verwenden. Sie können sich <a "
"href=\"%(browseurl)s\" title=\"Gitweb Repository-Browser-URL\">den "
"Quelltext ansehen</a> oder mit <a href=\"http://git-scm.com\">git</a> von"
" <a href=\"%(cloneurl)s\" title=\"Git Clone-URL\">%(cloneurl)s</a> "
"klonen."
"scm.com/\">git</a>. If you want to translate this service to your "
"language you can contribute at <a href=\"%(transifexurl)s\" "
"title=\"Debian Member Portfolio Service at Transifex\">Transifex</a>."
msgstr "Dieser Dienst wird unter den Bedingungen der <a href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public License</a>, so wie sie von der Free Software Foundation veröffentlicht ist, bereitgestellt. Sie können entweder Version 3 oder (auf Ihren Wunsch hin) jede spätere Version der Lizenz verwenden. Sie können sich <a href=\"%(browseurl)s\" title=\"Gitweb Repository-Browser-URL\">den Quelltext ansehen</a> oder mit <a href=\"http://git-scm.com\">git</a> von <a href=\"%(cloneurl)s\" title=\"Git Clone-URL\">%(cloneurl)s</a> klonen. Wenn Sie diesen Service in Ihre Sprache übersetzen möchten, können Sie auf <a href=\"%(transifexurl)s\" title=\"Debian Member Portfolio Service bei Transifex\">Transifex</a> dazu beitragen."
#: ddportfolioservice/templates/base.mako:49
msgid "Copyright © 2009, 2010, 2011, 2012 Jan Dittberner"

View file

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Debian Member Portfolio Service\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2012-05-18 16:10+0200\n"
"PO-Revision-Date: 2012-12-08 12:49+0100\n"
"PO-Revision-Date: 2012-12-08 13:05+0100\n"
"Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
"Language-Team: French "
"(http://www.transifex.net/projects/p/debportfolioservice/language/fr/)\n"
@ -289,7 +289,15 @@ msgid "AGPL - Free Software"
msgstr "AGPL - Logiciel libre"
#: ddportfolioservice/templates/base.mako:48
#, python-format
#, fuzzy, python-format
#| msgid "" "The service is available under the terms of the <a "
#| "href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public "
#| "License</a> as published by the Free Software Foundation, either version "
#| "3 of the License, or (at your option) any later version. You can <a "
#| "href=\"%(browseurl)s\" title=\"Gitweb repository browser URL\">browse the"
#| " source code</a> or clone it from <a href=\"%(cloneurl)s\" title=\"git "
#| "clone URL\">%(cloneurl)s</a> using <a href=\"http://git-"
#| "scm.com/\">git</a>."
msgid ""
"The service is available under the terms of the <a "
"href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public "
@ -298,7 +306,9 @@ msgid ""
"href=\"%(browseurl)s\" title=\"Gitweb repository browser URL\">browse the"
" source code</a> or clone it from <a href=\"%(cloneurl)s\" title=\"git "
"clone URL\">%(cloneurl)s</a> using <a href=\"http://git-"
"scm.com/\">git</a>."
"scm.com/\">git</a>. If you want to translate this service to your "
"language you can contribute at <a href=\"%(transifexurl)s\" "
"title=\"Debian Member Portfolio Service at Transifex\">Transifex</a>."
msgstr ""
"Ce service est disponible sous les termes de la licence <a "
"href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public "

View file

@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: Debian Member Portfolio Service\n"
"Report-Msgid-Bugs-To: atoz.chevara@yahoo.com\n"
"POT-Creation-Date: 2012-05-18 16:10+0200\n"
"PO-Revision-Date: 2012-12-08 12:49+0100\n"
"PO-Revision-Date: 2012-12-08 13:05+0100\n"
"Last-Translator: Izharul Haq <atoz.chevara@yahoo.com>\n"
"Language-Team: Indonesian "
"(http://www.transifex.com/projects/p/debportfolioservice/language/id/)\n"
@ -291,7 +291,15 @@ msgid "AGPL - Free Software"
msgstr "AGPL - Free Software"
#: ddportfolioservice/templates/base.mako:48
#, python-format
#, fuzzy, python-format
#| msgid "" "The service is available under the terms of the <a "
#| "href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public "
#| "License</a> as published by the Free Software Foundation, either version "
#| "3 of the License, or (at your option) any later version. You can <a "
#| "href=\"%(browseurl)s\" title=\"Gitweb repository browser URL\">browse the"
#| " source code</a> or clone it from <a href=\"%(cloneurl)s\" title=\"git "
#| "clone URL\">%(cloneurl)s</a> using <a href=\"http://git-"
#| "scm.com/\">git</a>."
msgid ""
"The service is available under the terms of the <a "
"href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public "
@ -300,7 +308,9 @@ msgid ""
"href=\"%(browseurl)s\" title=\"Gitweb repository browser URL\">browse the"
" source code</a> or clone it from <a href=\"%(cloneurl)s\" title=\"git "
"clone URL\">%(cloneurl)s</a> using <a href=\"http://git-"
"scm.com/\">git</a>."
"scm.com/\">git</a>. If you want to translate this service to your "
"language you can contribute at <a href=\"%(transifexurl)s\" "
"title=\"Debian Member Portfolio Service at Transifex\">Transifex</a>."
msgstr ""
"Layanan ini tersedia di bawah persyaratan <a "
"href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public "

View file

@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: Debian Member Portfolio Service\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2012-05-18 16:10+0200\n"
"PO-Revision-Date: 2012-12-08 12:49+0100\n"
"PO-Revision-Date: 2012-12-08 13:05+0100\n"
"Last-Translator: Daniel Manzano <dzm747@hotmail.com>\n"
"Language-Team: Portuguese (Brazil) "
"(http://www.transifex.net/projects/p/debportfolioservice/language/pt_BR/)"
@ -292,7 +292,15 @@ msgid "AGPL - Free Software"
msgstr "AGPL - Sofware Livre"
#: ddportfolioservice/templates/base.mako:48
#, python-format
#, fuzzy, python-format
#| msgid "" "The service is available under the terms of the <a "
#| "href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public "
#| "License</a> as published by the Free Software Foundation, either version "
#| "3 of the License, or (at your option) any later version. You can <a "
#| "href=\"%(browseurl)s\" title=\"Gitweb repository browser URL\">browse the"
#| " source code</a> or clone it from <a href=\"%(cloneurl)s\" title=\"git "
#| "clone URL\">%(cloneurl)s</a> using <a href=\"http://git-"
#| "scm.com/\">git</a>."
msgid ""
"The service is available under the terms of the <a "
"href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public "
@ -301,7 +309,9 @@ msgid ""
"href=\"%(browseurl)s\" title=\"Gitweb repository browser URL\">browse the"
" source code</a> or clone it from <a href=\"%(cloneurl)s\" title=\"git "
"clone URL\">%(cloneurl)s</a> using <a href=\"http://git-"
"scm.com/\">git</a>."
"scm.com/\">git</a>. If you want to translate this service to your "
"language you can contribute at <a href=\"%(transifexurl)s\" "
"title=\"Debian Member Portfolio Service at Transifex\">Transifex</a>."
msgstr ""
"O serviço está disponível sob os termos da <a "
"href=\"http://www.gnu.org/licenses/agpl.html\">Licença Pública Geral "

View file

@ -45,7 +45,7 @@ License along with this program. If not, see
<div id="footer">
${h.image(h.url('/images/agplv3-88x31.png'), _('AGPL - Free Software'), 88, 31,
id='agpllogo')}
<p>${h.literal(_('''The service is available under the terms of the <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. You can <a href="%(browseurl)s" title="Gitweb repository browser URL">browse the source code</a> or clone it from <a href="%(cloneurl)s" title="git clone URL">%(cloneurl)s</a> using <a href="http://git-scm.com/">git</a>.''') % dict((('browseurl', 'http://debianstuff.dittberner.info/gitweb.cgi?p=ddportfolioservice.git;a=summary'), ('cloneurl', 'http://debianstuff.dittberner.info/git/ddportfolioservice.git'))))}</p>
<p>${h.literal(_('''The service is available under the terms of the <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. You can <a href="%(browseurl)s" title="Gitweb repository browser URL">browse the source code</a> or clone it from <a href="%(cloneurl)s" title="git clone URL">%(cloneurl)s</a> using <a href="http://git-scm.com/">git</a>. If you want to translate this service to your language you can contribute at <a href="%(transifexurl)s" title="Debian Member Portfolio Service at Transifex">Transifex</a>.''') % dict((('browseurl', 'http://debianstuff.dittberner.info/gitweb.cgi?p=ddportfolioservice.git;a=summary'), ('cloneurl', 'http://debianstuff.dittberner.info/git/ddportfolioservice.git'), ('transifexurl', 'https://www.transifex.com/projects/p/debportfolioservice/'))))}</p>
<p>${_(u'''Copyright © 2009, 2010, 2011, 2012 Jan Dittberner''')}</p>
</div>
</body>