From 01b4e2d78bb0f44534a9e6e85fe1eec726479029 Mon Sep 17 00:00:00 2001
From: David <56174894+Constrat@users.noreply.github.com>
Date: Sun, 18 Jun 2023 19:48:59 +0200
Subject: [PATCH] more refactoring of en-us and formatting for the other
---
src/MaaWpfGui/Res/Localizations/en-us.xaml | 139 ++++++++++-----------
src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 2 +-
src/MaaWpfGui/Res/Localizations/ko-kr.xaml | 2 +-
src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 3 +-
4 files changed, 72 insertions(+), 74 deletions(-)
diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index 0b3dacd3e9..31ce984b13 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -31,26 +31,26 @@
↓Often Used
Sometimes Used↑
← Start Tasks
- Dorm
- Manufacturing Station
- Trade Post
- Power Station
+ Dormitory
+ Factory
+ Trading Post
+ Power Plant
Reception Room
Office
Control Center
- Do not use drones
+ Do not use Drones
LMD
Orundums
Battle Records
Pure Gold
Originium Shards
Chip Packs
- Trust farming in dorm
- Do not put stationed opers in dorm
- Checking the box will not remove operators like Irene from the training room, but it will also prevent operators from the workshop from entering the dormitory
+ Trust farming in Dormitory
+ Do not put stationed operators in Dormitory
+ Checking this box will not remove operators like Irene from the Training Room,\nThis will also prevent operators from the Workshop from entering the Dormitory
Originium Shard auto replenishment
Enable Custom Base (beta)
- Default Infrast
+ Default Base infrastructure
User defined
153 3 times a day
243 3 times a day
@@ -62,7 +62,7 @@
Base Configuration:
Base Plan
Auto save for next plan
- Customize infrastructure selection is empty. Please check your configuration or turn off the customization function
+ Custom Base infrastructure selection is empty. Please check your configuration or turn off the Custom Base function
General Mode
BlueStacks
MuMu Emulator
@@ -77,19 +77,19 @@
General Mode (Blocked exception output)
Morale Threshold
If custom shift is enabled, this field is only valid for autofilled rooms
- Gains Experience Points, clears all possible stages
+ Gains Experience Points, clears as many nodes as possible
Invests coins, exits after arriving at the second floor
Starting Squad
Starting Roles
- Starting Operator (One CN name only)
+ Starting Operator (CN name only)
Only supports the CN name of a single operator, default if not filled
- Select "Starting Oper" from support unit list
- Enable nonfirend support
+ Select "Starting Operator" from support unit list
+ Enable non-friend support
Deployment with Pause (Pause-Trick) (Works for IS, Copilot and SSS) (Beta function, Not recommended yet)
Use ADB Lite (Experimental)
Kill ADB On Exit
Default
- Mind over matter
+ Mind Over Matter Squad
Resourceful Squad
People-Oriented Squad
Leader Squad
@@ -121,10 +121,10 @@
Switchable
Executable
ADB Program
- Error in detect emulators\nPlease use administrator privileges to open this software\nor set connection manually
- Error in detect ADB\nPlease use administrator privileges to open this software\nor set connection manually
+ Error in emulator detection\nPlease use administrator privileges to open this software\nor set connection manually
+ Error in ADB detection\nPlease use administrator privileges to open this software\nor set connection manually
No emulator detected\nPlease use administrator privileges to open this software\nor set connection manually
- Too many emulators detected\nPlease shutdown emulators not needed\nor set connection manually
+ Too many emulators detected\nPlease shutdown not needed emulators \nor set connection manually
Switch Language
Language
The language settings have been changed, restart the app now?
@@ -136,17 +136,17 @@
Cancel
[HotKey] Show/collapse MAA
[HotKey] Link start/stop
- Press Backspace/Esc/Delete to clear the current value
+ Press Backspace / Esc / Delete to clear the current value
The label sequence can be dragged
This option is not saved after restart
- The feature does not automatically navigate to the stage
+ This feature does not automatically navigate to the stage
Startup Update Check
Scheduled Update Check
- Auto download update
- Stable release
- Beta release
- Nightly release
- Update version
+ Auto Download Update
+ Stable Release
+ Beta Release
+ Nightly Release
+ Update Version
Download via aria2
Check update
Changelog
@@ -166,12 +166,12 @@
Failed to get release note
The new version is being built, please try again later
Preparing to download update package...
- Update Package Download Failed
- Please download the zip file manually and place it in the directory _(:з」∠)_
+ Download of Update Package Failed
+ Please download the zip file manually and place it in the directory
Update Package Download Completed
Do you want to upgrade MAA immediately? (restart the process)
New version found, but no update package
- Please download the full package manually to update!
+ Please manually download the full package to update!
Timer
Switch Configuration
Config
@@ -204,14 +204,14 @@
Strategy
Stops after starting N times
Stops after investing N times
- Stops when deposited coins reached limit
- Deposit coins
- Refresh Trader with Dice
+ Stops when invested coins reach limit
+ Invest coins
+ Refresh Rogue Trader with Dice
Penguin Report ID (Number part only)
Dr. Grandet Mode
Wait on the sanity confirmation screen until the current sanity recovers to 1 point, then confirm immediately
- Credits shopping
- Combat with Support to earn credits
+ Credit shopping
+ Combat with Support to earn Credits
Combat with Support Unit in OF-1 after Visit Friends to earn 30 credits.
Only once a day.
This function is invalid when the stage is selected as Current/Last.
@@ -227,18 +227,18 @@ Please do not check it when the stage OF-1 is not unlocked.
System Notification
Hide close button
Whether to restart immediately to apply changes?
- Use alternate stage
+ Use alternative stage
Use remaining sanity stage
Brush the specified stage after completing the main task, no longer automatically revert to sanity
Unlimited use of expiring sanity potion
- Hide today not open stage
+ Hide today's not open stages
Show Base Plan
Variable function button
- Manual entry of level names
+ Manual entry of stage names
Support most main stage names + stage names from the original list (e.g. 4-10, AP-5, H10-1-Hard, etc.)
-At the end of the level, enter "Normal/Hard" to switch between Normal and Tough difficulty
+At the end of the level, enter "Normal/Hard" to switch between Standard and Adverse environment
Auto detect connection
- The checkbox will be automatically unchecked after each detect is completed, and can be checked again if you need to re-detect
+ This checkbox will be automatically unchecked after each detect is completed, and can be checked again if you need to re-detect
Re-detect every times
ADB path (rel/abs)
Connection address
@@ -294,7 +294,7 @@ At the end of the level, enter "Normal/Hard" to switch between Normal and Tough
Cur/Last
The event is not open
Unsupported stages
- Low version
+ Old Version, Update required
Minimum Requirements:
Days left open:
Less than 1 day
@@ -323,14 +323,14 @@ At the end of the level, enter "Normal/Hard" to switch between Normal and Tough
PR-B (Cst/Sni Chip)
PR-C (Pio/Sup Chip)
PR-D (Grd/Spc Chip)
- It's time to complete Annihilation
- Don't forget Annihilation
+ It's Monday: time to clear the Annihilation
+ It's Sunday: don't forget about Annihilation
Connecting to emulator...
Unselected task
Running...
- If all stuck, plz go to Settings - Connection Settings - Forced Replace ADB File, or turn on Compatibility Touch Mode (not recommended).
+ If nothing happens or it gets stuck, please go to Settings → Connection → ADB path and change the ADB.exe, or turn on Compatibility Touch Mode (not recommended).
Stopping...
Has stopped
Unknown error occurred
@@ -347,10 +347,10 @@ At the end of the level, enter "Normal/Hard" to switch between Normal and Tough
Toolbox
Recruitment
- Tip: This recognition is independent from main tab (Farming); need to open up in game recruit tag selection screen, then Begin to Recruit
+ This recruit recognition is independent from the "Farming" tab. Please open the in game recruit tag selection screen before pressing "Begin to Recruit"
Auto set time
Show Potential
- Please use the "Operator" task to get information.
+ Please use the "Operator" task to get the "Potential" information.
Auto select 3★ Tags
Auto select 4★ Tags
Auto select 5★ Tags
@@ -359,7 +359,7 @@ At the end of the level, enter "Normal/Hard" to switch between Normal and Tough
Depot
- This function is still a test version, please check if the recognition result is correct before using it. If there are any errors, please submit the issue by zipping the debug/depot folder in the installation path
+ This function is still in testing. If you encouter any unexpected results, please zip the "debug/depot" folder in the installation path and submit an issue on GitHub
Start to Identify
Export to Arkplanner
Export to Lolicon
@@ -367,8 +367,8 @@ At the end of the level, enter "Normal/Hard" to switch between Normal and Tough
Operator
- This function is still in testing, if the statistics are wrong, please zip the debug/oper file and submit an issue to us
- Not owned: {0} : \n\n{1}\n\nOwned: {2} : \n\n{3}
+ This function is still in testing. If you encouter any unexpected results, please zip the "debug/oper" folder in the installation path and submit an issue on GitHub
+ Not owned: {0}\n\n{1}\n\nOwned: {2}\n\n{3}
Start to Identify
Copy to Clipboard
@@ -376,9 +376,8 @@ At the end of the level, enter "Normal/Hard" to switch between Normal and Tough
Video
Start to identify
Open Directory
- For video recognition, please open the "Copilot" tab and drag the strategy video into it.
-
-The video resolution needs to be 16:9 without interference factors such as black borders, emulator borders and special-shaped screen corrections.
+ For video recognition, please open the "Copilot" tab and drag the strategy video into it.\n
+The video aspect ratio needs to be 16:9 without interference factors such as black borders, emulator borders, special shapes and screen corrections.
Gacha
Gacha Once
@@ -401,7 +400,7 @@ The video resolution needs to be 16:9 without interference factors such as black
Listen, the wailing has stopped. This is the calm before the happy peace arrives.
Even if human wars have no end...at this moment, we have guarded the dignity of our lives. Leave. But leave with your head held high.
This corner may accidentally knock down some furniture, I will try my best to be careful.
- Note that this is a REAL gacha! NOT A SIMULATION!
+ Note that this is a REAL GACHA! NOT A SIMULATION!
Got it
Don't show again
@@ -412,7 +411,7 @@ The video resolution needs to be 16:9 without interference factors such as black
Copilot
Task file / URL
Select task file
- Task files can be directly dragged in with the mouse (o゚v゚)ノ
+ Task files can be imported by dragging the mouse
Do you like this task file? Rate it!
An error occurred, the like failed. : <
Thanks for the likes!\nThe comment section is already open on the web page, please feel free to leave your comment!
@@ -425,19 +424,19 @@ The video resolution needs to be 16:9 without interference factors such as black
Tips: \n\n
1. Please use this function only when the "Mission Start" button is visible in game.\n\n
- 2. You need turn off the "Auto squad" if using a friendly support unit, then start with your support unit selected.\n\n
- 3. For Paradox Simulation, you need to turn off "Auto squad" and select the skill before, then start in game "Start" screen.\n\n
+ 2. You need turn off the "Auto Squad" when using a friendly support unit, then start with your support unit selected.\n\n
+ 3. For Paradox Simulation, you need to turn off "Auto Squad" and select the skill before, then start in game "Start" screen.\n\n
4. For SSS, there are multiple built-in files under the "resource/copilot" folder.\n
Please start on the "Start Deployment" screen after manual formation (can be used with "Loop Times")\n\n
5. Video recognition is now supported, please drag the strategy video to use.\n
- The video resolution needs to be 16:9 without interference factors such as black borders, emulator borders and special-shaped screen corrections.\n\n
+ The video aspect ratio needs to be 16:9 without interference factors such as black borders, emulator borders special shapes and screen corrections.\n\n
Failed to read file!
No corresponding file found!
Network service error!
Copilot Json Error!
Malformed file!
- malformed copilot Json!
+ Malformed Copilot Json!
@@ -460,7 +459,7 @@ The video resolution needs to be 16:9 without interference factors such as black
Falied to replace ADB file
Temporarily connected using local ADB
Initialization error!
- Emulator resolution not supported, please set at least 1280x720 with 16:9 ratio
+ Emulator resolution not supported, please set a resolution of at least 1280x720 with a 16:9 aspect ratio
Failed to obtain emulator resolution. It is recommended to restart the emulator and ADB, or restart the computer, or consider switching to another emulator
Emulator disconnected, trying to reconnect
Reconnection succeeded. Continuing the task
@@ -503,12 +502,12 @@ The video resolution needs to be 16:9 without interference factors such as black
Exploration completed! Congratulations!
Special Item Purchased!
Game cleared! congratulations!
- Stage: Rogue Trader
- Stage: Safe House
- Stage: Encounter
- Stage: Combat Operation
- Stage: Emergency Operation
- Stage: Dreadful Foe
+ Node: Rogue Trader
+ Node: Safe House
+ Node: Encounter
+ Node: Combat Operation
+ Node: Emergency Operation
+ Node: Dreadful Foe
Nothing
Drops:
Total Drops:
@@ -552,23 +551,23 @@ The video resolution needs to be 16:9 without interference factors such as black
Auto refresh 3★ Tags
- Auto use Expedited*
- Set 7:40 instead of 9:00 of 3★ Tags
- Set 1:00 instead of 9:00 of 3★ Tags
- No interference with other stars
+ Auto use Expedited Plan*
+ Set 7:40 instead of 9:00 for 3★ Tags
+ Set 1:00 instead of 9:00 for 3★ Tags
+ Doesn't interfere with other ★ stars
Recruit max times
- Manually confirm Robot
+ Manually confirm Robot tag
Auto confirm 3★
Auto confirm 4★
Auto confirm 5★
Auto confirm 6★
- If checked, 1★ recruit will be skipped. If not checked, 1★ entry with be ignored.
+ If checked when 1★ tags are identified, will skip the recruitment. If not checked when 1★ tags are identified, they will be ignored
Dear Doctor, ever heard of the new listings of "isopropyl alcohol" in Ms. Closure's store? Let's check it out?
Ugh... Ehem
Ah, doctor, why do you sway so much in your movement today?
- I can not drink... Drink so much next time...
+ I won't drink so much next time...
Hello World!
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index 47fd751d12..a2eabf4131 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -579,4 +579,4 @@
構成< {0}>が正常に追加されました
構成 < {0}> は既に存在します
ファイルが占有されています。コンピュータを再起動して再試行してください
-
+
\ No newline at end of file
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index eb5a9f0fe9..85c72bc162 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -580,4 +580,4 @@ OF-1을 해금하지 않았다면 선택하지 말아 주세요.
구성 < {0}>가 성공적으로 추가되었습니다
구성 < {0}>가 이미 있습니다
파일이 사용 중입니다. 컴퓨터를 다시 시작하고 다시 시도하십시오
-
+
\ No newline at end of file
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 78d8384b8e..726677a684 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -376,8 +376,7 @@
视频识别
开始识别
打开文件夹
- 请打开“自动战斗”页,将攻略视频文件拖入后开始即可。
-
+ 请打开“自动战斗”页,将攻略视频文件拖入后开始即可。\n
需要视频分辨率为 16:9,且无黑边、模拟器边框、异形屏矫正等干扰因素。
牛牛抽卡