Merge branch 'MaxBondarev' into 'develop'

issue #24 See merge request max.bondarev/universo!8

Merge branch 'MaxBondarev' into 'develop'
issue #24 See merge request max.bondarev/universo!8
b6846fe0 · Max Bondarev · 86fa0c10 · 871bcd26 · b6846fe0 · b6846fe0
--- a/kerno/lingvoj/en_US.po
+++ b/kerno/lingvoj/en_US.po
@@ -21,9 +21,3 @@ msgstr "Password"

 msgid "Wrong login or password"
 msgstr "Wrong login or password"
-
-msgid "Stuff"
-msgstr "Stuff"
-
-msgid "Store"
-msgstr "Store"
--- a/kerno/lingvoj/eo_XX.po
+++ b/kerno/lingvoj/eo_XX.po
@@ -21,9 +21,3 @@ msgstr "Password-eo"

 msgid "Wrong login or password"
 msgstr "Wrong logino or passwordo)"
-
-msgid "Stuff"
-msgstr "Produkto"
-
-msgid "Store"
-msgstr "Store"
--- a/kerno/lingvoj/godot-l10n.pot
+++ b/kerno/lingvoj/godot-l10n.pot
--- a/kerno/lingvoj/ru_RU.po
+++ b/kerno/lingvoj/ru_RU.po
@@ -22,9 +22,3 @@ msgstr "Пароль"

 msgid "Wrong login or password"
 msgstr "Неверный логин или пароль"
-
-msgid "Stuff"
-msgstr "Товары"
-
-msgid "store"
-msgstr "Магазин"
--- a/blokoj/resursa-centro/lingvoj/en_US.po
+++ b/blokoj/resursa-centro/lingvoj/en_US.po
+# Don't remove the two lines below, they're required for gettext to work correctly.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Stuff"
+msgstr "Stuff"
+
+msgid "Store"
+msgstr "Store"
--- a/blokoj/resursa-centro/lingvoj/eo_XX.po
+++ b/blokoj/resursa-centro/lingvoj/eo_XX.po
+# Don't remove the two lines below, they're required for gettext to work correctly.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: eo_XX\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Stuff"
+msgstr "Produkto"
+
+msgid "Store"
+msgstr "Store"
--- a/blokoj/resursa-centro/lingvoj/godot-l10n.pot
+++ b/blokoj/resursa-centro/lingvoj/godot-l10n.pot
+# Translations template for PROJECT.
+# Copyright (C) 2020 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2020-01-08 10:16+0700\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+
--- a/blokoj/resursa-centro/lingvoj/ru_RU.po
+++ b/blokoj/resursa-centro/lingvoj/ru_RU.po
+# Don't remove the two lines below, they're required for gettext to work correctly.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\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"
+
+msgid "Stuff"
+msgstr "Товары"
+
+msgid "store"
+msgstr "Магазин"
--- a/project.godot
+++ b/project.godot
@@ -76,4 +76,4 @@ move_back={

 [locale]

-translations=PoolStringArray( "res://kerno/lingvoj/en_US.po", "res://kerno/lingvoj/eo_XX.po", "res://kerno/lingvoj/ru_RU.po" )
+translations=PoolStringArray( "res://blokoj/rajtigo/lingvoj/en_US.po", "res://blokoj/rajtigo/lingvoj/eo_XX.po", "res://blokoj/rajtigo/lingvoj/ru_RU.po", "res://blokoj/resursa-centro/lingvoj/en_US.po", "res://blokoj/resursa-centro/lingvoj/eo_XX.po", "res://blokoj/resursa-centro/lingvoj/ru_RU.po" )