Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

5 files changed, 57 insertions, 27 deletions

diff --git a/applications/luci-app-cifsd/po/hu/cifsd.po b/applications/luci-app-cifsd/po/hu/cifsd.po
index 723746acef..e8c92a372e 100644
--- a/applications/luci-app-cifsd/po/hu/cifsd.po
+++ b/applications/luci-app-cifsd/po/hu/cifsd.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-11-29 19:46+0000\n"
+"PO-Revision-Date: 2019-12-16 23:26+0000\n"
 "Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationscifsd/hu/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:78
 msgid "Allow guests"
-msgstr ""
+msgstr "Vendégek engedélyezése"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:75
 msgid "Allowed users"
@@ -20,11 +20,11 @@ msgstr "Engedélyezett felhasználók"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:62
 msgid "Browse-able"
-msgstr ""
+msgstr "Tallózható"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:94
 msgid "Create mask"
-msgstr ""
+msgstr "Létrehozási maszk"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:35
 msgid "Description"
@@ -32,7 +32,7 @@ msgstr "Leírás"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:100
 msgid "Directory mask"
-msgstr ""
+msgstr "Könyvtármaszk"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:27
 msgid "Edit Template"
@@ -41,10 +41,12 @@ msgstr "Sablon szerkesztése"
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:39
 msgid "Edit the template that is used for generating the cifsd configuration."
 msgstr ""
+"A sablon szerkesztése, amely a cifsd beállítások előállításához lesz "
+"használva."
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:73
 msgid "Force Root"
-msgstr ""
+msgstr "Rendszergazda kényszerítése"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:26
 msgid "General Settings"
@@ -52,11 +54,11 @@ msgstr "Általános beállítások"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:89
 msgid "Hide dot files"
-msgstr ""
+msgstr "Rejtett fájlok elrejtése"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:84
 msgid "Inherit owner"
-msgstr ""
+msgstr "Tulajdonos öröklése"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:29
 msgid "Interface"
@@ -65,6 +67,7 @@ msgstr "Csatoló"
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:30
 msgid "Listen only on the given interface or, if unspecified, on lan"
 msgstr ""
+"Figyelés csak a megadott csatolón, vagy a helyi hálózaton, ha nincs megadva"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:56
 msgid "Name"
@@ -84,6 +87,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-cifsd/htdocs/luci-static/resources/view/cifsd.js:67
 msgid "Read-only"
@@ -91,7 +96,7 @@ msgstr "Csak olvasható"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:51
 msgid "Shared Directories"
-msgstr ""
+msgstr "Megosztott könyvtárak"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:40
 msgid ""
@@ -100,6 +105,10 @@ msgid ""
 "('|') should not be changed. They get their values from the 'General "
 "Settings' tab."
 msgstr ""
+"Ez az „/etc/cifs/smb.conf.template” fájl tartalma, amelyből a cifsd "
+"beállítások előállításra kerülnek. A csőszimbólumok („|”) között lévő "
+"értékeket nem szabad megváltoztatni. Azok az „Általános beállítások” lapról "
+"kapják az értékeiket."
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:32
 msgid "Workgroup"
diff --git a/applications/luci-app-cifsd/po/mr/cifsd.po b/applications/luci-app-cifsd/po/mr/cifsd.po
index 549bd54886..67a224f5b1 100644
--- a/applications/luci-app-cifsd/po/mr/cifsd.po
+++ b/applications/luci-app-cifsd/po/mr/cifsd.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-15 21:23+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/"
 "luciapplicationscifsd/mr/>\n"
@@ -8,7 +8,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-cifsd/htdocs/luci-static/resources/view/cifsd.js:78
 msgid "Allow guests"
@@ -32,11 +32,11 @@ msgstr "वर्णन"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:100
 msgid "Directory mask"
-msgstr ""
+msgstr "निर्देशिका मास्क"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:27
 msgid "Edit Template"
-msgstr ""
+msgstr "टेम्पलेट संपादित करा"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:39
 msgid "Edit the template that is used for generating the cifsd configuration."
@@ -48,7 +48,7 @@ msgstr ""
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:26
 msgid "General Settings"
-msgstr ""
+msgstr "सामान्य सेटिंग्ज"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:89
 msgid "Hide dot files"
@@ -68,30 +68,32 @@ msgstr ""
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:56
 msgid "Name"
-msgstr ""
+msgstr "नाव"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:18
 #: applications/luci-app-cifsd/luasrc/controller/cifsd.lua:10
 msgid "Network Shares"
-msgstr ""
+msgstr "नेटवर्क शेअर्स"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:57
 msgid "Path"
-msgstr ""
+msgstr "पथ"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:52
 msgid ""
 "Please add directories to share. Each directory refers to a folder on a "
 "mounted device."
 msgstr ""
+"कृपया सामायिक करण्यासाठी निर्देशिका जोडा. प्रत्येक निर्देशिका माउंट केलेल्या "
+"डिव्हाइसवरील फोल्डरचा संदर्भ देते."
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:67
 msgid "Read-only"
-msgstr ""
+msgstr "केवळ-वाचनीय"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:51
 msgid "Shared Directories"
-msgstr ""
+msgstr "सामायिक निर्देशिका"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:40
 msgid ""
@@ -103,4 +105,4 @@ msgstr ""
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:32
 msgid "Workgroup"
-msgstr ""
+msgstr "कार्यसमूह"
diff --git a/applications/luci-app-cifsd/po/ms/cifsd.po b/applications/luci-app-cifsd/po/ms/cifsd.po
index a02933473a..6e667c83aa 100644
--- a/applications/luci-app-cifsd/po/ms/cifsd.po
+++ b/applications/luci-app-cifsd/po/ms/cifsd.po
@@ -1,8 +1,14 @@
 msgid ""
 msgstr ""
+"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/"
+"luciapplicationscifsd/ms/>\n"
 "Language: ms\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-cifsd/htdocs/luci-static/resources/view/cifsd.js:78
 msgid "Allow guests"
@@ -22,7 +28,7 @@ msgstr ""
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:35
 msgid "Description"
-msgstr ""
+msgstr "Keterangan"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:100
 msgid "Directory mask"
diff --git a/applications/luci-app-cifsd/po/ru/cifsd.po b/applications/luci-app-cifsd/po/ru/cifsd.po
index 208b74cf3c..b3bac30cc6 100644
--- a/applications/luci-app-cifsd/po/ru/cifsd.po
+++ b/applications/luci-app-cifsd/po/ru/cifsd.po
@@ -1,8 +1,15 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-26 18:23+0000\n"
+"Last-Translator: Alex Ky <esthomolupus@gmail.com>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationscifsd/ru/>\n"
 "Language: ru\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-cifsd/htdocs/luci-static/resources/view/cifsd.js:78
 msgid "Allow guests"
@@ -22,7 +29,7 @@ msgstr ""
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:35
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:100
 msgid "Directory mask"
@@ -42,7 +49,7 @@ msgstr ""
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:26
 msgid "General Settings"
-msgstr ""
+msgstr "Основные настройки"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:89
 msgid "Hide dot files"
@@ -54,7 +61,7 @@ msgstr ""
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:29
 msgid "Interface"
-msgstr ""
+msgstr "Интерфейс"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:30
 msgid "Listen only on the given interface or, if unspecified, on lan"
@@ -62,7 +69,7 @@ msgstr ""
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:56
 msgid "Name"
-msgstr ""
+msgstr "Имя"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:18
 #: applications/luci-app-cifsd/luasrc/controller/cifsd.lua:10
diff --git a/applications/luci-app-cifsd/po/zh-tw/cifsd.po b/applications/luci-app-cifsd/po/zh-tw/cifsd.po
index 26caa0042d..27988e81d4 100644
--- a/applications/luci-app-cifsd/po/zh-tw/cifsd.po
+++ b/applications/luci-app-cifsd/po/zh-tw/cifsd.po
@@ -1,8 +1,14 @@
 msgid ""
 msgstr ""
-"Language: zh_Hant\n"
+"PO-Revision-Date: 2019-12-19 19:40+0000\n"
+"Last-Translator: 孤爺仔 <7312140@qq.com>\n"
+"Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
+"openwrt/luciapplicationscifsd/zh_Hant/>\n"
+"Language: zh-tw\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-cifsd/htdocs/luci-static/resources/view/cifsd.js:78
 msgid "Allow guests"
@@ -22,7 +28,7 @@ msgstr ""
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:35
 msgid "Description"
-msgstr ""
+msgstr "說明"
 
 #: applications/luci-app-cifsd/htdocs/luci-static/resources/view/cifsd.js:100
 msgid "Directory mask"