Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

1 files changed, 11 insertions, 11 deletions

diff --git a/applications/luci-app-ddns/po/ru/ddns.po b/applications/luci-app-ddns/po/ru/ddns.po
index fb782a2ca8..136948c705 100644
--- a/applications/luci-app-ddns/po/ru/ddns.po
+++ b/applications/luci-app-ddns/po/ru/ddns.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LuCI: ddns\n"
 "POT-Creation-Date: 2017-10-17 21:00+0300\n"
-"PO-Revision-Date: 2019-10-29 18:37+0000\n"
-"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
+"PO-Revision-Date: 2019-12-26 18:22+0000\n"
+"Last-Translator: Alex Ky <esthomolupus@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsddns/ru/>\n"
 "Language: ru\n"
@@ -12,7 +12,7 @@ msgstr ""
 "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"
-"X-Generator: Weblate 3.9.1\n"
+"X-Generator: Weblate 3.10\n"
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
@@ -59,7 +59,7 @@ msgstr ""
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:329
 msgid "Cancel"
-msgstr ""
+msgstr "Отменить"
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:794
 msgid "Check Interval"
@@ -190,7 +190,7 @@ msgstr ""
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:351
 msgid "Edit"
-msgstr ""
+msgstr "Изменить"
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:583
 msgid "Enable secure communication with DDNS provider"
@@ -344,7 +344,7 @@ msgstr "Информация"
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:150
 msgid "Information"
-msgstr ""
+msgstr "Информация"
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:286
 msgid "Install 'ca-certificates' package or needed certificates"
@@ -405,7 +405,7 @@ msgstr "Поиск имени хоста"
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:311
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:388
 msgid "Name"
-msgstr ""
+msgstr "Имя"
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:224
 msgid ""
@@ -600,7 +600,7 @@ msgstr "Скрипт"
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:291
 msgid "Services"
-msgstr ""
+msgstr "Службы"
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:65
 msgid "Start DDNS"
@@ -612,7 +612,7 @@ msgstr ""
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:430
 msgid "Status"
-msgstr ""
+msgstr "Состояние"
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:951
 msgid "Status directory"
@@ -620,7 +620,7 @@ msgstr "Папка состояния"
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:378
 msgid "Stop"
-msgstr ""
+msgstr "Остановить"
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:65
 msgid "Stop DDNS"
@@ -678,7 +678,7 @@ msgstr "URL для обнаружения"
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:415
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/status/include/70_ddns.js:37
 msgid "Unknown"
-msgstr ""
+msgstr "Неизвестно"
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:526
 msgid "Update URL to be used for updating your DDNS Provider."