From d20f1a484aa345011ca3e7260a47286f848fd6bd Mon Sep 17 00:00:00 2001 From: ericmp Date: Sat, 9 Apr 2022 20:28:58 +0200 Subject: [PATCH 1/9] added missing translation in Spanish --- Source/Monitorian.Core/Properties/Resources.es.resx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Monitorian.Core/Properties/Resources.es.resx b/Source/Monitorian.Core/Properties/Resources.es.resx index d4c32e9e..93af2e55 100644 --- a/Source/Monitorian.Core/Properties/Resources.es.resx +++ b/Source/Monitorian.Core/Properties/Resources.es.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Argumentos de línia de comandos + Cambiar contraste From 73eaceffd34c8541df65d6f9a6944a32bfc71d1e Mon Sep 17 00:00:00 2001 From: ericmp Date: Sat, 9 Apr 2022 20:29:41 +0200 Subject: [PATCH 2/9] added ca-CA (Catalan from Catalonia) translations --- .../Properties/Resources.ca-CA.resx | 195 ++++++++++++++++++ 1 file changed, 195 insertions(+) create mode 100644 Source/Monitorian.Core/Properties/Resources.ca-CA.resx diff --git a/Source/Monitorian.Core/Properties/Resources.ca-CA.resx b/Source/Monitorian.Core/Properties/Resources.ca-CA.resx new file mode 100644 index 00000000..4ad69e1e --- /dev/null +++ b/Source/Monitorian.Core/Properties/Resources.ca-CA.resx @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Arguments de línia de comandes + + + Canviar contrast + + + Canviar rang d'ajustament + + + Moure els controls alhora + + + Tancar + + + Copiar registre d'operació + + + Desar registre d'operació a l'escriptori? + + + No fer canvis fins a acabar d'ajustar + + + Habilitar el canvi de contrast + + + Habilitar el canvi del rang d'ajustament + + + Habilitar moure els controls alhora + + + Registrar operacions + + + Ordenar per posició dels monitors + + + Sondejar monitors + + + Ha aparegut un problema inesperat. Desar registre d'errors a l'escriptori? + + + Desar registre de sondeig a l'escriptori? + + + Tornar a comprovar monitors + + + Ajustaments + + + Mostrar brillantor ajustada + + + Mostrar número + + + Executar en iniciar sessió + + + Monitor no controlable. + + + DDC/CI ha fallat repetidament. + + + DDC/CI no està suportat o no està habilitat. + + + Utilitzar controls grans + + \ No newline at end of file From cc07e945dce3c85d1da4cc0f7c26546bd5add4b6 Mon Sep 17 00:00:00 2001 From: ericmp Date: Sun, 10 Apr 2022 23:39:44 +0200 Subject: [PATCH 3/9] updated file name and updated a translation --- .../Properties/{Resources.ca-CA.resx => Resources.ca.resx} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename Source/Monitorian.Core/Properties/{Resources.ca-CA.resx => Resources.ca.resx} (99%) diff --git a/Source/Monitorian.Core/Properties/Resources.ca-CA.resx b/Source/Monitorian.Core/Properties/Resources.ca.resx similarity index 99% rename from Source/Monitorian.Core/Properties/Resources.ca-CA.resx rename to Source/Monitorian.Core/Properties/Resources.ca.resx index 4ad69e1e..fd7a0cae 100644 --- a/Source/Monitorian.Core/Properties/Resources.ca-CA.resx +++ b/Source/Monitorian.Core/Properties/Resources.ca.resx @@ -127,7 +127,7 @@ Canviar rang d'ajustament - Moure els controls alhora + Canviar la brillantor alhora Tancar From c21f6112d36002362a4fceec61c6feb1c6ff7901 Mon Sep 17 00:00:00 2001 From: emoacht Date: Mon, 11 Apr 2022 22:59:07 +0900 Subject: [PATCH 4/9] Correct ca language --- Source/Monitorian.Core/Properties/Resources.ca.resx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Monitorian.Core/Properties/Resources.ca.resx b/Source/Monitorian.Core/Properties/Resources.ca.resx index fd7a0cae..d2774059 100644 --- a/Source/Monitorian.Core/Properties/Resources.ca.resx +++ b/Source/Monitorian.Core/Properties/Resources.ca.resx @@ -148,7 +148,7 @@ Habilitar el canvi del rang d'ajustament - Habilitar moure els controls alhora + Habilitar canviar la brillantor alhora Registrar operacions From 7c016f5e76a2653a6e5f8f13b426a99d5def68e5 Mon Sep 17 00:00:00 2001 From: emoacht Date: Mon, 11 Apr 2022 23:09:00 +0900 Subject: [PATCH 5/9] Add ca language resources to project file --- Source/Monitorian.Core/Monitorian.Core.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Monitorian.Core/Monitorian.Core.csproj b/Source/Monitorian.Core/Monitorian.Core.csproj index be4cd651..0fddb663 100644 --- a/Source/Monitorian.Core/Monitorian.Core.csproj +++ b/Source/Monitorian.Core/Monitorian.Core.csproj @@ -173,6 +173,10 @@ Resources.resx Designer + + Resources.resx + Designer + Resources.resx Designer From d588121cbc620f3996cc2d1c2d204b6fe2cd5384 Mon Sep 17 00:00:00 2001 From: emoacht Date: Mon, 11 Apr 2022 23:21:09 +0900 Subject: [PATCH 6/9] Add ca to installer source file --- Source/Installer/Product.wxs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Source/Installer/Product.wxs b/Source/Installer/Product.wxs index 3e3e2214..456bb0f8 100644 --- a/Source/Installer/Product.wxs +++ b/Source/Installer/Product.wxs @@ -94,6 +94,12 @@ + + + + + @@ -216,6 +222,7 @@ + From 58440a27f7e49948a4706348e65226364a8d79c9 Mon Sep 17 00:00:00 2001 From: emoacht Date: Tue, 12 Apr 2022 19:09:19 +0900 Subject: [PATCH 7/9] Add threshold to operation log --- Source/Monitorian.Core/Models/Logger.cs | 17 +++++++++++++++-- .../Properties/Resources.Designer.cs | 13 +++++++++++-- .../Properties/Resources.ar.resx | 2 +- .../Properties/Resources.ca.resx | 2 +- .../Properties/Resources.de.resx | 2 +- .../Properties/Resources.es.resx | 2 +- .../Properties/Resources.fr.resx | 2 +- .../Properties/Resources.it.resx | 2 +- .../Properties/Resources.ja-JP.resx | 5 ++++- .../Properties/Resources.ko-KR.resx | 2 +- .../Properties/Resources.nl-NL.resx | 2 +- .../Properties/Resources.pl-PL.resx | 2 +- .../Properties/Resources.pt-BR.resx | 2 +- .../Monitorian.Core/Properties/Resources.resx | 5 ++++- .../Properties/Resources.ro.resx | 2 +- .../Properties/Resources.ru-RU.resx | 2 +- .../Properties/Resources.tr-TR.resx | 2 +- .../Properties/Resources.zh-Hans.resx | 2 +- .../Properties/Resources.zh-Hant.resx | 2 +- 19 files changed, 49 insertions(+), 21 deletions(-) diff --git a/Source/Monitorian.Core/Models/Logger.cs b/Source/Monitorian.Core/Models/Logger.cs index 1bbaec0a..5b2710f8 100644 --- a/Source/Monitorian.Core/Models/Logger.cs +++ b/Source/Monitorian.Core/Models/Logger.cs @@ -146,7 +146,8 @@ public static async Task RecordOperationAsync(string content) /// /// Copies operation log from AppData to Desktop. /// - public static async Task CopyOperationAsync() + /// Threshold of log's content (in the number of characters) + public static async Task CopyOperationAsync(int threshold = 10000) { var buffer = new StringBuilder(); @@ -164,8 +165,20 @@ public static async Task CopyOperationAsync() if (buffer.Length == 0) return; + if (buffer.Length < threshold) + { + MessageBox.Show( + Resources.CopyWaitOperationMessage, + ProductInfo.Title, + MessageBoxButton.OK, + MessageBoxImage.Exclamation, + MessageBoxResult.OK); + + return; + } + if (MessageBox.Show( - Resources.CopyOperationMessage, + Resources.CopySaveOperationMessage, ProductInfo.Title, MessageBoxButton.OKCancel, MessageBoxImage.Information, diff --git a/Source/Monitorian.Core/Properties/Resources.Designer.cs b/Source/Monitorian.Core/Properties/Resources.Designer.cs index 6aceb2cc..224ea2bc 100644 --- a/Source/Monitorian.Core/Properties/Resources.Designer.cs +++ b/Source/Monitorian.Core/Properties/Resources.Designer.cs @@ -117,9 +117,18 @@ public static string CopyOperation { /// /// Looks up a localized string similar to Save operation log to Desktop?. /// - public static string CopyOperationMessage { + public static string CopySaveOperationMessage { get { - return ResourceManager.GetString("CopyOperationMessage", resourceCulture); + return ResourceManager.GetString("CopySaveOperationMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Wait for more information to be recorded to operaton log.. + /// + public static string CopyWaitOperationMessage { + get { + return ResourceManager.GetString("CopyWaitOperationMessage", resourceCulture); } } diff --git a/Source/Monitorian.Core/Properties/Resources.ar.resx b/Source/Monitorian.Core/Properties/Resources.ar.resx index 27453a01..fa54f821 100644 --- a/Source/Monitorian.Core/Properties/Resources.ar.resx +++ b/Source/Monitorian.Core/Properties/Resources.ar.resx @@ -132,7 +132,7 @@ نسخ سجلات العمليات - + نسخ سجلات العمليات إلى سطح المكتب diff --git a/Source/Monitorian.Core/Properties/Resources.ca.resx b/Source/Monitorian.Core/Properties/Resources.ca.resx index d2774059..c8e350e1 100644 --- a/Source/Monitorian.Core/Properties/Resources.ca.resx +++ b/Source/Monitorian.Core/Properties/Resources.ca.resx @@ -135,7 +135,7 @@ Copiar registre d'operació - + Desar registre d'operació a l'escriptori? diff --git a/Source/Monitorian.Core/Properties/Resources.de.resx b/Source/Monitorian.Core/Properties/Resources.de.resx index 82bc75f1..46516ae9 100644 --- a/Source/Monitorian.Core/Properties/Resources.de.resx +++ b/Source/Monitorian.Core/Properties/Resources.de.resx @@ -132,7 +132,7 @@ Anwendungsprotokoll kopieren - + Anwendungsprotokoll auf Desktop speichern? diff --git a/Source/Monitorian.Core/Properties/Resources.es.resx b/Source/Monitorian.Core/Properties/Resources.es.resx index 93af2e55..75b3ad33 100644 --- a/Source/Monitorian.Core/Properties/Resources.es.resx +++ b/Source/Monitorian.Core/Properties/Resources.es.resx @@ -135,7 +135,7 @@ Copiar registro de operación - + ¿Guardar registro de operación en el escritorio? diff --git a/Source/Monitorian.Core/Properties/Resources.fr.resx b/Source/Monitorian.Core/Properties/Resources.fr.resx index e4fa8b75..b26d49b4 100644 --- a/Source/Monitorian.Core/Properties/Resources.fr.resx +++ b/Source/Monitorian.Core/Properties/Resources.fr.resx @@ -126,7 +126,7 @@ Copier le journal des opérations - + Enregistrer le journal des opérations sur le Bureau ? diff --git a/Source/Monitorian.Core/Properties/Resources.it.resx b/Source/Monitorian.Core/Properties/Resources.it.resx index 0c2135fa..bdb15acd 100644 --- a/Source/Monitorian.Core/Properties/Resources.it.resx +++ b/Source/Monitorian.Core/Properties/Resources.it.resx @@ -135,7 +135,7 @@ Copia log operazione - + Salvare i log dell'operazione sul Desktop? diff --git a/Source/Monitorian.Core/Properties/Resources.ja-JP.resx b/Source/Monitorian.Core/Properties/Resources.ja-JP.resx index 6bc10485..69654052 100644 --- a/Source/Monitorian.Core/Properties/Resources.ja-JP.resx +++ b/Source/Monitorian.Core/Properties/Resources.ja-JP.resx @@ -135,9 +135,12 @@ 動作ログをコピーする - + 動作ログをデスクトップに保存しますか? + + 動作ログにもっと情報が記録されるのを待ってください。 + 止まるまで変更を遅らせる diff --git a/Source/Monitorian.Core/Properties/Resources.ko-KR.resx b/Source/Monitorian.Core/Properties/Resources.ko-KR.resx index afd2db9f..0f634ecc 100644 --- a/Source/Monitorian.Core/Properties/Resources.ko-KR.resx +++ b/Source/Monitorian.Core/Properties/Resources.ko-KR.resx @@ -126,7 +126,7 @@ 작업 로그 복사 - + 작업 로그를 데스크톱에 저장하시겠습니까? diff --git a/Source/Monitorian.Core/Properties/Resources.nl-NL.resx b/Source/Monitorian.Core/Properties/Resources.nl-NL.resx index ad626067..965998ef 100644 --- a/Source/Monitorian.Core/Properties/Resources.nl-NL.resx +++ b/Source/Monitorian.Core/Properties/Resources.nl-NL.resx @@ -135,7 +135,7 @@ Bewerkingslogboek kopiëren - + Bewerkingslogboek kopiëren naar de Desktop? diff --git a/Source/Monitorian.Core/Properties/Resources.pl-PL.resx b/Source/Monitorian.Core/Properties/Resources.pl-PL.resx index 6ebed6a9..27319c11 100644 --- a/Source/Monitorian.Core/Properties/Resources.pl-PL.resx +++ b/Source/Monitorian.Core/Properties/Resources.pl-PL.resx @@ -132,7 +132,7 @@ Kopiuj dziennik operacji - + Zapisać dziennik operacji na pulpicie? diff --git a/Source/Monitorian.Core/Properties/Resources.pt-BR.resx b/Source/Monitorian.Core/Properties/Resources.pt-BR.resx index 26bb6a3e..dcf57d03 100644 --- a/Source/Monitorian.Core/Properties/Resources.pt-BR.resx +++ b/Source/Monitorian.Core/Properties/Resources.pt-BR.resx @@ -135,7 +135,7 @@ Copiar relatório de operações - + Salvar relatório de operações na área de trabalho? diff --git a/Source/Monitorian.Core/Properties/Resources.resx b/Source/Monitorian.Core/Properties/Resources.resx index 183fbe47..577beea6 100644 --- a/Source/Monitorian.Core/Properties/Resources.resx +++ b/Source/Monitorian.Core/Properties/Resources.resx @@ -135,9 +135,12 @@ Copy operation log - + Save operation log to Desktop? + + Wait for more information to be recorded to operaton log. + Defer change until stopped diff --git a/Source/Monitorian.Core/Properties/Resources.ro.resx b/Source/Monitorian.Core/Properties/Resources.ro.resx index 0e107efa..c4f22f40 100644 --- a/Source/Monitorian.Core/Properties/Resources.ro.resx +++ b/Source/Monitorian.Core/Properties/Resources.ro.resx @@ -135,7 +135,7 @@ Copiază jurnalul operațiunii - + Salvează jurnalul operațiunii pe Desktop? diff --git a/Source/Monitorian.Core/Properties/Resources.ru-RU.resx b/Source/Monitorian.Core/Properties/Resources.ru-RU.resx index 937a1cb0..5ab6e684 100644 --- a/Source/Monitorian.Core/Properties/Resources.ru-RU.resx +++ b/Source/Monitorian.Core/Properties/Resources.ru-RU.resx @@ -132,7 +132,7 @@ Копировать журнал действий - + Сохранить журнал действий на рабочий стол? diff --git a/Source/Monitorian.Core/Properties/Resources.tr-TR.resx b/Source/Monitorian.Core/Properties/Resources.tr-TR.resx index e7d1bbb6..f2b5fa91 100644 --- a/Source/Monitorian.Core/Properties/Resources.tr-TR.resx +++ b/Source/Monitorian.Core/Properties/Resources.tr-TR.resx @@ -132,7 +132,7 @@ Operasyon loglarını kopyala - + Operasyon loglarını Masaüstğne kopyala? diff --git a/Source/Monitorian.Core/Properties/Resources.zh-Hans.resx b/Source/Monitorian.Core/Properties/Resources.zh-Hans.resx index 990029e8..5a417681 100644 --- a/Source/Monitorian.Core/Properties/Resources.zh-Hans.resx +++ b/Source/Monitorian.Core/Properties/Resources.zh-Hans.resx @@ -129,7 +129,7 @@ 复制操作记录 - + 是否将操作记录保存到桌面? diff --git a/Source/Monitorian.Core/Properties/Resources.zh-Hant.resx b/Source/Monitorian.Core/Properties/Resources.zh-Hant.resx index ca5df825..c8055cfd 100644 --- a/Source/Monitorian.Core/Properties/Resources.zh-Hant.resx +++ b/Source/Monitorian.Core/Properties/Resources.zh-Hant.resx @@ -135,7 +135,7 @@ 複製操作紀錄 - + 將操作紀錄檔儲存至桌面? From 761d19141714263dae6a1104ea9b25a9127e0dcf Mon Sep 17 00:00:00 2001 From: emoacht Date: Tue, 12 Apr 2022 23:57:36 +0900 Subject: [PATCH 8/9] Change DOCTYPE --- Source/Monitorian.Core/Models/DocumentService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Monitorian.Core/Models/DocumentService.cs b/Source/Monitorian.Core/Models/DocumentService.cs index 894aeb72..fb240548 100644 --- a/Source/Monitorian.Core/Models/DocumentService.cs +++ b/Source/Monitorian.Core/Models/DocumentService.cs @@ -57,7 +57,7 @@ public static void SaveFileAsHtml(string filePath, string title, string body) private static string BuildHtml(string title, string body) { body = body? - .Split(new[] { "\r\n\r\n", "\n\n" }, StringSplitOptions.RemoveEmptyEntries) + .Split(new[] { "\r\n\r\n", "\n\n" /* two consecutive line breaks */ }, StringSplitOptions.RemoveEmptyEntries) .Select(x => { var array = x.Split(Array.Empty(), 2, StringSplitOptions.RemoveEmptyEntries); @@ -72,7 +72,7 @@ private static string BuildHtml(string title, string body) }) .Aggregate((w, n) => $"{w}\r\n{n}"); - return $@" + return $@" From ee32aca30968b726b4e9607f520b84de08165c71 Mon Sep 17 00:00:00 2001 From: emoacht Date: Wed, 13 Apr 2022 00:01:10 +0900 Subject: [PATCH 9/9] Increment build number --- Source/Installer/Product.wxs | 2 +- Source/Monitorian.Core/Properties/AssemblyInfo.cs | 4 ++-- Source/Monitorian/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Installer/Product.wxs b/Source/Installer/Product.wxs index 456bb0f8..dc02f901 100644 --- a/Source/Installer/Product.wxs +++ b/Source/Installer/Product.wxs @@ -1,6 +1,6 @@  -