openwrt/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2026-04-15 10:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: Fix conflicts with remote 'weblate/master'

Browse Source 
Merge a few changes and fix conflicts.
(stupid conflicts with .po metadata: last edit time & editor name)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman
2026-02-28 19:57:55 +02:00
parent 258a301f33 a14b1869cd
commit f7b1b71e64
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/luci-app-adblock/po/zh_Hans/adblock.po
View File

@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2026-02-25 10:58+0000\n"
"Last-Translator: nKsyn <e.nksyn@gmail.com>\n"
"PO-Revision-Date: 2026-02-28 15:41+0000\n"
"Last-Translator: kae <handicapped8@dollicons.com>\n"
"Language-Team: Chinese (Simplified Han script) <https://hosted.weblate.org/"
"projects/openwrt/luciapplicationsadblock/zh_Hans/>\n"
"Language: zh_Hans\n"
@@ -135,7 +135,7 @@ msgstr "高级设置 - 报告"
msgid ""
"Allowlist modifications have been saved, reload adblock that changes take "
"effect."
msgstr "白名单修改已保存，重新加载 adblock 模块让更改生效。"
msgstr "允许列表修改已保存，重新加载 adblock 模块让更改生效。"
#: applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js:341
msgid "Allowlist..."

11
modules/luci-base/po/zh_Hans/base.po
View File

@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"PO-Revision-Date: 2026-02-27 10:18+0000\n"
"Last-Translator: nKsyn <e.nksyn@gmail.com>\n"
"PO-Revision-Date: 2026-02-28 15:41+0000\n"
"Last-Translator: kae <handicapped8@dollicons.com>\n"
"Language-Team: Chinese (Simplified Han script) <https://hosted.weblate.org/"
"projects/openwrt/luci/zh_Hans/>\n"
"Language: zh_Hans\n"
@@ -77,7 +77,7 @@ msgstr ""
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:35
msgid "%s is untagged in multiple VLANs!"
msgstr "%s 有多个 VLAN 未打标签!"
msgstr "%s 在多个 VLAN 中都没有标签！"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:596
msgid "%s means \"the address of the system running dnsmasq\"."
@@ -88,9 +88,8 @@ msgid ""
"%s services running on this device in the default VRF context (ie., not "
"bound to any VRF device) shall work across all VRF domains."
msgstr ""
"开启时，此设备上在默认 VRF 上下文（即未绑定到任何 VRF 设备）中运行的 %s 服"
"务，<abbr title=\"可接受来自所有 VRF 的连接请求\">能在所有 VRF 域中使用</"
"abbr>。"
"在默认VRF环境下运行于该设备上的%s服务（即不绑定在任何VRF设备）应在所有VRF域间"
"工作。"
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js:698
msgid "%s uses a human-readable encoding of hex-and-colons"

9
modules/luci-mod-dsl/po/zh_Hans/dsl.po
View File

@@ -1,15 +1,14 @@
msgid ""
msgstr ""
"PO-Revision-Date: 2026-02-04 12:42+0000\n"
"Last-Translator: 大王叫我来巡山 "
"<hamburger2048@users.noreply.hosted.weblate.org>\n"
"PO-Revision-Date: 2026-02-28 15:41+0000\n"
"Last-Translator: kae <handicapped8@dollicons.com>\n"
"Language-Team: Chinese (Simplified Han script) <https://hosted.weblate.org/"
"projects/openwrt/luci_modules_luci-mod-dsl/zh_Hans/>\n"
"Language: zh_Hans\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 5.16-dev\n"
"X-Generator: Weblate 5.16.1-dev\n"
#: modules/luci-mod-dsl/htdocs/luci-static/resources/view/status/dsl/stats.js:157
msgid "ATM Header Error Control Errors (HEC-P)"
@@ -29,7 +28,7 @@ msgstr "Annex"
#: modules/luci-mod-dsl/htdocs/luci-static/resources/view/status/dsl/stats.js:112
msgid "Attainable Data Rate (ATTNDR)"
msgstr "理论码率 （ATTNDR）"
msgstr "可实现数据速率（ATTNDR）"
#: modules/luci-mod-dsl/htdocs/luci-static/resources/view/status/dsl/stats.js:118
msgid "Bitswap"