Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

7 files changed, 53 insertions, 52 deletions

diff --git a/applications/luci-app-radicale2/po/cs/radicale2.po b/applications/luci-app-radicale2/po/cs/radicale2.po
index c3df979a63..5ba5e1ab3f 100644
--- a/applications/luci-app-radicale2/po/cs/radicale2.po
+++ b/applications/luci-app-radicale2/po/cs/radicale2.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: luci-app-radicale 2\n"
-"PO-Revision-Date: 2019-12-15 21:22+0000\n"
+"PO-Revision-Date: 2019-12-16 23:23+0000\n"
 "Last-Translator: Jiri Tersel <jiri.tersel@seznam.cz>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsradicale2/cs/>\n"
@@ -372,7 +372,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:52
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:102
 msgid "SSL not available"
diff --git a/applications/luci-app-radicale2/po/hu/radicale2.po b/applications/luci-app-radicale2/po/hu/radicale2.po
index de12c44cb5..62b0b00feb 100644
--- a/applications/luci-app-radicale2/po/hu/radicale2.po
+++ b/applications/luci-app-radicale2/po/hu/radicale2.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: luci-app-radicale 2\n"
-"PO-Revision-Date: 2019-12-13 23:06+0000\n"
+"PO-Revision-Date: 2019-12-28 22:27+0000\n"
 "Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsradicale2/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-radicale2/luasrc/model/cbi/radicale2/auth.lua:8
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/logging.lua:4
@@ -126,11 +126,11 @@ msgstr "Titkosítás"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:23
 msgid "Filename"
-msgstr ""
+msgstr "Fájlnév"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/storage.lua:19
 msgid "Folder"
-msgstr ""
+msgstr "Mappa"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/storage.lua:19
 msgid "Folder in which to store collections"
@@ -284,7 +284,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:66
 msgid "Private Key"
-msgstr ""
+msgstr "Személyes kulcs"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:18
 msgid "REMOTE_USER from web server"
@@ -320,7 +320,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:109
 msgid "Realm"
-msgstr ""
+msgstr "Tartomány"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/logging.lua:34
 msgid "Redact passwords in logs"
@@ -348,7 +348,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:57
 msgid "Retry Delay"
-msgstr ""
+msgstr "Újrapróbálás késleltetése"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:162
 msgid "Rights"
diff --git a/applications/luci-app-radicale2/po/mr/radicale2.po b/applications/luci-app-radicale2/po/mr/radicale2.po
index 2e3a5eb066..28d00e90a5 100644
--- a/applications/luci-app-radicale2/po/mr/radicale2.po
+++ b/applications/luci-app-radicale2/po/mr/radicale2.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: luci-app-radicale 2\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/"
 "luciapplicationsradicale2/mr/>\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-radicale2/luasrc/model/cbi/radicale2/auth.lua:8
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/logging.lua:4
@@ -142,7 +142,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:29
 msgid "General Settings"
-msgstr ""
+msgstr "सामान्य सेटिंग्ज"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:155
 msgid ""
diff --git a/applications/luci-app-radicale2/po/pl/radicale2.po b/applications/luci-app-radicale2/po/pl/radicale2.po
index 18833c231e..133bb41ada 100644
--- a/applications/luci-app-radicale2/po/pl/radicale2.po
+++ b/applications/luci-app-radicale2/po/pl/radicale2.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: luci-app-radicale 2\n"
-"PO-Revision-Date: 2019-11-17 11:05+0000\n"
-"Last-Translator: Marcin Net <marcin.net@linux.pl>\n"
+"PO-Revision-Date: 2019-12-23 14:21+0000\n"
+"Last-Translator: Mateusz Ż <zochowski.mateusz@outlook.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsradicale2/pl/>\n"
 "Language: pl\n"
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 3.10-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:8
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/logging.lua:4
@@ -46,7 +46,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:128
 msgid "CORS"
-msgstr ""
+msgstr "CORS"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:62
 msgid "Certificate"
@@ -106,7 +106,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:52
 msgid "Enable SSL connections"
-msgstr ""
+msgstr "Włącz połączenia SSL"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:136
 msgid "Encoding for responding to requests/events"
@@ -176,11 +176,11 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:128
 msgid "Header: X-Access-Control-Allow-Origin"
-msgstr ""
+msgstr "Nagłówek: X-Access-Control-Allow-Origin"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:124
 msgid "Headers"
-msgstr ""
+msgstr "Nagłówki"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/storage.lua:44
 msgid "Hook"
@@ -205,7 +205,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:102
 msgid "Install package python3-openssl to support SSL connections"
-msgstr ""
+msgstr "Zainstaluj pakiet python3-openssl, aby obsługiwać połączenia SSL"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:46
 msgid "Install python3-passlib and python3-bcrypt to enable a secure hash"
@@ -235,7 +235,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:36
 msgid "Max Connections"
-msgstr ""
+msgstr "Maksymalna liczba połączeń"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:42
 msgid "Max Content Length"
@@ -250,8 +250,9 @@ msgid "Maximum number of simultaneous connections"
 msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:42
+#, fuzzy
 msgid "Maximum size of request body (bytes)"
-msgstr ""
+msgstr "Maksymalny rozmiar treści zapytania (w bajtach)"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/storage.lua:15
 msgid "Multiple files on filesystem"
@@ -313,7 +314,7 @@ msgstr ""
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:7
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/storage.lua:6
 msgid "Radicale 2.x"
-msgstr ""
+msgstr "Radicale 2.x"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:10
 msgid "Radicale v2 Web UI"
@@ -329,7 +330,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:84
 msgid "Remove configuration for certificate, key, and CA"
-msgstr ""
+msgstr "Usuń konfigurację dla certyfikatu, klucza oraz CA"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/logging.lua:16
 msgid "Remove configuration for logging"
@@ -365,11 +366,11 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:33
 msgid "SHA1"
-msgstr ""
+msgstr "SHA1"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:34
 msgid "SSHA"
-msgstr ""
+msgstr "SSHA"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:52
 msgid "SSL"
@@ -377,7 +378,7 @@ msgstr "SSL"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:102
 msgid "SSL not available"
-msgstr ""
+msgstr "SSL niedostępny"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:74
 msgid "See python3-openssl documentation for available ciphers"
@@ -484,4 +485,4 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:37
 msgid "md5"
-msgstr ""
+msgstr "md5"
diff --git a/applications/luci-app-radicale2/po/ru/radicale2.po b/applications/luci-app-radicale2/po/ru/radicale2.po
index f62102fd64..3bdcf5ff51 100644
--- a/applications/luci-app-radicale2/po/ru/radicale2.po
+++ b/applications/luci-app-radicale2/po/ru/radicale2.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: luci-app-radicale 2\n"
-"PO-Revision-Date: 2019-10-19 18:25+0000\n"
-"Last-Translator: Anton Kikin <a.a.kikin@gmail.com>\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/"
 "luciapplicationsradicale2/ru/>\n"
 "Language: ru\n"
@@ -11,7 +11,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 3.9.1-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:8
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/logging.lua:4
@@ -30,7 +30,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:10
 msgid "Authentication"
-msgstr ""
+msgstr "Аутентификация"
 
 #: applications/luci-app-radicale2/luasrc/controller/radicale2.lua:20
 msgid "Authentication / Users"
@@ -38,7 +38,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:14
 msgid "Authentication Type"
-msgstr ""
+msgstr "Тип аутентификации"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:171
 msgid "Based on settings in 'Rights File'"
@@ -78,7 +78,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/logging.lua:26
 msgid "Debug"
-msgstr ""
+msgstr "Отладка"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:15
 msgid "Default (htpasswd file from users below)"
@@ -123,11 +123,11 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:29
 msgid "Encryption"
-msgstr ""
+msgstr "Шифрование"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:23
 msgid "Filename"
-msgstr ""
+msgstr "Имя файла"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/storage.lua:19
 msgid "Folder"
@@ -143,7 +143,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:29
 msgid "General Settings"
-msgstr ""
+msgstr "Основные настройки"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:155
 msgid ""
@@ -219,7 +219,7 @@ msgstr ""
 #: applications/luci-app-radicale2/luasrc/controller/radicale2.lua:28
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/logging.lua:6
 msgid "Logging"
-msgstr ""
+msgstr "Настройка журнала"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/logging.lua:12
 msgid "Logging File"
@@ -285,7 +285,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:66
 msgid "Private Key"
-msgstr ""
+msgstr "Приватный ключ"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:18
 msgid "REMOTE_USER from web server"
@@ -398,7 +398,7 @@ msgstr ""
 #: applications/luci-app-radicale2/luasrc/controller/radicale2.lua:16
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:18
 msgid "Server Settings"
-msgstr ""
+msgstr "Настройки сервера"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:47
 msgid "Socket timeout (seconds)"
@@ -448,7 +448,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:70
 msgid "Username"
-msgstr ""
+msgstr "Имя пользователя"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:66
 msgid "Users and Passwords"
@@ -484,4 +484,4 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:37
 msgid "md5"
-msgstr ""
+msgstr "MD5"
diff --git a/applications/luci-app-radicale2/po/sv/radicale2.po b/applications/luci-app-radicale2/po/sv/radicale2.po
index dd01afa5f6..13df0699b4 100644
--- a/applications/luci-app-radicale2/po/sv/radicale2.po
+++ b/applications/luci-app-radicale2/po/sv/radicale2.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: luci-app-radicale 2\n"
-"PO-Revision-Date: 2019-10-17 20:20+0000\n"
-"Last-Translator: Mattias Münster <mattiasmun@gmail.com>\n"
+"PO-Revision-Date: 2019-12-20 21:21+0000\n"
+"Last-Translator: smorgasbeerd <viktorwestas@outlook.com>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsradicale2/sv/>\n"
 "Language: sv\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.9.1-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:8
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/logging.lua:4
@@ -126,7 +126,7 @@ msgstr "Kryptering"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:23
 msgid "Filename"
-msgstr ""
+msgstr "Filnamn"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/storage.lua:19
 msgid "Folder"
diff --git a/applications/luci-app-radicale2/po/zh-cn/radicale2.po b/applications/luci-app-radicale2/po/zh-cn/radicale2.po
index 01706805db..ff8a1918ef 100644
--- a/applications/luci-app-radicale2/po/zh-cn/radicale2.po
+++ b/applications/luci-app-radicale2/po/zh-cn/radicale2.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: luci-app-radicale 2\n"
-"PO-Revision-Date: 2019-12-04 12:06+0000\n"
-"Last-Translator: lissom <kkjoy2617@gmail.com>\n"
+"PO-Revision-Date: 2020-01-01 02:21+0000\n"
+"Last-Translator: Zheng Qian <sotux82@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "openwrt/luciapplicationsradicale2/zh_Hans/>\n"
 "Language: zh-cn\n"
@@ -10,7 +10,7 @@ msgstr ""
 "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"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:8
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/logging.lua:4
@@ -397,7 +397,7 @@ msgstr ""
 #: applications/luci-app-radicale2/luasrc/controller/radicale2.lua:16
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:18
 msgid "Server Settings"
-msgstr ""
+msgstr "服务器设置"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/server.lua:47
 msgid "Socket timeout (seconds)"
@@ -439,7 +439,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:66
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:162
 msgid "User-based ACL Settings"
@@ -447,7 +447,7 @@ msgstr ""
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:70
 msgid "Username"
-msgstr ""
+msgstr "用户名"
 
 #: applications/luci-app-radicale2/luasrc/model/cbi/radicale2/auth.lua:66
 msgid "Users and Passwords"