[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-www] branch stable updated (407d7d5 -> 144056a)
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-www] branch stable updated (407d7d5 -> 144056a) |
|
Date: |
Sat, 13 Jan 2018 15:01:26 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch stable
in repository www.
from 407d7d5 missing link bit
add 1bae164 2018
add 430407a init russian language
add 144056a 2018
No new revisions were added by this update.
Summary of changes:
.gitignore | 1 +
Makefile | 6 ++++--
index.html.j2 | 2 +-
locale/de/LC_MESSAGES/messages.po | 16 ++++++++--------
locale/en/LC_MESSAGES/messages.po | 6 +++---
locale/es/LC_MESSAGES/messages.po | 8 ++++----
locale/fr/LC_MESSAGES/messages.po | 6 +++---
locale/it/LC_MESSAGES/messages.po | 8 ++++----
locale/{en => ru}/LC_MESSAGES/messages.po | 20 +++++++++++++-------
presentations/investors2017.pdf | Bin 4558899 -> 4826032 bytes
template.py | 9 +++++++--
11 files changed, 48 insertions(+), 34 deletions(-)
copy locale/{en => ru}/LC_MESSAGES/messages.po (98%)
diff --git a/.gitignore b/.gitignore
index 04bdd4b..02acdf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ de/
fr/
it/
es/
+ru/
__pycache__
*.pyc
diff --git a/Makefile b/Makefile
index 904cf2c..8dc4bae 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
all: locale template
cd web-common && tsc
-# Extract translateable strings from jinga2 templates.
+# Extract translateable strings from jinja2 templates.
locale/messages.pot: *.j2 common/*.j2 common/*.j2.inc
env PYTHONPATH="." pybabel extract -F locale/babel.map -o
locale/messages.pot .
@@ -16,6 +16,7 @@ locale-update: locale/messages.pot
msgmerge -U -m --previous locale/fr/LC_MESSAGES/messages.po
locale/messages.pot
msgmerge -U -m --previous locale/es/LC_MESSAGES/messages.po
locale/messages.pot
msgmerge -U -m --previous locale/it/LC_MESSAGES/messages.po
locale/messages.pot
+ msgmerge -U -m --previous locale/ru/LC_MESSAGES/messages.po
locale/messages.pot
if grep -nA1 '#-#-#-#-#' locale/*/LC_MESSAGES/messages.po; then echo -e
"\nERROR: Conflicts encountered in PO files.\n"; exit 1; fi
@@ -26,11 +27,12 @@ locale-compile:
pybabel compile -d locale -l fr --use-fuzzy
pybabel compile -d locale -l it --use-fuzzy
pybabel compile -d locale -l es --use-fuzzy
+ pybabel compile -d locale -l ru --use-fuzzy
# Process everything related to gettext translations.
locale: locale-update locale-compile
-# Run the jinga2 templating engine to expand templates to HTML
+# Run the jinja2 templating engine to expand templates to HTML
# incorporating translations.
template: locale-compile
./template.py
diff --git a/index.html.j2 b/index.html.j2
index 2e9aae8..9e40d08 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -13,7 +13,7 @@
{% trans %}
GNU Taler is an electronic payment system under development at
<a href="http://www.inria.fr/";>Inria</a>. We expect to make it
- operational in 2017. You can learn about Taler on this website,
+ operational in 2018. You can learn about Taler on this website,
try the <a href="https://demo.taler.net";>demo</a> and look at
our <a href="https://docs.taler.net";>documentation</a>.
{% endtrans %}
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index f762623..8b07c71 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-14 11:45+0200\n"
+"POT-Creation-Date: 2017-12-28 20:16+0100\n"
"PO-Revision-Date: 2017-06-02 09:46+0100\n"
"Last-Translator: Stefan Kügel <address@hidden>\n"
"Language-Team: de <address@hidden, address@hidden>\n"
@@ -580,8 +580,8 @@ msgid ""
msgstr ""
"Neben dieser Webseite bestehen die <a href=\"https://git.taler.net/\";>Code-"
"Dokumentation</a>, die <a href=\"https://docs.taler.net";
-"\">Entwicklerdokumentation</a>. Wissenschaftliche Literatur findet "
-"man in der <a href=\"bibliography.html\">Bibliographie</a>."
+"\">Entwicklerdokumentation</a>. Wissenschaftliche Literatur findet man in "
+"der <a href=\"bibliography.html\">Bibliographie</a>."
#: developers.html.j2:88
msgid "Discussion"
@@ -1751,15 +1751,15 @@ msgstr "Bezahlen mit einem Klick!"
msgid ""
"GNU Taler is an electronic payment system under development at <a href="
"\"http://www.inria.fr/\";>Inria</a>. We expect to make it operational in "
-"2017. You can learn about Taler on this website, try the <a href=\"https://";
+"2018. You can learn about Taler on this website, try the <a href=\"https://";
"demo.taler.net\">demo</a> and look at our <a href=\"https://docs.taler.net";
"\">documentation</a>."
msgstr ""
"Taler ist ein elektronisches Bezahlsystem, das bei <a href=\"http://www.";
"inria.fr/\">Inria</a> entwickelt wird. Wir rechnen mit seiner Einführung im "
-"Jahr 2017. Auf der <a href=\"https://demo.taler.net\";>Demo-Seite</a> kann "
-"man die Funktionsweise von Taler kennenlernen. Weitere Informationen sind in
der"
-"<a href=\"https://docs.taler.net\";>Entwicklerdokumentation</a>."
+"Jahr 2018. Auf der <a href=\"https://demo.taler.net\";>Demo-Seite</a> kann "
+"man die Funktionsweise von Taler kennenlernen. Weitere Informationen sind in "
+"der<a href=\"https://docs.taler.net\";>Entwicklerdokumentation</a>."
#: index.html.j2:28
msgid "Practical"
@@ -2390,7 +2390,7 @@ msgstr ""
"die Überweisungen an Girokonten der Geschäftsbanken mit den genauen "
"Bedingungen jedes Kaufvertrags und nach Geschäftsvorfällen geordnet anzeigen."
-#: news.html.j2.inc:7
+#: news.html.j2.inc:8
msgid "More news"
msgstr ""
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 58ed7f2..9e0020d 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-14 11:53+0200\n"
+"POT-Creation-Date: 2017-12-28 20:16+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: en <address@hidden>\n"
@@ -1069,7 +1069,7 @@ msgstr ""
msgid ""
"GNU Taler is an electronic payment system under development at <a href="
"\"http://www.inria.fr/\";>Inria</a>. We expect to make it operational in "
-"2017. You can learn about Taler on this website, try the <a href=\"https://";
+"2018. You can learn about Taler on this website, try the <a href=\"https://";
"demo.taler.net\">demo</a> and look at our <a href=\"https://docs.taler.net";
"\">documentation</a>."
msgstr ""
@@ -1393,7 +1393,7 @@ msgid ""
"each contract."
msgstr ""
-#: news.html.j2.inc:7
+#: news.html.j2.inc:8
msgid "More news"
msgstr ""
diff --git a/locale/es/LC_MESSAGES/messages.po
b/locale/es/LC_MESSAGES/messages.po
index b90f8cf..edf8348 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-14 11:45+0200\n"
+"POT-Creation-Date: 2017-12-28 20:16+0100\n"
"PO-Revision-Date: 2017-08-10 06:24+0200\n"
"Last-Translator: \n"
"Language-Team: es <address@hidden>\n"
@@ -1413,13 +1413,13 @@ msgstr "¡Pagos en efectivo a un solo click!"
msgid ""
"GNU Taler is an electronic payment system under development at <a href="
"\"http://www.inria.fr/\";>Inria</a>. We expect to make it operational in "
-"2017. You can learn about Taler on this website, try the <a href=\"https://";
+"2018. You can learn about Taler on this website, try the <a href=\"https://";
"demo.taler.net\">demo</a> and look at our <a href=\"https://docs.taler.net";
"\">documentation</a>."
msgstr ""
"GNU Taler es un sistema de pago electrónico que está siendo desarrollado en "
"<a href=\"http://www.inria.fr/\";>Inria</a>. Esperamos hacerla operativa en "
-"2017. Puede aprender sobre Taler en este sitio web, pruebe la <a href="
+"2018. Puede aprender sobre Taler en este sitio web, pruebe la <a href="
"\"https://demo.taler.net\";>demo</a> y eche un vistazo a nuestro <a href="
"\"https://docs.taler.net\";>documentación</a>."
@@ -1876,7 +1876,7 @@ msgstr ""
"<b>relacionar</b> las transferencias bancarias con los pagos electrónicos "
"correspondientes, incluyendo los términos exactos de cada contrato."
-#: news.html.j2.inc:7
+#: news.html.j2.inc:8
msgid "More news"
msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index e6e25f9..f3968a4 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-14 11:53+0200\n"
+"POT-Creation-Date: 2017-12-28 20:16+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: fr <address@hidden>\n"
@@ -1083,7 +1083,7 @@ msgstr ""
msgid ""
"GNU Taler is an electronic payment system under development at <a href="
"\"http://www.inria.fr/\";>Inria</a>. We expect to make it operational in "
-"2017. You can learn about Taler on this website, try the <a href=\"https://";
+"2018. You can learn about Taler on this website, try the <a href=\"https://";
"demo.taler.net\">demo</a> and look at our <a href=\"https://docs.taler.net";
"\">documentation</a>."
msgstr ""
@@ -1408,7 +1408,7 @@ msgid ""
"each contract."
msgstr ""
-#: news.html.j2.inc:7
+#: news.html.j2.inc:8
msgid "More news"
msgstr ""
diff --git a/locale/it/LC_MESSAGES/messages.po
b/locale/it/LC_MESSAGES/messages.po
index e4fef53..7fbd840 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-14 11:45+0200\n"
+"POT-Creation-Date: 2017-12-28 20:16+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: it <address@hidden>\n"
@@ -1423,13 +1423,13 @@ msgstr "Pagamenti in contanti con un solo click! "
msgid ""
"GNU Taler is an electronic payment system under development at <a href="
"\"http://www.inria.fr/\";>Inria</a>. We expect to make it operational in "
-"2017. You can learn about Taler on this website, try the <a href=\"https://";
+"2018. You can learn about Taler on this website, try the <a href=\"https://";
"demo.taler.net\">demo</a> and look at our <a href=\"https://docs.taler.net";
"\">documentation</a>."
msgstr ""
"GNU Taler è un sistema di pagamento elettronico in fase di sviluppo presso "
"<a href=\"http://www.inria.fr/\";>Inria</a>. Ci aspettiamo di renderlo "
-"operativo nel 2017. Puoi conoscere Taler su questo sito web, provare la <a "
+"operativo nel 2018. Puoi conoscere Taler su questo sito web, provare la <a "
"href=\"https://demo.taler.net\";>demo</a> e dare uno sguardo alla nostra "
"documentazione per gli <a href=\"https://docs.taler.net\";>sviluppatori</a>. "
@@ -1894,7 +1894,7 @@ msgstr ""
"bonifici a set di transazioni commerciali, includendo i termini esatti di "
"ogni contratto. "
-#: news.html.j2.inc:7
+#: news.html.j2.inc:8
msgid "More news"
msgstr "Altre notizie"
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/ru/LC_MESSAGES/messages.po
similarity index 98%
copy from locale/en/LC_MESSAGES/messages.po
copy to locale/ru/LC_MESSAGES/messages.po
index 58ed7f2..fec7692 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -1,17 +1,23 @@
+# Russian translations for PROJECT.
+# Copyright (C) 2017 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <address@hidden>, 2017.
+#
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-14 11:53+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: 2017-12-28 20:16+0100\n"
+"PO-Revision-Date: 2017-12-29 11:14+0100\n"
"Last-Translator: FULL NAME <address@hidden>\n"
-"Language-Team: en <address@hidden>\n"
-"Language: en\n"
+"Language-Team: ru <address@hidden>\n"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1)\n"
-"Generated-By: Babel 2.3.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Generated-By: Babel 2.5.1\n"
#: about.html.j2:8
msgid ""
@@ -1393,7 +1399,7 @@ msgid ""
"each contract."
msgstr ""
-#: news.html.j2.inc:7
+#: news.html.j2.inc:8
msgid "More news"
msgstr ""
diff --git a/presentations/investors2017.pdf b/presentations/investors2017.pdf
index 4f48cda..f122488 100644
Binary files a/presentations/investors2017.pdf and
b/presentations/investors2017.pdf differ
diff --git a/template.py b/template.py
index e0e3dac..005239d 100755
--- a/template.py
+++ b/template.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# This file is in the public domain.
#
-# This script runs the jinga2 templating engine on an input template-file
+# This script runs the jinja2 templating engine on an input template-file
# using the specified locale for gettext translations, and outputs
# the resulting (HTML) ouptut-file.
#
@@ -25,7 +25,12 @@ env =
jinja2.Environment(loader=jinja2.FileSystemLoader(os.path.dirname(__file__
undefined=jinja2.StrictUndefined,
autoescape=False)
-langs_full = {"en": "English", "fr": "Français", "it": "Italiano", "es":
"Español", "de": "Deutsch"}
+langs_full = {"en": "English",
+ "fr": "Français",
+ "it": "Italiano",
+ "es": "Español",
+ "de": "Deutsch",
+ "ru": "Ру́сский язы́к"}
for in_file in glob.glob("*.j2"):
name, ext = re.match(r"(.*)\.([^.]+)$", in_file.rstrip(".j2")).groups()
--
To stop receiving notification emails like this one, please contact
address@hidden
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-www] branch stable updated (407d7d5 -> 144056a),
gnunet <=