Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

1 files changed, 12 insertions, 5 deletions

diff --git a/applications/luci-app-nft-qos/po/ru/nft-qos.po b/applications/luci-app-nft-qos/po/ru/nft-qos.po
index e829960f7e..c5f17cb79a 100644
--- a/applications/luci-app-nft-qos/po/ru/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/ru/nft-qos.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/"
+"luciapplicationsnft-qos/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-nft-qos/luasrc/view/nft-qos/rate.htm:136
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:155
@@ -12,11 +19,11 @@ msgstr ""
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:141
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:160
 msgid "Collecting data..."
-msgstr ""
+msgstr "Сбор данных..."
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:224
 msgid "Comment"
-msgstr ""
+msgstr "Комментарий"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:48
 msgid "Default Download Rate"
@@ -85,7 +92,7 @@ msgstr ""
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:121
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:158
 msgid "Hostname"
-msgstr ""
+msgstr "Имя хоста"
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:134
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:153
@@ -137,7 +144,7 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
 msgid "No information available"
-msgstr ""
+msgstr "Нет доступной информации"
 
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:137
 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:156
@@ -150,7 +157,7 @@ msgstr ""
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:199
 msgid "Protocol"
-msgstr ""
+msgstr "Протокол"
 
 #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23