cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://translate.tandoor.dev/git/tandoor/recipes-backend into develop

Browse Source 
# Conflicts:
#	vue/src/locales/ru.json
This commit is contained in:
vabene1111 2022-12-31 13:36:34 +01:00
commit 12a1f261db
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cookbook/locale/ru/LC_MESSAGES/django.po
View File

@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-13 22:40+0200\n" "POT-Creation-Date: 2021-09-13 22:40+0200\n"
"PO-Revision-Date: 2022-04-07 19:32+0000\n" "PO-Revision-Date: 2022-11-30 19:09+0000\n"
"Last-Translator: Artem Aksenov <artemmillerr@gmail.com>\n" "Last-Translator: Alex <kovsharoff@gmail.com>\n"
"Language-Team: Russian <http://translate.tandoor.dev/projects/tandoor/" "Language-Team: Russian <http://translate.tandoor.dev/projects/tandoor/"
"recipes-backend/ru/>\n" "recipes-backend/ru/>\n"
"Language: ru\n" "Language: ru\n"
@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && 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" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 4.10.1\n" "X-Generator: Weblate 4.14.1\n"
#: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
#: .\cookbook\templates\forms\ingredients.html:34 #: .\cookbook\templates\forms\ingredients.html:34
@ -396,8 +396,9 @@ msgstr ""
#: .\cookbook\templates\include\log_cooking.html:16 #: .\cookbook\templates\include\log_cooking.html:16
#: .\cookbook\templates\url_import.html:224 #: .\cookbook\templates\url_import.html:224
#: .\cookbook\templates\url_import.html:455 #: .\cookbook\templates\url_import.html:455
#, fuzzy
msgid "Servings" msgid "Servings"
msgstr "" msgstr "Порции"
#: .\cookbook\integration\safron.py:25 #: .\cookbook\integration\safron.py:25
msgid "Waiting time" msgid "Waiting time"
@ -468,7 +469,7 @@ msgstr ""
#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90 #: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
msgid "Books" msgid "Books"
msgstr "" msgstr "Книги"
#: .\cookbook\models.py:206 #: .\cookbook\models.py:206
msgid "Small" msgid "Small"

8
vue/src/locales/ru.json
View File

@ -343,11 +343,5 @@
"DelayFor": "Отложить на {hours} часов", "DelayFor": "Отложить на {hours} часов",
"New_Entry": "Новая запись", "New_Entry": "Новая запись",
"GroupBy": "Сгруппировать по", "GroupBy": "Сгруппировать по",
"Plural": "", "facet_count_info": "Показывать количество рецептов в фильтрах поиска."
"plural_short": "",
"Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }