Skip to content

Commit 19fff89

Browse files
SysAdminDocSysAdminDoc
committed
fix(i18n): drop the zh plurals #42 repeated and its English-only entries
The squash of #42 broke master's build: its strings.xml repeated the 27 plurals values-zh-rCN/plurals.xml already ships, and mergeDebugResources refuses duplicate resources. The shipped plurals.xml copies stay, the 21 new plurals stay in strings.xml. It also translated the GitHub report form's title, type and seen count, which are translatable="false": Chinese phones would have filed "[垃圾] ..." issues the [SPAM] intake never sees. zh-rCN is now 1,786 of 1,788 strings. The floor goes from 81.3 to 98.5, not the 99.9 --update-floors records, so the next couple of dozen English strings can land before a native reviewer catches them up, the same room the old floor left. Refs #7
1 parent 6f96a19 commit 19fff89

4 files changed

Lines changed: 3 additions & 117 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ All notable changes to CallShield will be documented in this file.
4242
- The Chinese translation's regex example in the wildcard dialog showed with its backslashes missing.
4343
- Setup now spots a copy installed by an app store or installer that doesn't let Android allow SMS and call logs. Android never asks about those on such a copy, and their switches in App info flip back to Deny with no reason given. Once you've tried them, setup names the installer and offers Get the APK, which opens the latest release so you can install it over your copy from the Files app. Your settings stay. The README's troubleshooting section now covers this block next to restricted settings.
4444
- Database v57 adds the FCC complaints published through 2026-10-29 and FTC's through 2026-10-28, for 51,379 numbers, and refreshes the 652 French telemarketing ranges. The community watch list now carries 7 numbers that several people reported.
45+
- The Simplified Chinese translation now covers nearly every screen, with 311 more strings and every plural, from aixtin (#42). Only the two newest strings still show in English.
4546

4647
## v1.12.0 (2026-10-09)
4748

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ Run tests, lint, release metadata checks, and artifact builds locally before pub
611611

612612
## Translations
613613

614-
CallShield ships in English and Simplified Chinese, which covers about four in five strings.
614+
CallShield ships in English and Simplified Chinese. The Chinese text covers nearly every string, and the newest few fall back to English.
615615
More translations are welcome. See
616616
[docs/TRANSLATING.md](docs/TRANSLATING.md) for the resource layout, the priority
617617
order for partial translations, and `scripts/check_translations.py`, which

‎app/src/main/res/values-zh-rCN/strings.xml‎

Lines changed: 0 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1673,9 +1673,6 @@
16731673
<string name="detail_phone_number">电话号码</string>
16741674
<string name="detail_report_blocked">已在本机拦截。%1$s</string>
16751675
<string name="detail_report_carrier">向运营商举报（7726）</string>
1676-
<string name="detail_report_issue_title">[垃圾] %s</string>
1677-
<string name="detail_report_issue_type">来自 CallShield 的举报</string>
1678-
<string name="detail_report_issue_unseen">已在 CallShield 中查询。此号码的通话和消息尚未出现在应用日志中。</string>
16791676
<string name="detail_undo">撤销</string>
16801677
<string name="emergency_number_block_refused">紧急号码和公共安全号码无法拦截。</string>
16811678
<string name="export_log_empty">暂无导出内容。尚未拦截任何来电，也未标记任何消息。</string>
@@ -1830,78 +1827,14 @@
18301827
<string name="stats_reason_hidden_number">隐藏号码</string>
18311828
<string name="stats_reason_otp_floor">验证安全兜底</string>
18321829
<string name="stats_reason_pipeline_diagnostic">防护诊断</string>
1833-
<plurals name="backup_restore_preview_conflicts">
1834-
<item quantity="one">本机有 %1$d 个项目与备份匹配。合并时，号码保留本机的允许或拦截状态，匹配的规则或设置采用备份版本。</item>
1835-
<item quantity="other">本机有 %1$d 个项目与备份匹配。合并时，号码保留本机的允许或拦截状态，匹配的规则和设置采用备份版本。</item>
1836-
</plurals>
18371830
<plurals name="blocklist_count_active_rules">
18381831
<item quantity="one">%1$,d 条生效规则</item>
18391832
<item quantity="other">%1$,d 条生效规则</item>
18401833
</plurals>
1841-
<plurals name="blocklist_count_saved">
1842-
<item quantity="one">%1$,d 个条目</item>
1843-
<item quantity="other">%1$,d 个条目</item>
1844-
</plurals>
1845-
<plurals name="blocklist_imported_numbers">
1846-
<item quantity="one">已导入 %d 个号码</item>
1847-
<item quantity="other">已导入 %d 个号码</item>
1848-
</plurals>
1849-
<plurals name="blocklist_reports">
1850-
<item quantity="one">举报：%d</item>
1851-
<item quantity="other">举报：%d</item>
1852-
</plurals>
18531834
<plurals name="contribute_rate_limited">
18541835
<item quantity="one">举报过于频繁。请等待 %1$d 秒后重试。</item>
18551836
<item quantity="other">举报过于频繁。请等待 %1$d 秒后重试。</item>
18561837
</plurals>
1857-
<plurals name="dashboard_action_sync_subtitle_ready">
1858-
<item quantity="one">使用最新举报刷新 %1$s 条本地垃圾记录。</item>
1859-
<item quantity="other">使用最新举报刷新 %1$s 条本地垃圾记录。</item>
1860-
</plurals>
1861-
<plurals name="dashboard_database_ready_detail">
1862-
<item quantity="one">已加载垃圾号码：%1$s</item>
1863-
<item quantity="other">已加载垃圾号码：%1$s</item>
1864-
</plurals>
1865-
<plurals name="dashboard_scan_more">
1866-
<item quantity="one">更多匹配：+%1$s</item>
1867-
<item quantity="other">更多匹配：+%1$s</item>
1868-
</plurals>
1869-
<plurals name="dashboard_scan_spam_found">
1870-
<item quantity="one">发现 %1$s 条垃圾匹配</item>
1871-
<item quantity="other">发现 %1$s 条垃圾匹配</item>
1872-
</plurals>
1873-
<plurals name="dashboard_scan_unique_numbers_scanned">
1874-
<item quantity="one">扫描了 %1$s 个唯一号码</item>
1875-
<item quantity="other">扫描了 %1$s 个唯一号码</item>
1876-
</plurals>
1877-
<plurals name="dashboard_sms_scan_messages_scanned">
1878-
<item quantity="one">扫描了 %1$s 条消息</item>
1879-
<item quantity="other">扫描了 %1$s 条消息</item>
1880-
</plurals>
1881-
<plurals name="dashboard_spam_from_exchange">
1882-
<item quantity="one">两周内来自 %2$s（%3$s）的 %1$s 个号码</item>
1883-
<item quantity="other">两周内来自 %2$s（%3$s）的 %1$s 个号码</item>
1884-
</plurals>
1885-
<plurals name="detail_report_issue_seen">
1886-
<item quantity="one">已出现 %d 次</item>
1887-
<item quantity="other">已出现 %d 次</item>
1888-
</plurals>
1889-
<plurals name="detail_reports_count_label">
1890-
<item quantity="one">举报：%d</item>
1891-
<item quantity="other">举报：%d</item>
1892-
</plurals>
1893-
<plurals name="detail_reports_count_plural">
1894-
<item quantity="one">%d 条举报</item>
1895-
<item quantity="other">%d 条举报</item>
1896-
</plurals>
1897-
<plurals name="detail_sources_count_plural">
1898-
<item quantity="one">%d 个来源</item>
1899-
<item quantity="other">%d 个来源</item>
1900-
</plurals>
1901-
<plurals name="duration_hours">
1902-
<item quantity="one">%d 小时</item>
1903-
<item quantity="other">%d 小时</item>
1904-
</plurals>
19051838
<plurals name="external_blocklist_applied">
19061839
<item quantity="one">已应用 %1$s：%2$d 个号码，+%3$d / -%4$d</item>
19071840
<item quantity="other">已应用 %1$s：%2$d 个号码，+%3$d / -%4$d</item>
@@ -1910,18 +1843,6 @@
19101843
<item quantity="one">已预览 %1$s：%2$d 个号码，+%3$d / -%4$d，%5$d 个已被更强来源持有</item>
19111844
<item quantity="other">已预览 %1$s：%2$d 个号码，+%3$d / -%4$d，%5$d 个已被更强来源持有</item>
19121845
</plurals>
1913-
<plurals name="external_blocklist_restored">
1914-
<item quantity="one">已将 %1$s 恢复，包含 %2$d 个号码</item>
1915-
<item quantity="other">已将 %1$s 恢复，包含 %2$d 个号码</item>
1916-
</plurals>
1917-
<plurals name="notif_summary_text_recent">
1918-
<item quantity="one">近期捕获 %d 条垃圾内容</item>
1919-
<item quantity="other">近期捕获 %d 条垃圾内容</item>
1920-
</plurals>
1921-
<plurals name="overlay_reports_count">
1922-
<item quantity="one">%1$s 条举报</item>
1923-
<item quantity="other">%1$s 条举报</item>
1924-
</plurals>
19251846
<plurals name="protection_test_hot_unavailable_age">
19261847
<item quantity="one">热数据不可用。上次成功更新在 %1$d 小时前</item>
19271848
<item quantity="other">热数据不可用。上次成功更新在 %1$d 小时前</item>
@@ -1934,44 +1855,8 @@
19341855
<item quantity="one">%1$d 个生效规则冲突</item>
19351856
<item quantity="other">%1$d 个生效规则冲突</item>
19361857
</plurals>
1937-
<plurals name="search_result_type_reports">
1938-
<item quantity="one">%1$s · %2$d 条举报</item>
1939-
<item quantity="other">%1$s · %2$d 条举报</item>
1940-
</plurals>
1941-
<plurals name="search_results_count">
1942-
<item quantity="one">%d 个结果</item>
1943-
<item quantity="other">%d 个结果</item>
1944-
</plurals>
1945-
<plurals name="settings_answered_caller_threshold_value">
1946-
<item quantity="one">%1$d 次已接来电</item>
1947-
<item quantity="other">%1$d 次已接来电</item>
1948-
</plurals>
1949-
<plurals name="settings_answered_caller_window_value">
1950-
<item quantity="one">%1$d 天</item>
1951-
<item quantity="other">%1$d 天</item>
1952-
</plurals>
1953-
<plurals name="settings_contact_group_members">
1954-
<item quantity="one">%d 位联系人</item>
1955-
<item quantity="other">%d 位联系人</item>
1956-
</plurals>
1957-
<plurals name="settings_contact_groups_selected">
1958-
<item quantity="one">%d 个已选分组</item>
1959-
<item quantity="other">%d 个已选分组</item>
1960-
</plurals>
1961-
<plurals name="settings_contact_groups_unavailable">
1962-
<item quantity="one">%d 个已选分组不可用。请选择全部联系人以重置范围。</item>
1963-
<item quantity="other">%d 个已选分组不可用。请选择全部联系人以重置范围。</item>
1964-
</plurals>
1965-
<plurals name="settings_emergency_callback_window_value">
1966-
<item quantity="one">%1$d 分钟</item>
1967-
<item quantity="other">%1$d 分钟</item>
1968-
</plurals>
19691858
<plurals name="settings_meeting_mode_apps_count">
19701859
<item quantity="one">已选择 %1$d 个应用</item>
19711860
<item quantity="other">已选择 %1$d 个应用</item>
19721861
</plurals>
1973-
<plurals name="settings_repeat_caller_threshold_value">
1974-
<item quantity="one">%1$d 次来电</item>
1975-
<item quantity="other">%1$d 次来电</item>
1976-
</plurals>
19771862
</resources>

‎scripts/translation_floors.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"description": "Minimum translated-string coverage per locale, in percent. check_translations.py fails when a shipped locale drops below its floor. --update-floors only raises a floor. Lowering one is a hand edit, made on purpose and explained in the commit message.",
33
"floors": {
4-
"values-zh-rCN": 81.3
4+
"values-zh-rCN": 98.5
55
}
66
}

0 commit comments

Comments
 (0)