Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename Preferences to Settings #195

Merged
merged 6 commits into from
Oct 27, 2023
Merged

Rename Preferences to Settings #195

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
014fb39
perf(UI): rename Preferences to Settings
Jerry23011 Oct 26, 2023
bdc68dd
fix(UI): conflicts in String Catalog
Jerry23011 Oct 26, 2023
5fb4249
docs: update README
Jerry23011 Oct 26, 2023
53254ba
docs: update README
Jerry23011 Oct 26, 2023
89b0785
docs: update README_EN
Jerry23011 Oct 26, 2023
a320359
perf(UI): settings name adjustment
Jerry23011 Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...ng/toolbar_setting.imageset/Contents.json → ...ar_setting_general.imageset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...lbar_setting.imageset/toolbar_setting.png → ...ting_general.imageset/toolbar_setting.png
View file
Open in desktop
File renamed without changes
8 changes: 4 additions & 4 deletions Easydict/App/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-->
Expand All @@ -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>
Expand Down Expand Up @@ -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">
Jerry23011 marked this conversation as resolved.
Show resolved Hide resolved
<connections>
<action selector="preferenceAction:" target="qM9-fT-Fym" id="Emg-Mm-dS5"/>
</connections>
Expand Down
7 changes: 3 additions & 4 deletions Easydict/App/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" : "通用"
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions Easydict/App/mul.lproj/Main.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" : "设置"
}
}
}
Expand Down Expand Up @@ -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…"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions Easydict/Feature/PerferenceWindow/EZSettingViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions EasydictHelper/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-->
Expand All @@ -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"/>
Expand Down
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
- [应用内查询](#应用内查询)
- [URL Scheme](#url-scheme)
- [配合 PopClip 使用](#配合-popclip-使用)
- [偏好设置](#偏好设置)
- [设置](#设置)
- [设置](#设置)
- [通用](#通用)
- [服务](#服务)
- [应用内快捷键](#应用内快捷键)
- [Tips](#tips)
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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 | 开源万岁🎉尽点绵薄之力，感谢！ |
10 changes: 5 additions & 5 deletions README_EN.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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">

Expand Down Expand Up @@ -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 | 开源万岁🎉尽点绵薄之力，感谢！ |