From 57983571a3f7525950767dfd7b0786c560dd3fb7 Mon Sep 17 00:00:00 2001 From: Jerry Date: Fri, 27 Oct 2023 08:03:30 -0700 Subject: [PATCH] Rename Preferences to Settings (#195) * perf(UI): rename Preferences to Settings * fix(UI): conflicts in String Catalog * docs: update README * docs: update README * docs: update README_EN * perf(UI): settings name adjustment Co-authored-by: Kyle --------- Co-authored-by: Kyle --- .../Contents.json | 0 .../toolbar_setting.png | Bin Easydict/App/Base.lproj/Main.storyboard | 8 ++++---- Easydict/App/Localizable.xcstrings | 7 +++---- Easydict/App/mul.lproj/Main.xcstrings | 12 ++++++------ .../PerferenceWindow/EZSettingViewController.m | 4 ++-- EasydictHelper/Base.lproj/Main.storyboard | 6 +++--- README.md | 12 ++++++------ README_EN.md | 10 +++++----- 9 files changed, 29 insertions(+), 30 deletions(-) rename Easydict/App/Assets.xcassets/setting/{toolbar_setting.imageset => toolbar_setting_general.imageset}/Contents.json (100%) rename Easydict/App/Assets.xcassets/setting/{toolbar_setting.imageset => toolbar_setting_general.imageset}/toolbar_setting.png (100%) diff --git a/Easydict/App/Assets.xcassets/setting/toolbar_setting.imageset/Contents.json b/Easydict/App/Assets.xcassets/setting/toolbar_setting_general.imageset/Contents.json similarity index 100% rename from Easydict/App/Assets.xcassets/setting/toolbar_setting.imageset/Contents.json rename to Easydict/App/Assets.xcassets/setting/toolbar_setting_general.imageset/Contents.json diff --git a/Easydict/App/Assets.xcassets/setting/toolbar_setting.imageset/toolbar_setting.png b/Easydict/App/Assets.xcassets/setting/toolbar_setting_general.imageset/toolbar_setting.png similarity index 100% rename from Easydict/App/Assets.xcassets/setting/toolbar_setting.imageset/toolbar_setting.png rename to Easydict/App/Assets.xcassets/setting/toolbar_setting_general.imageset/toolbar_setting.png diff --git a/Easydict/App/Base.lproj/Main.storyboard b/Easydict/App/Base.lproj/Main.storyboard index 577da7fcc..2309e42c9 100644 --- a/Easydict/App/Base.lproj/Main.storyboard +++ b/Easydict/App/Base.lproj/Main.storyboard @@ -1,8 +1,8 @@ - + - + @@ -22,7 +22,7 @@ - + @@ -772,7 +772,7 @@ DQ - + diff --git a/Easydict/App/Localizable.xcstrings b/Easydict/App/Localizable.xcstrings index d8c6414aa..41610553c 100644 --- a/Easydict/App/Localizable.xcstrings +++ b/Easydict/App/Localizable.xcstrings @@ -1856,19 +1856,18 @@ } } }, - "setting" : { - "comment" : "setting", + "setting_general" : { "localizations" : { "en" : { "stringUnit" : { "state" : "translated", - "value" : "Settings" + "value" : "General" } }, "zh-Hans" : { "stringUnit" : { "state" : "translated", - "value" : "设置" + "value" : "通用" } } } diff --git a/Easydict/App/mul.lproj/Main.xcstrings b/Easydict/App/mul.lproj/Main.xcstrings index fefa7d868..563bb3e83 100644 --- a/Easydict/App/mul.lproj/Main.xcstrings +++ b/Easydict/App/mul.lproj/Main.xcstrings @@ -1102,18 +1102,18 @@ } }, "Fzj-Rh-cL0.title" : { - "comment" : "Class = \"NSMenuItem\"; title = \"偏好设置\"; ObjectID = \"Fzj-Rh-cL0\";", + "comment" : "Class = \"NSMenuItem\"; title = \"设置\"; ObjectID = \"Fzj-Rh-cL0\";", "localizations" : { "en" : { "stringUnit" : { "state" : "translated", - "value" : "Preferences" + "value" : "Settings" } }, "zh-Hans" : { "stringUnit" : { "state" : "translated", - "value" : "偏好设置" + "value" : "设置" } } } @@ -2673,19 +2673,19 @@ } }, "wgy-yj-uSV.title" : { - "comment" : "Class = \"NSMenuItem\"; title = \"Preferences…\"; ObjectID = \"wgy-yj-uSV\";", + "comment" : "Class = \"NSMenuItem\"; title = \"Settings…\"; ObjectID = \"wgy-yj-uSV\";", "extractionState" : "extracted_with_value", "localizations" : { "en" : { "stringUnit" : { "state" : "new", - "value" : "Preferences…" + "value" : "Settings…" } }, "zh-Hans" : { "stringUnit" : { "state" : "translated", - "value" : "Preferences…" + "value" : "Settings…" } } } diff --git a/Easydict/Feature/PerferenceWindow/EZSettingViewController.m b/Easydict/Feature/PerferenceWindow/EZSettingViewController.m index cae44357b..e022990ad 100644 --- a/Easydict/Feature/PerferenceWindow/EZSettingViewController.m +++ b/Easydict/Feature/PerferenceWindow/EZSettingViewController.m @@ -1000,11 +1000,11 @@ - (NSString *)viewIdentifier { } - (NSString *)toolbarItemLabel { - return NSLocalizedString(@"setting", nil); + return NSLocalizedString(@"setting_general", nil); } - (NSImage *)toolbarItemImage { - return [NSImage imageNamed:@"toolbar_setting"]; + return [NSImage imageNamed:@"toolbar_setting_general"]; } - (BOOL)hasResizableWidth { diff --git a/EasydictHelper/Base.lproj/Main.storyboard b/EasydictHelper/Base.lproj/Main.storyboard index c96ab9e9e..0f468c018 100644 --- a/EasydictHelper/Base.lproj/Main.storyboard +++ b/EasydictHelper/Base.lproj/Main.storyboard @@ -1,8 +1,8 @@ - + - + @@ -25,7 +25,7 @@ - + diff --git a/README.md b/README.md index 7e689b807..7ba38f1dc 100644 --- a/README.md +++ b/README.md @@ -79,8 +79,8 @@ - [应用内查询](#应用内查询) - [URL Scheme](#url-scheme) - [配合 PopClip 使用](#配合-popclip-使用) -- [偏好设置](#偏好设置) - - [设置](#设置) +- [设置](#设置) + - [通用](#通用) - [服务](#服务) - [应用内快捷键](#应用内快捷键) - [Tips](#tips) @@ -514,11 +514,11 @@ Easydict 支持 URL scheme 快速查询：`easydict://xxx`，如 easydict://good > 参考：https://github.com/pilotmoon/PopClip-Extensions#key-combo-string-format -## 偏好设置 +## 设置 -设置页提供了一些偏好设置修改，如开启查询后自动播放单词发音，修改翻译快捷键，开启、关闭服务，或调整服务顺序等。 +设置页提供了一些设置修改，如开启查询后自动播放单词发音，修改翻译快捷键，开启、关闭服务，或调整服务顺序等。 -### 设置 +### 通用 ![dYtfPh-1684758870](https://raw.githubusercontent.com/tisfeng/ImageBed/main/uPic/dYtfPh-1684758870.png) @@ -656,4 +656,4 @@ Easydict 作为一个免费开源的非盈利项目，目前主要是作者个 | 2023-09-24 | Austen | 10 | 支持开源作者 | | 2023-10-19 | DANIELHU | 7.3 | 感谢开源，希望能加入生词本功能。（后面会加，请等待 [33](https://github.com/tisfeng/Easydict/issues/33)） | | 2023-10-25 | tzcsky | 10 | 非常好的软件 | -| 2023-10-26 | | 10 | 开源万岁🎉尽点绵薄之力，感谢！ | \ No newline at end of file +| 2023-10-26 | | 10 | 开源万岁🎉尽点绵薄之力，感谢！ | diff --git a/README_EN.md b/README_EN.md index bacf9d19d..38974e95c 100644 --- a/README_EN.md +++ b/README_EN.md @@ -78,8 +78,8 @@ - [Query in App](#query-in-app) - [URL Scheme](#url-scheme) - [Use with PopClip](#use-with-popclip) -- [Preferences](#preferences) - - [Settings](#settings) +- [Settings](#Settings) + - [General](#general) - [Services](#services) - [In-App Shortcuts](#in-app-shortcuts) - [Tips](#tips) @@ -508,11 +508,11 @@ Usage: Select the following code block, `PopClip` will show "Install Easydict", > Ref: https://github.com/pilotmoon/PopClip-Extensions#key-combo-string-format -## Preferences +## Settings The settings page provides some preference setting modifications, such as automatically playing word pronunciation after turning on a query, modifying translation shortcut keys, turning on and off services, or adjusting the order of services, etc. -### Settings +### General Prefences @@ -651,4 +651,4 @@ If you don't want your username to be displayed in the list, please choose anony | 2023-09-24 | Austen | 10 | 支持开源作者 | | 2023-10-19 | DANIELHU | 7.3 | 感谢开源，希望能加入生词本功能。（后面会加，请等待 [33](https://github.com/tisfeng/Easydict/issues/33)） | | 2023-10-25 | tzcsky | 10 | 非常好的软件 | -| 2023-10-26 | | 10 | 开源万岁🎉尽点绵薄之力，感谢！ | \ No newline at end of file +| 2023-10-26 | | 10 | 开源万岁🎉尽点绵薄之力，感谢！ |