fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 10:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev

Browse Source
This commit is contained in:
Roland125
2023-04-13 16:43:04 +08:00
committed by GitHub
parent 5c2aa40742 01de1ee96c
commit e646b3e36e
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MaaWpfGui/Main/AsstProxy.cs
View File

@@ -463,8 +463,8 @@ namespace MaaWpfGui.Main
_taskQueueViewModel.AddLog(LocalizationHelper.GetString("ScreencapFailed"), UiLogColor.Error);
break;
case "TouchModeNotAvaiable":
_taskQueueViewModel.AddLog(LocalizationHelper.GetString("TouchModeNotAvaiable"), UiLogColor.Error);
case "TouchModeNotAvailable":
_taskQueueViewModel.AddLog(LocalizationHelper.GetString("TouchModeNotAvailable"), UiLogColor.Error);
break;
}
}

2
src/MaaWpfGui/Res/Localizations/en-us.xaml
View File

@@ -435,7 +435,7 @@
<system:String x:Key="ReconnectSuccess">Reconnect succeeded. Continue the task</system:String>
<system:String x:Key="ReconnectFailed">Reconnect failed. The connection is down!</system:String>
<system:String x:Key="ScreencapFailed">Screencap failed. If it happens repeatedly, try restarting or changing the emulator.</system:String>
<system:String x:Key="TouchModeNotAvaiable">Touch mode is not available, please enter Settings - Connection Settings to change other touch modes</system:String>
<system:String x:Key="TouchModeNotAvailable">Touch mode is not available, please enter Settings - Connection Settings to change other touch modes</system:String>
<system:String x:Key="IdentifyTheMistakes">Identify error</system:String>
<system:String x:Key="TaskError" xml:space="preserve">Task error: </system:String>
<system:String x:Key="CombatError">Combat error</system:String>

4
src/MaaWpfGui/Res/Localizations/ko-kr.xaml
View File

@@ -122,7 +122,7 @@
<system:String x:Key="Language">언어</system:String>
<system:String x:Key="LanguageChangedTip">언어가 변경되었습니다. 지금 MAA를 재실행하여 새 설정을 적용하시겠습니까?</system:String>
<system:String x:Key="ManualRestart">나중에</system:String>
<system:String x:Key="Tip">도움말</system:String>
<system:String x:Key="Yes">예</system:String>
<system:String x:Key="No">아니요</system:String>
@@ -413,7 +413,7 @@
<system:String x:Key="ReconnectSuccess">다시 연결되었습니다. 작업을 계속합니다.</system:String>
<system:String x:Key="ReconnectFailed">다시 연결하지 못했습니다. 연결 해제되었습니다!</system:String>
<system:String x:Key="ScreencapFailed">스크린샷 캡처에 실패했습니다. 반복적으로 발생 시 에뮬레이터를 다시 시작하거나 변경해 보세요.</system:String>
<system:String x:Key="TouchModeNotAvaiable">터치 수행 방식이 사용 불가능합니다. 설정 - 연결 설정에서 다른 방식으로 변경해 주세요.</system:String>
<system:String x:Key="TouchModeNotAvailable">터치 수행 방식이 사용 불가능합니다. 설정 - 연결 설정에서 다른 방식으로 변경해 주세요.</system:String>
<system:String x:Key="IdentifyTheMistakes">인식 오류</system:String>
<system:String x:Key="TaskError">작업 오류:</system:String>
<system:String x:Key="CombatError">작전 오류</system:String>

2
src/MaaWpfGui/Res/Localizations/zh-cn.xaml
View File

@@ -437,7 +437,7 @@
<system:String x:Key="TryToReconnect">模拟器断开，正在尝试重连</system:String>
<system:String x:Key="ReconnectSuccess">重连成功，继续任务</system:String>
<system:String x:Key="ReconnectFailed">重连失败，连接断开！</system:String>
<system:String x:Key="TouchModeNotAvaiable">触控模式不可用。请进入 设置 - 连接设置 切换其他触控模式</system:String>
<system:String x:Key="TouchModeNotAvailable">触控模式不可用。请进入 设置 - 连接设置 切换其他触控模式</system:String>
<system:String x:Key="ScreencapFailed">截图失败，如反复出现请尝试重启或更换模拟器！</system:String>
<system:String x:Key="IdentifyTheMistakes">识别错误</system:String>
<system:String x:Key="TaskError">任务出错：</system:String>