Rename Preferences to Settings (tisfeng#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 <[email protected]> --------- Co-authored-by: Kyle <[email protected]>
Jerry23011 · Oct 27, 2023 · 5798357 · 5798357
1 parent 166b76b
commit 5798357
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 30 deletions.
diff --git a/...ng/toolbar_setting.imageset/Contents.json → ...ar_setting_general.imageset/Contents.json b/...ng/toolbar_setting.imageset/Contents.json → ...ar_setting_general.imageset/Contents.json
diff --git a/...lbar_setting.imageset/toolbar_setting.png → ...ting_general.imageset/toolbar_setting.png b/...lbar_setting.imageset/toolbar_setting.png → ...ting_general.imageset/toolbar_setting.png
diff --git a/Easydict/App/Base.lproj/Main.storyboard b/Easydict/App/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
     </dependencies>
     <scenes>
         <!--Application-->
@@ -22,7 +22,7 @@
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="uLo-B5-Udn"/>
-                                        <menuItem title="Preferences…" keyEquivalent="," id="wgy-yj-uSV">
+                                        <menuItem title="Settings…" keyEquivalent="," id="wgy-yj-uSV">
                                             <connections>
                                                 <action selector="preferenceAction:" target="qM9-fT-Fym" id="AQg-31-GQh"/>
                                             </connections>
@@ -772,7 +772,7 @@ DQ
                             </connections>
                         </menuItem>
                         <menuItem isSeparatorItem="YES" id="kkp-Wh-Cmv"/>
-                        <menuItem title="偏好设置" keyEquivalent="," id="Fzj-Rh-cL0">
+                        <menuItem title="设置..." keyEquivalent="," id="Fzj-Rh-cL0">
                             <connections>
                                 <action selector="preferenceAction:" target="qM9-fT-Fym" id="Emg-Mm-dS5"/>
                             </connections>

diff --git 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
@@ -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
@@ -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
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
     </dependencies>
     <scenes>
         <!--Application-->
@@ -25,7 +25,7 @@
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
-                                        <menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
+                                        <menuItem title="Settings…" keyEquivalent="," id="BOF-NM-1cW"/>
                                         <menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
                                         <menuItem title="Services" id="NMo-om-nkz">
                                             <modifierMask key="keyEquivalentModifierMask"/>

diff --git 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 | 开源万岁🎉尽点绵薄之力，感谢！ |
+| 2023-10-26 |  | 10 | 开源万岁🎉尽点绵薄之力，感谢！ |
diff --git 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
 
 <img width="1036" alt="Prefences" src="https://github.com/Jerry23011/Easydict/assets/89069957/7d63ad8e-927f-44e2-bc14-9d2199a927e4">
 
@@ -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 | 开源万岁🎉尽点绵薄之力，感谢！ |
+| 2023-10-26 |  | 10 | 开源万岁🎉尽点绵薄之力，感谢！ |