[GNUnet-SVN] [taler-www] branch master updated: init russian language

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository www.

The following commit(s) were added to refs/heads/master by this push:
     new 430407a  init russian language
430407a is described below

commit 430407abbaedfdbf08bc5523a6bd750997837c07
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Dec 29 11:30:06 2017 +0100

    init russian language
---
 .gitignore                                |  1 +
 Makefile                                  |  6 ++++--
 locale/de/LC_MESSAGES/messages.po         | 12 ++++++------
 locale/en/LC_MESSAGES/messages.po         |  4 ++--
 locale/es/LC_MESSAGES/messages.po         |  4 ++--
 locale/fr/LC_MESSAGES/messages.po         |  4 ++--
 locale/it/LC_MESSAGES/messages.po         |  4 ++--
 locale/{en => ru}/LC_MESSAGES/messages.po | 20 +++++++++++++-------
 template.py                               |  9 +++++++--
 9 files changed, 39 insertions(+), 25 deletions(-)

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/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index f762623..65cdd2b 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"
@@ -1758,8 +1758,8 @@ 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>."
+"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..12a7fdf 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"
@@ -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..cb98547 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"
@@ -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..d035e78 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"
@@ -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..75e2a7a 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"
@@ -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/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