treewide: fix conflicts with weblate

Merge remote-tracking branch 'weblate/master' after fixing
modules/luci-base/po/ja/base.po

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

2 files changed, 13 insertions, 10 deletions

diff --git a/applications/luci-app-acme/po/ru/acme.po b/applications/luci-app-acme/po/ru/acme.po
index adbd7228fb..e29d34fa46 100644
--- a/applications/luci-app-acme/po/ru/acme.po
+++ b/applications/luci-app-acme/po/ru/acme.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2020-10-27 10:09+0000\n"
-"Last-Translator: sergio <sergio+it@outerface.net>\n"
+"PO-Revision-Date: 2020-11-22 15:35+0000\n"
+"Last-Translator: Max Smolik <makcum15@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsacme/ru/>\n"
 "Language: ru\n"
@@ -9,7 +9,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 4.3.2-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
@@ -33,7 +33,7 @@ msgstr "Адрес электронной почты"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:48
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Дополнительные настройки"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
@@ -57,7 +57,7 @@ msgstr ""
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:97
 msgid "DNS"
-msgstr ""
+msgstr "DNS"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid "DNS API"
@@ -85,6 +85,9 @@ msgid ""
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
+"Доменные имена для включения в сертификат. Первое имя как имя субьекта ("
+"subject name), последующие имена как дополнительные (alt names). Все "
+"доменные имена должны указывать на маршрутизатор в глобальной DNS."
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:63
 msgid "ECC 256 bits"
@@ -108,7 +111,7 @@ msgstr "Включено"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "General Settings"
-msgstr ""
+msgstr "Основные настройки"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid ""
diff --git a/applications/luci-app-acme/po/sv/acme.po b/applications/luci-app-acme/po/sv/acme.po
index 570f1ac007..411d532376 100644
--- a/applications/luci-app-acme/po/sv/acme.po
+++ b/applications/luci-app-acme/po/sv/acme.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2020-09-23 14:41+0000\n"
-"Last-Translator: Kristoffer Grundström <dsmusicever@gmail.com>\n"
+"PO-Revision-Date: 2020-11-22 15:35+0000\n"
+"Last-Translator: PontusÖsterlindh <pontus@osterlindh.com>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsacme/sv/>\n"
 "Language: sv\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
 
 #: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
-msgstr ""
+msgstr "ACME-certifikat"
 
 #: applications/luci-app-acme/root/usr/share/luci/menu.d/luci-app-acme.json:3
 msgid "ACME certs"