Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

3 files changed, 16 insertions, 15 deletions

diff --git a/applications/luci-app-opkg/po/ru/opkg.po b/applications/luci-app-opkg/po/ru/opkg.po
index 30fe4817b2..8efeb0195f 100644
--- a/applications/luci-app-opkg/po/ru/opkg.po
+++ b/applications/luci-app-opkg/po/ru/opkg.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LuCI: base\n"
 "POT-Creation-Date: 2010-05-09 01:01+0300\n"
-"PO-Revision-Date: 2019-11-15 03:04+0000\n"
-"Last-Translator: Alex Vinnick <alexv10@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/"
 "luciapplicationsopkg/ru/>\n"
 "Language: ru\n"
@@ -12,7 +12,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.10-dev\n"
+"X-Generator: Weblate 3.10\n"
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
@@ -134,7 +134,7 @@ msgstr "Загрузка информации о пакете..."
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:799
 msgid "MD5"
-msgstr ""
+msgstr "MD5"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:638
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:795
@@ -238,7 +238,7 @@ msgstr "Сбросить"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:800
 msgid "SHA256"
-msgstr ""
+msgstr "SHA256"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "Save"
diff --git a/applications/luci-app-opkg/po/sv/opkg.po b/applications/luci-app-opkg/po/sv/opkg.po
index a69a4ca47d..d51b03c346 100644
--- a/applications/luci-app-opkg/po/sv/opkg.po
+++ b/applications/luci-app-opkg/po/sv/opkg.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2019-11-19 16:05+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/"
 "luciapplicationsopkg/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.10-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:112
 msgid "Actions"
@@ -65,7 +65,7 @@ msgstr ""
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:786
 msgid "Dismiss"
-msgstr ""
+msgstr "Avfärda"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:237
 msgid "Displaying %d-%d of %d"
diff --git a/applications/luci-app-opkg/po/zh-tw/opkg.po b/applications/luci-app-opkg/po/zh-tw/opkg.po
index 9d6ef86411..50ad801a04 100644
--- a/applications/luci-app-opkg/po/zh-tw/opkg.po
+++ b/applications/luci-app-opkg/po/zh-tw/opkg.po
@@ -1,15 +1,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-05-21 10:34+0200\n"
-"Last-Translator: omnistack <omnistack@gmail.com>\n"
-"Language-Team: none\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/luciapplicationsopkg/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: Pootle 2.0.6\n"
+"X-Generator: Weblate 3.10-dev\n"
 
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:112
 msgid "Actions"
@@ -56,7 +57,7 @@ msgstr ""
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:713
 #: applications/luci-app-opkg/luasrc/view/opkg.htm:140
 msgid "Description"
-msgstr "描述"
+msgstr "說明"
 
 #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:583
 msgid "Details for package <em>%h</em>"