Skip to content

Commit d43c9b0

Browse files
committed
Merge zh and zh-TW L10N.
Changelog excerpt: - Merged zh and zh-TW L10N, and dropped region designations (e.g., CN, TW) in favour of script designations (e.g., Hans, Hant).
1 parent f5a7aa2 commit d43c9b0

File tree

4 files changed

+45
-120
lines changed

4 files changed

+45
-120
lines changed

Changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,4 @@ __*Why "v3.0.0" instead of "v1.0.0?"*__ Prior to phpMussel v3, the "phpMussel Co
154154

155155
### v3.5.2
156156

157-
[2024.07.02; Maikuolan]: Refactored the `loadL10N` method.
157+
[2024.07.02; Maikuolan]: Refactored the `loadL10N` method. Merged zh and zh-TW L10N, and dropped region designations (e.g., CN, TW) in favour of script designations (e.g., Hans, Hant).

assets/config.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# License: GNU/GPLv2
88
# @see LICENSE.txt
99
#
10-
# This file: Configuration defaults file (last modified: 2024.04.30).
10+
# This file: Configuration defaults file (last modified: 2024.07.01).
1111
##/
1212

1313
core:
@@ -190,13 +190,14 @@ core:
190190
uk: "Українська"
191191
ur: "اردو"
192192
vi: "Tiếng Việt"
193-
zh-CN: "中文(简体)"
194-
zh-TW: "中文(傳統)"
193+
zh-Hans: "中文(简体)"
194+
zh-Hant: "中文(傳統)"
195195
defer:
196196
mo: "ro"
197197
nb: "no"
198-
zh-HK: "zh-TW"
199-
zh-MO: "zh-TW"
198+
zh-HK: "zh-Hant"
199+
zh-MO: "zh-Hant"
200+
zh-TW: "zh-Hant"
200201
assume:
201202
af: "af-ZA"
202203
bg: "bg-BG"
@@ -237,7 +238,7 @@ core:
237238
uk: "uk-UA"
238239
ur: "ur-PK"
239240
vi: "vi-VN"
240-
zh: "zh-CN"
241+
zh: "zh-Hans"
241242
lang_override:
242243
type: "bool"
243244
default: true

l10n/zh-TW.yml

Lines changed: 0 additions & 78 deletions
This file was deleted.

l10n/zh.yml

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# License: GNU/GPLv2
88
# @see LICENSE.txt
99
#
10-
# This file: Chinese (simplified) language data (last modified: 2023.09.25).
10+
# This file: Chinese language data (last modified: 2024.07.02).
1111
#
1212
# Regarding translations: My native language is English. Because this is a free
1313
# and open-source hobby project which generates zero income, and translatable
@@ -25,18 +25,20 @@
2525
##/
2626

2727
SafeBrowseLookup:
28-
200: "可能有害的URL检测"
29-
400: "API请求错误"
30-
401: "API授权错误"
31-
503: "API服务不可用"
32-
999: "未知API错误"
33-
error_log_header: "如果以下任何错误继续发生,为了报告他们或寻求支持,有空的时候,请在GitHub的phpMussel issues页面上创建新issue。​包括有问题的错误以及任何其他相关信息。​谢谢。"
28+
200: {"zh-Hans": "可能有害的URL检测", "zh-Hant": "可能有害的URL檢測"}
29+
400: {"zh-Hans": "API请求错误", "zh-Hant": "API請求錯誤"}
30+
401: {"zh-Hans": "API授权错误", "zh-Hant": "API授權錯誤"}
31+
503: {"zh-Hans": "API服务不可用", "zh-Hant": "API服務不可用"}
32+
999: {"zh-Hans": "未知API错误", "zh-Hant": "未知API錯誤"}
33+
error_log_header:
34+
zh-Hans: "如果以下任何错误继续发生,为了报告他们或寻求支持,有空的时候,请在GitHub的phpMussel issues页面上创建新issue。​包括有问题的错误以及任何其他相关信息。​谢谢。"
35+
zh-Hant: "如果以下任何錯誤繼續發生,為了報告他們或尋求支持,有空的時候,請在GitHub的phpMussel issues頁面上創建新issue。​包括有問題的錯誤以及任何其他相關信息。​謝謝。"
3436
field:
3537
Date: "日期"
36-
Hash signatures reconstruction: "哈希签名重建"
38+
Hash signatures reconstruction: {"zh-Hans": "哈希签名重建", "zh-Hant": "哈希簽名重建"}
3739
IP address: "IP地址"
38-
PE sectional signatures reconstruction: "PE部分签名重建"
39-
Scan results (why flagged): "扫描结果(为什么标记)"
40+
PE sectional signatures reconstruction: {"zh-Hans": "PE部分签名重建", "zh-Hant": "PE部分簽名重建"}
41+
Scan results (why flagged): {"zh-Hans": "扫描结果(为什么标记)", "zh-Hant": "掃描結果(為什麼標記)"}
4042
label:
4143
Generated by %s: "由%s生成"
4244
grammar_brackets: "%s(%s)"
@@ -46,33 +48,33 @@ grammar_spacer: ""
4648
response:
4749
%s chameleon attack detected: "%s变色龙攻击检测"
4850
%s does not exist: "%s不存在"
49-
Checking %s: "正在检查“%s”。"
50-
Command injection attempt detected: "命令注入尝试检测"
51+
Checking %s: {"zh-Hans": "正在检查“%s”。", "zh-Hant": "正在檢查『%s』。"}
52+
Command injection attempt detected: {"zh-Hans": "命令注入尝试检测", "zh-Hant": "命令注入嘗試檢測"}
5153
Complete: "完成"
52-
Data not available: "数据不可用。"
53-
Detected %s: "检测%s"
54-
Detected control characters: "检测控制字符"
55-
Detected corrupted PE: "检测损坏PE"
56-
Detected encrypted archive: "检测加密档案文件; 加密档案文件不允许"
57-
Detected potentially dangerous file tampering: "检测潜在的危险文件篡改"
58-
Error: "错误"
54+
Data not available: {"zh-Hans": "数据不可用。", "zh-Hant": "數據不可用。"}
55+
Detected %s: {"zh-Hans": "检测%s", "zh-Hant": "檢測%s"}
56+
Detected control characters: {"zh-Hans": "检测控制字符", "zh-Hant": "檢測控製字符"}
57+
Detected corrupted PE: {"zh-Hans": "检测损坏PE", "zh-Hant": "檢測損壞PE"}
58+
Detected encrypted archive: {"zh-Hans": "检测加密档案文件; 加密档案文件不允许", "zh-Hant": "檢測加密檔案文件; 加密檔案文件不允許"}
59+
Detected potentially dangerous file tampering: {"zh-Hans": "检测潜在的危险文件篡改", "zh-Hant": "檢測潛在的危險文件篡改"}
60+
Error: {"zh-Hans": "错误", "zh-Hant": "錯誤"}
5961
Failed (missing required extensions): "失败(失踪必需的扩展)!"
60-
Failed to access %s: "无法访问“%s”!"
61-
Filename manipulation detected: "文件名操控检测"
62-
Filesize limit exceeded: "文件大小超过限制"
63-
Filetype blacklisted: "文件类型列入黑名单"
62+
Failed to access %s: {"zh-Hans": "无法访问“%s”!", "zh-Hant": "無法訪問『%s』!"}
63+
Filename manipulation detected: {"zh-Hans": "文件名操控检测", "zh-Hant": "文件名操控檢測"}
64+
Filesize limit exceeded: {"zh-Hans": "文件大小超过限制", "zh-Hant": "文件大小超過限制"}
65+
Filetype blacklisted: {"zh-Hans": "文件类型列入黑名单", "zh-Hant": "文件類型列入黑名單"}
6466
Finished: "完了"
65-
Image: "图像"
66-
Invalid data: "无效数据!"
67-
Invalid file: "无效的文件!"
68-
Macros aren_t permitted: "不允许使用宏"
67+
Image: {"zh-Hans": "图像", "zh-Hant": "圖像"}
68+
Invalid data: {"zh-Hans": "无效数据!", "zh-Hant": "無效數據!"}
69+
Invalid file: {"zh-Hans": "无效的文件!", "zh-Hant": "無效的文件!"}
70+
Macros aren_t permitted: {"zh-Hans": "不允许使用宏", "zh-Hant": "不允許使用宏"}
6971
Missing filename: "文件名是失踪"
70-
No problems found: "没有任何问题发现。"
71-
Only image files are permitted: "仅允许图像文件"
72-
Quarantined as: "隔离为“%s.qfu”。"
73-
Recursion depth limit exceeded: "递归深度超过是限制"
74-
Signature file missing: "签名文件是失踪"
75-
Started: "开始"
76-
Task failed because a necessary component is unavailable: "任务失败,因为必要的组件不可用。"
72+
No problems found: {"zh-Hans": "没有任何问题发现。", "zh-Hant": "沒有任何問題發現。"}
73+
Only image files are permitted: {"zh-Hans": "仅允许图像文件", "zh-Hant": "僅允許圖像文件"}
74+
Quarantined as: {"zh-Hans": "隔离为“%s.qfu”。", "zh-Hant": "隔離為『%s.qfu』。"}
75+
Recursion depth limit exceeded: {"zh-Hans": "递归深度超过是限制", "zh-Hant": "遞歸深度超過是限制"}
76+
Signature file missing: {"zh-Hans": "签名文件是失踪", "zh-Hant": "簽名文件是失踪"}
77+
Started: {"zh-Hans": "开始", "zh-Hant": "開始"}
78+
Task failed because a necessary component is unavailable: {"zh-Hans": "任务失败,因为必要的组件不可用。", "zh-Hant": "任務失敗,因為必要的組件不可用。"}
7779
Too many URLs: "太多的URL"
78-
Too many files in the archive: "存档中太多的文件"
80+
Too many files in the archive: {"zh-Hans": "存档中太多的文件", "zh-Hant": "存檔中太多的文件"}

0 commit comments

Comments
 (0)