Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

3 files changed, 14 insertions, 12 deletions

diff --git a/applications/luci-app-rp-pppoe-server/po/hu/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/hu/rp-pppoe-server.po
index a67e051b8f..b64100deda 100644
--- a/applications/luci-app-rp-pppoe-server/po/hu/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/hu/rp-pppoe-server.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2019-12-10 23:14+0000\n"
+"PO-Revision-Date: 2019-12-23 14:21+0000\n"
 "Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsrp-pppoe-server/hu/>\n"
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.10-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
 msgid "Access Concentrator Name"
@@ -99,4 +99,4 @@ msgstr "Időkorlát"
 
 #: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
 msgid "Unit"
-msgstr ""
+msgstr "Mértékegység"
diff --git a/applications/luci-app-rp-pppoe-server/po/pt_BR/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/pt_BR/rp-pppoe-server.po
index 5d6035324a..a0c54c8a1c 100644
--- a/applications/luci-app-rp-pppoe-server/po/pt_BR/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/pt_BR/rp-pppoe-server.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2019-12-03 08:24+0000\n"
+"PO-Revision-Date: 2019-12-20 21:21+0000\n"
 "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
 "openwrt/luciapplicationsrp-pppoe-server/pt_BR/>\n"
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.10-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
 msgid "Access Concentrator Name"
@@ -51,7 +51,7 @@ msgstr "Quantidade máxima de pares por sessão"
 
 #: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
 msgid "Offset"
-msgstr "Offset"
+msgstr "Compensação"
 
 #: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
 msgid "Options file"
@@ -59,7 +59,7 @@ msgstr "Arquivo de Opções"
 
 #: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
 msgid "PPP offset"
-msgstr "PPP offset"
+msgstr "Compensação PPP"
 
 #: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
 msgid "PPP unit number"
diff --git a/applications/luci-app-rp-pppoe-server/po/ru/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/ru/rp-pppoe-server.po
index 776e0be7b4..44765d59ee 100644
--- a/applications/luci-app-rp-pppoe-server/po/ru/rp-pppoe-server.po
+++ b/applications/luci-app-rp-pppoe-server/po/ru/rp-pppoe-server.po
@@ -1,15 +1,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2019-01-09 07:01-0500\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\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/"
+"luciapplicationsrp-pppoe-server/ru/>\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=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.10\n"
 
 #: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
 msgid "Access Concentrator Name"
@@ -30,7 +32,7 @@ msgstr ""
 
 #: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
 msgid "Interface"
-msgstr ""
+msgstr "Интерфейс"
 
 #: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
 msgid "Interface on which to listen."
@@ -86,7 +88,7 @@ msgstr ""
 
 #: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
 msgid "Service Name"
-msgstr ""
+msgstr "Имя службы"
 
 #: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
 msgid "Sync"