Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

4 files changed, 44 insertions, 28 deletions

diff --git a/applications/luci-app-samba/po/hu/samba.po b/applications/luci-app-samba/po/hu/samba.po
index 9b0dbe1c33..562e835a10 100644
--- a/applications/luci-app-samba/po/hu/samba.po
+++ b/applications/luci-app-samba/po/hu/samba.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2019-11-29 19:44+0000\n"
+"PO-Revision-Date: 2019-12-16 23:24+0000\n"
 "Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationssamba/hu/>\n"
@@ -14,7 +14,7 @@ msgstr ""
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:64
 msgid "Allow guests"
-msgstr "Vendég hozzáférés"
+msgstr "Vendégek engedélyezése"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:17
 msgid "Allow system users to reach their home directories via network shares"
@@ -40,7 +40,7 @@ msgstr "Leírás"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:74
 msgid "Directory mask"
-msgstr "Könyvtár maszk"
+msgstr "Könyvtármaszk"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:11
 msgid "Edit Template"
@@ -86,6 +86,8 @@ msgid ""
 "Please add directories to share. Each directory refers to a folder on a "
 "mounted device."
 msgstr ""
+"Adja hozzá a megosztandó könyvtárakat. Minden egyes könyvtár egy csatolt "
+"eszközön lévő mappára hivatkozik."
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:53
 msgid "Read-only"
diff --git a/applications/luci-app-samba/po/mr/samba.po b/applications/luci-app-samba/po/mr/samba.po
index 715192e226..5c4a0345be 100644
--- a/applications/luci-app-samba/po/mr/samba.po
+++ b/applications/luci-app-samba/po/mr/samba.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-03-22 15:23+0100\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/"
 "luciapplicationssamba/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-samba/luasrc/model/cbi/samba.lua:64
 msgid "Allow guests"
@@ -21,6 +21,8 @@ msgstr "अतिथींना परवानगी द्या"
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:17
 msgid "Allow system users to reach their home directories via network shares"
 msgstr ""
+"सिस्टीम वापरकर्त्यांना नेटवर्क शेअर्सद्वारे त्यांच्या होम डिरेक्टरीजमध्ये "
+"पोहोचण्याची परवानगी द्या"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:51
 msgid "Allowed users"
@@ -28,7 +30,7 @@ msgstr "अनुमत वापरकर्ते"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:58
 msgid "Browseable"
-msgstr ""
+msgstr "ब्राउझ करण्यायोग्य"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:69
 msgid "Create mask"
@@ -40,62 +42,65 @@ msgstr "वर्णन"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:74
 msgid "Directory mask"
-msgstr ""
+msgstr "निर्देशिका मास्क"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:11
 msgid "Edit Template"
-msgstr ""
+msgstr "टेम्पलेट संपादित करा"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:22
 msgid "Edit the template that is used for generating the samba configuration."
 msgstr ""
+"सांबा कॉन्फिगरेशन व्युत्पन्न करण्यासाठी वापरला जाणारा टेम्पलेट संपादित करा."
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:10
 msgid "General Settings"
-msgstr ""
+msgstr "सामान्य सेटिंग्ज"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:13
 msgid "Hostname"
-msgstr ""
+msgstr "होस्टनाव"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:75
 msgid "Mask for new directories"
-msgstr ""
+msgstr "नवीन निर्देशिका साठी झाकण"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:70
 msgid "Mask for new files"
-msgstr ""
+msgstr "नवीन फायली झाका"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:45
 msgid "Name"
-msgstr ""
+msgstr "नाव"
 
 #: applications/luci-app-samba/luasrc/controller/samba.lua:14
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:5
 msgid "Network Shares"
-msgstr ""
+msgstr "नेटवर्क शेअर्स"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:46
 msgid "Path"
-msgstr ""
+msgstr "पथ"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:40
 msgid ""
 "Please add directories to share. Each directory refers to a folder on a "
 "mounted device."
 msgstr ""
+"कृपया सामायिक करण्यासाठी निर्देशिका जोडा. प्रत्येक निर्देशिका माउंट केलेल्या "
+"डिव्हाइसवरील फोल्डरचा संदर्भ देते."
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:53
 msgid "Read-only"
-msgstr ""
+msgstr "केवळ-वाचनीय"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:16
 msgid "Share home-directories"
-msgstr ""
+msgstr "होम-डिरेक्टरीज सामायिक करा"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:39
 msgid "Shared Directories"
-msgstr ""
+msgstr "सामायिक निर्देशिका"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:23
 msgid ""
@@ -104,7 +109,10 @@ msgid ""
 "('|') should not be changed. They get their values from the 'General "
 "Settings' tab."
 msgstr ""
+"ही '/etc/samba/smb.conf.template' फाईलची सामग्री आहे जिथून तुमची सांबा "
+"कॉन्फिगरेशन व्युत्पन्न केली जाईल. पाईप चिन्हाद्वारे बंद केलेली मूल्ये ('|') "
+"बदलू नयेत. त्यांना त्यांची मूल्ये 'सामान्य सेटिंग्ज' टॅबमधून मिळतात."
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:15
 msgid "Workgroup"
-msgstr ""
+msgstr "कार्यसमूह"
diff --git a/applications/luci-app-samba/po/ms/samba.po b/applications/luci-app-samba/po/ms/samba.po
index 22959a1f4d..248f7bef2c 100644
--- a/applications/luci-app-samba/po/ms/samba.po
+++ b/applications/luci-app-samba/po/ms/samba.po
@@ -1,11 +1,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2019-12-18 04:21+0000\n"
+"Last-Translator: Pusak Hitam <thegame.gamesky@gmail.com>\n"
+"Language-Team: Malay <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationssamba/ms/>\n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 3.10-dev\n"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:64
 msgid "Allow guests"
@@ -29,7 +34,7 @@ msgstr ""
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:14
 msgid "Description"
-msgstr ""
+msgstr "Keterangan"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:74
 msgid "Directory mask"
diff --git a/applications/luci-app-samba/po/zh-tw/samba.po b/applications/luci-app-samba/po/zh-tw/samba.po
index fa644b705f..9491b2d537 100644
--- a/applications/luci-app-samba/po/zh-tw/samba.po
+++ b/applications/luci-app-samba/po/zh-tw/samba.po
@@ -6,15 +6,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: 2017-10-29 15:36+0800\n"
-"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
-"Language-Team:  <debian-l10n-chinese@lists.debian.org>\n"
-"Language: zh_TW\n"
+"PO-Revision-Date: 2019-12-19 19:39+0000\n"
+"Last-Translator: 孤爺仔 <7312140@qq.com>\n"
+"Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
+"openwrt/luciapplicationssamba/zh_Hant/>\n"
+"Language: zh-tw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Weblate 3.10-dev\n"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:64
 msgid "Allow guests"
@@ -38,7 +39,7 @@ msgstr "建立權限掩碼"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:14
 msgid "Description"
-msgstr "描述"
+msgstr "說明"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:74
 msgid "Directory mask"