Skip to content

Align Shortcuts, gallery and reload wording with the glossary - #137

Merged
PathGao merged 2 commits into
mainfrom
fix/glossary-strings
Oct 10, 2026
Merged

PathGao merged 2 commits into
mainfrom
fix/glossary-strings

Conversation

@PathGao

@PathGao PathGao commented Oct 10, 2026 •

Copy link
Copy Markdown
Owner

Summary

Applies the wording decisions recorded in the DESIGN.md glossary (#136):

  • Shortcuts and labels use "Turn … on or off" / 打开或关闭 instead of "Toggle" / 切换. The Set Enabled State action now reads "Turn On or Off Nifro" / 打开或关闭 Nifro, or "Turn Nifro On/Off" / 将 Nifro 设为打开/关闭. The intent type names and the shouldToggle / isEnabled parameters are unchanged, so existing shortcuts keep working.
  • "site" is always 网站: Site Gallery is 网站库.
  • Reload is always 刷新.
  • The Browsing Mode help text capitalises the name.
String Old New
Set Enabled State, toggle option Toggle / 切换 Turn On or Off / 打开或关闭
Set Enabled State, set option Turn / 切换 Turn / 设为
Set Enabled State, state values true / false On / Off, 打开 / 关闭
Set Enabled State, set summary (zh) ${shouldToggle} Nifro ${isEnabled} 将 Nifro ${shouldToggle}${isEnabled}
Browsing Mode intent title Toggle Browsing Mode / 切换浏览模式 Turn Browsing Mode On or Off / 打开或关闭浏览模式
Browsing Mode intent description Toggles “Browsing Mode” for Nifro. / 切换 Nifro 的「浏览模式」。 Turns “Browsing Mode” on or off in Nifro. / 打开或关闭 Nifro 的「浏览模式」。
Browsing Mode shortcut label …tap to toggle / …轻按切换 …tap to turn on or off / …轻按打开或关闭
Websites help text …toggle dark mode… / …切换深色模式… …turn dark mode on or off… / …打开或关闭深色模式…
Browsing Mode help text …while browsing mode is active. …while Browsing Mode is active.
Site Gallery, Site Gallery…, welcome text 推荐站点 网站库
Gallery site count (2) %lld 个站点 %lld 个网站
Reload Website, Reload website 重新加载网站 刷新网站
Reload Website description 重新加载 Nifro 当前的网站。 刷新 Nifro 当前的网站。

Where the English changed, the Swift literal changed with the catalogue key.

Verification

macOS 27.0.1, Xcode 27.0.

./build.sh ci
python3 Tools/check-strings.py .xcode-build
swiftlint lint --config Tools/Config/SwiftLint.yml --strict

The build succeeds; check-strings reports all 271 strings in the catalogue and in use; SwiftLint 0.65.1 is clean on the changed files. Not checked in the running app: the Shortcuts editor, and whether the longer Browsing Mode shortcut label wraps in the 400 pt Settings window.

Shortcuts say "Turn ... On or Off" instead of "Toggle", site is always
网站, Site Gallery is 网站库, Reload is 刷新, and the Browsing Mode help
text capitalises the name. Intent type names are unchanged.
@PathGao
PathGao enabled auto-merge (squash) October 10, 2026 11:16
The action reads Turn On or Off Nifro / Turn Nifro On / Turn Nifro Off
(打开或关闭 Nifro / 将 Nifro 设为打开 / 设为关闭). Parameter names are
unchanged.
@PathGao
PathGao disabled auto-merge October 10, 2026 11:20
@PathGao
PathGao merged commit f38040c into main Oct 10, 2026
5 checks passed
@PathGao
PathGao deleted the fix/glossary-strings branch October 10, 2026 11:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant