treewide: fix conflicts with weblate

Merge remote-tracking branch 'weblate/master' after fixing
modules/luci-base/po/ja/base.po

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

2 files changed, 12 insertions, 14 deletions

diff --git a/applications/luci-app-privoxy/po/ru/privoxy.po b/applications/luci-app-privoxy/po/ru/privoxy.po
index 31820ce7f9..faa7e7053d 100644
--- a/applications/luci-app-privoxy/po/ru/privoxy.po
+++ b/applications/luci-app-privoxy/po/ru/privoxy.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LuCI: privoxy\n"
 "POT-Creation-Date: 2017-12-14 16:00+0300\n"
-"PO-Revision-Date: 2020-07-24 09:24+0000\n"
-"Last-Translator: Anton Kikin <a.a.kikin@gmail.com>\n"
+"PO-Revision-Date: 2020-11-22 15:35+0000\n"
+"Last-Translator: Max Smolik <makcum15@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsprivoxy/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 4.2-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
@@ -359,7 +359,7 @@ msgid ""
 "configuration, help and logging. This section of the configuration file "
 "tells Privoxy where to find those other files."
 msgstr ""
-"Страница настройки расположения вспомогательных файлов Privoxy. Privoxy - "
+"Страница настройки расположения вспомогательных файлов Privoxy. Privoxy "
 "использует ряд других файлов для дополнительной настройки, оказания помощи и "
 "ведения системного журнала."
 
diff --git a/applications/luci-app-privoxy/po/zh_Hans/privoxy.po b/applications/luci-app-privoxy/po/zh_Hans/privoxy.po
index 47f5557604..98c4a693ce 100644
--- a/applications/luci-app-privoxy/po/zh_Hans/privoxy.po
+++ b/applications/luci-app-privoxy/po/zh_Hans/privoxy.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: luci-app-privoxy\n"
 "POT-Creation-Date: 2015-06-10 20:16+0100\n"
-"PO-Revision-Date: 2020-02-19 13:29+0000\n"
-"Last-Translator: xiazhang <xz@xia.plus>\n"
+"PO-Revision-Date: 2020-11-22 15:35+0000\n"
+"Last-Translator: Eric <spice2wolf@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "openwrt/luciapplicationsprivoxy/zh_Hans/>\n"
 "Language: zh_Hans\n"
@@ -14,7 +14,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.11\n"
+"X-Generator: Weblate 4.4-dev\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
 #: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:236
@@ -114,7 +114,7 @@ msgstr "记录信息"
 
 #: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:154
 msgid "During delay ifup-events are not monitored !"
-msgstr "在延迟期间无法检测到 ifup 事件！"
+msgstr "在延迟期间无法监测 ifup 事件！"
 
 #: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:599
 msgid "Enable proxy authentication forwarding"
@@ -364,7 +364,7 @@ msgstr "显示请求头 解析"
 
 #: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:76
 msgid "Software package '%s' is not installed."
-msgstr "软件包“%s”未安装。"
+msgstr "软件包 '%s' 未安装。"
 
 #: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:85
 msgid "Software package '%s' is outdated."
@@ -412,7 +412,7 @@ msgstr "系统"
 msgid ""
 "The actions file(s) to use. Multiple actionsfile lines are permitted, and "
 "are in fact recommended!"
-msgstr "所使用的规则文件。允许并且推荐使用多个规则文件。"
+msgstr "要使用的规则文件。允许并且推荐使用多个规则文件！"
 
 #: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:453
 msgid ""
@@ -457,9 +457,7 @@ msgstr "转发数据前，客户端请求头的排序。"
 msgid ""
 "The status code Privoxy returns for pages blocked with +handle-as-empty-"
 "document."
-msgstr ""
-"当页面因为 handle-as-empty-document 规则被阻止时返回的状态码（选上为 200 OK，"
-"不选上为 403 Forbidden）"
+msgstr "Privoxy 对于被+handle-as-empty-document 拦截的页面返回的状态码。"
 
 #: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:413
 msgid ""
@@ -513,7 +511,7 @@ msgstr "用户自定义"
 #: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:739
 #: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:772
 msgid "Value is not a number"
-msgstr "输入值不是数字"
+msgstr "输入值不是一个数字"
 
 #: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:168
 msgid "Value not between 0 and 300"