Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

1 files changed, 14 insertions, 14 deletions

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"