Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

3 files changed, 21 insertions, 19 deletions

diff --git a/applications/luci-app-ntpc/po/fr/ntpc.po b/applications/luci-app-ntpc/po/fr/ntpc.po
index e15c6f8f3f..87e2287148 100644
--- a/applications/luci-app-ntpc/po/fr/ntpc.po
+++ b/applications/luci-app-ntpc/po/fr/ntpc.po
@@ -3,15 +3,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-04-14 13:24+0200\n"
-"PO-Revision-Date: 2012-11-06 16:08+0200\n"
-"Last-Translator: hogsim <hogsim@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2019-12-26 18:22+0000\n"
+"Last-Translator: reyur <remicaruyer@gmail.com>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsntpc/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Pootle 2.0.6\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:21
 msgid "Clock Adjustment"
@@ -52,7 +53,7 @@ msgstr "Synchronise le temps système"
 
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua:18
 msgid "Time Server"
-msgstr "Serveur temps "
+msgstr "Serveur temps"
 
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:29
 msgid "Time Servers"
diff --git a/applications/luci-app-ntpc/po/hu/ntpc.po b/applications/luci-app-ntpc/po/hu/ntpc.po
index 478f356f56..3a44eb9db0 100644
--- a/applications/luci-app-ntpc/po/hu/ntpc.po
+++ b/applications/luci-app-ntpc/po/hu/ntpc.po
@@ -5,19 +5,20 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-04-14 13:24+0200\n"
-"PO-Revision-Date: 2012-07-10 21:05+0200\n"
-"Last-Translator: Gyula <pro564@hotmail.com>\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2019-12-28 03:17+0000\n"
+"Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
+"Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsntpc/hu/>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.6\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:21
 msgid "Clock Adjustment"
-msgstr "Óra igazítás"
+msgstr "Órabeállítás"
 
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:17
 msgid "Count of time measurements"
@@ -40,7 +41,7 @@ msgstr "Gépnév"
 
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:25
 msgid "Offset frequency"
-msgstr "Frekvencia eltolás"
+msgstr "Frekvencia eltolása"
 
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:35
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua:24
@@ -50,11 +51,11 @@ msgstr "Port"
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:5
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua:6
 msgid "Synchronizes the system time"
-msgstr "A rendszeridő szinkronizálása"
+msgstr "Szinkronizálja a rendszeridőt"
 
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua:18
 msgid "Time Server"
-msgstr "Időszerver"
+msgstr "Időkiszolgáló"
 
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:29
 msgid "Time Servers"
@@ -65,7 +66,7 @@ msgstr "Időkiszolgálók"
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:5
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua:6
 msgid "Time Synchronisation"
-msgstr "Idő szinkronizálás"
+msgstr "Időszinkronizálás"
 
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:13
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua:14
diff --git a/applications/luci-app-ntpc/po/mr/ntpc.po b/applications/luci-app-ntpc/po/mr/ntpc.po
index 23529033ac..2721220762 100644
--- a/applications/luci-app-ntpc/po/mr/ntpc.po
+++ b/applications/luci-app-ntpc/po/mr/ntpc.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-04-14 13:24+0200\n"
-"PO-Revision-Date: 2019-12-15 21:22+0000\n"
+"PO-Revision-Date: 2019-12-28 03:17+0000\n"
 "Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
 "Language-Team: Marathi <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsntpc/mr/>\n"
@@ -12,7 +12,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-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:21
 msgid "Clock Adjustment"
@@ -35,7 +35,7 @@ msgstr ""
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:34
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua:23
 msgid "Hostname"
-msgstr ""
+msgstr "होस्टनाव"
 
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:25
 msgid "Offset frequency"