diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.en.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.en.resx index 91a4ef5b5..10f08bbb2 100644 --- a/src/ST.Client.Desktop/UI/Resx/AppResources.en.resx +++ b/src/ST.Client.Desktop/UI/Resx/AppResources.en.resx @@ -1973,4 +1973,16 @@ Steam International Service Comment=;Author=MicrosoftTranslator + + Log files are occupied {0} + Comment={0}占用体积大小;Author=MicrosoftTranslator + + + We have opened the quick login window using your system browser, please go to this page and log in. Keep the window open + Comment=;Author=MicrosoftTranslator + + + retry + Comment=;Author=MicrosoftTranslator + diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.es.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.es.resx index bb66e3287..c6f1ee651 100644 --- a/src/ST.Client.Desktop/UI/Resx/AppResources.es.resx +++ b/src/ST.Client.Desktop/UI/Resx/AppResources.es.resx @@ -1974,4 +1974,16 @@ Servicio Internacional steam Comment=;Author=MicrosoftTranslator + + Los archivos de registro están ocupados {0} + Comment={0}占用体积大小;Author=MicrosoftTranslator + + + Hemos abierto la ventana de inicio de sesión rápido utilizando el navegador de su sistema, por favor vaya a esta página e inicie sesión. Mantener la ventana abierta + Comment=;Author=MicrosoftTranslator + + + reintentar + Comment=;Author=MicrosoftTranslator + diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.it.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.it.resx index 41fdbfb83..75b60465f 100644 --- a/src/ST.Client.Desktop/UI/Resx/AppResources.it.resx +++ b/src/ST.Client.Desktop/UI/Resx/AppResources.it.resx @@ -1974,4 +1974,16 @@ Sicuro di voler continuare? Servizio internazionale steam Comment=;Author=MicrosoftTranslator + + I file di registro sono occupati {0} + Comment={0}占用体积大小;Author=MicrosoftTranslator + + + Abbiamo aperto la finestra di accesso rapido utilizzando il browser di sistema, vai a questa pagina e accedi. Tenere aperta la finestra + Comment=;Author=MicrosoftTranslator + + + ripetere + Comment=;Author=MicrosoftTranslator + diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.ja.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.ja.resx index 817194480..28de103df 100644 --- a/src/ST.Client.Desktop/UI/Resx/AppResources.ja.resx +++ b/src/ST.Client.Desktop/UI/Resx/AppResources.ja.resx @@ -1969,4 +1969,16 @@ スチームインターナショナル Comment=;Author=MicrosoftTranslator + + ログ ファイルが既に使用されています {0} + Comment={0}占用体积大小;Author=MicrosoftTranslator + + + システム ブラウザを使用してクイック ランディング ウィンドウを開いたので、そのページに移動してログインします。 ウィンドウを開いたままにしておきます + Comment=;Author=MicrosoftTranslator + + + 再試行します + Comment=;Author=MicrosoftTranslator + diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.ko.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.ko.resx index 7b10b8cda..4618d1e28 100644 --- a/src/ST.Client.Desktop/UI/Resx/AppResources.ko.resx +++ b/src/ST.Client.Desktop/UI/Resx/AppResources.ko.resx @@ -1969,4 +1969,16 @@ 스팀 인터내셔널웨어 Comment=;Author=MicrosoftTranslator + + 로그 파일이 이미 {0} + Comment={0}占用体积大小;Author=MicrosoftTranslator + + + 시스템 브라우저를 사용하여 빠른 로그인 창을 열수 있습니다. 창을 열어 두십시오 + Comment=;Author=MicrosoftTranslator + + + 다시 시도하십시오 + Comment=;Author=MicrosoftTranslator + diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.ru.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.ru.resx index cb64e9f29..c776a8976 100644 --- a/src/ST.Client.Desktop/UI/Resx/AppResources.ru.resx +++ b/src/ST.Client.Desktop/UI/Resx/AppResources.ru.resx @@ -1969,4 +1969,16 @@ Международная одежда Steam Comment=;Author=MicrosoftTranslator + + Файл журнала занят {0} + Comment={0}占用体积大小;Author=MicrosoftTranslator + + + Мы открыли окно быстрого входа с помощью вашего системного браузера, пожалуйста, перейдите на эту страницу и войдите в систему. Оставьте окно открытым + Comment=;Author=MicrosoftTranslator + + + Повторите попытку + Comment=;Author=MicrosoftTranslator + diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.zh-Hant.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.zh-Hant.resx index 1991cf8eb..b3571ab1f 100644 --- a/src/ST.Client.Desktop/UI/Resx/AppResources.zh-Hant.resx +++ b/src/ST.Client.Desktop/UI/Resx/AppResources.zh-Hant.resx @@ -1969,4 +1969,16 @@ Steam國際服 Comment=;Author=MicrosoftTranslator + + 記錄檔已佔用 {0} + Comment={0}占用体积大小;Author=MicrosoftTranslator + + + 我們已使用您的系統瀏覽器打開快速登陸視窗，請進入該頁面並登陸。 保持該窗口打開 + Comment=;Author=MicrosoftTranslator + + + 重試 + Comment=;Author=MicrosoftTranslator + diff --git a/src/ST.Client.Mobile.Droid.App/ST.Client.Mobile.Droid.App.csproj b/src/ST.Client.Mobile.Droid.App/ST.Client.Mobile.Droid.App.csproj index c56f5a542..9ebaebc95 100644 --- a/src/ST.Client.Mobile.Droid.App/ST.Client.Mobile.Droid.App.csproj +++ b/src/ST.Client.Mobile.Droid.App/ST.Client.Mobile.Droid.App.csproj @@ -1,4 +1,4 @@ - + Debug @@ -114,4 +114,4 @@ - + \ No newline at end of file diff --git a/src/ST.Tools.Translate/Commands/ReadCommand.cs b/src/ST.Tools.Translate/Commands/ReadCommand.cs index 667b5d6fe..df1e3f85d 100644 --- a/src/ST.Tools.Translate/Commands/ReadCommand.cs +++ b/src/ST.Tools.Translate/Commands/ReadCommand.cs @@ -82,7 +82,7 @@ namespace System.Commands } if (index_cell_value == -1 || index_cell_author == -1 || index_cell_comment == -1) return messages; - Dictionary dict = new(); + Dictionary comment)> dict = new(); while (true) // 循环 Body 区域 { row = sheet.GetRow(index_row++); @@ -104,11 +104,16 @@ namespace System.Commands { CommentKey, comment }, { AuthorKey, author }, }; - var commentStr = Serialize(commentDict); - dict.Add(key, (value, commentStr)); + dict.Add(key, (value, commentDict)); } } + var resxFileDictLangDict = GetResxDict(resxFilePathLang, ignoreStringBuilder: true).dict; + foreach (var item in dict) + { + resxFileDictLangDict.AddOrReplace(item); + } + var template = Properties.Resources.Resx; const string rootEndMark = ""; var rootEndIndex = template.IndexOf(rootEndMark); @@ -119,13 +124,14 @@ namespace System.Commands } var sb = new StringBuilder(template.Substring(0, rootEndIndex)); - foreach (var item in dict) + foreach (var item in resxFileDictLangDict) { sb.AppendFormatLine(" ", item.Key); sb.AppendFormatLine(" {0}", Escape(item.Value.value)); - if (!string.IsNullOrWhiteSpace(item.Value.comment)) + var commentStr = Serialize(item.Value.comment); + if (!string.IsNullOrWhiteSpace(commentStr)) { - sb.AppendFormatLine(" {0}", Escape(item.Value.comment)); + sb.AppendFormatLine(" {0}", Escape(commentStr)); } sb.AppendLine(" "); } diff --git a/src/ST.Tools.Translate/Commands/WriteCommand.cs b/src/ST.Tools.Translate/Commands/WriteCommand.cs index 34668ad67..a54acad38 100644 --- a/src/ST.Tools.Translate/Commands/WriteCommand.cs +++ b/src/ST.Tools.Translate/Commands/WriteCommand.cs @@ -16,7 +16,7 @@ namespace System.Commands /// static class WriteCommand { - public static bool EnableAzureTranslation { get; private set; } = false; + public static bool EnableAzureTranslation { get; private set; } = true; readonly static Dictionary tempXlsxPairs = new() {