From 1b0c100b3b9da9eec9c415c4cd00e900370a9416 Mon Sep 17 00:00:00 2001 From: Jaex Date: Sat, 1 Jul 2023 13:42:05 +0300 Subject: [PATCH] Removed conflicting application suggestions --- ShareX/HotkeyManager.cs | 15 +-------------- ShareX/Properties/Resources.Designer.cs | 9 --------- ShareX/Properties/Resources.de.resx | 3 --- ShareX/Properties/Resources.es-MX.resx | 3 --- ShareX/Properties/Resources.fr.resx | 3 --- ShareX/Properties/Resources.he-IL.resx | 3 --- ShareX/Properties/Resources.id-ID.resx | 3 --- ShareX/Properties/Resources.it-IT.resx | 3 --- ShareX/Properties/Resources.ja-JP.resx | 3 --- ShareX/Properties/Resources.ko-KR.resx | 3 --- ShareX/Properties/Resources.nl-NL.resx | 3 --- ShareX/Properties/Resources.pl.resx | 3 --- ShareX/Properties/Resources.pt-BR.resx | 3 --- ShareX/Properties/Resources.pt-PT.resx | 3 --- ShareX/Properties/Resources.resx | 3 --- ShareX/Properties/Resources.ro.resx | 3 --- ShareX/Properties/Resources.ru.resx | 3 --- ShareX/Properties/Resources.tr.resx | 3 --- ShareX/Properties/Resources.uk.resx | 3 --- ShareX/Properties/Resources.vi-VN.resx | 3 --- ShareX/Properties/Resources.zh-CN.resx | 3 --- ShareX/Properties/Resources.zh-TW.resx | 3 --- 22 files changed, 1 insertion(+), 83 deletions(-) diff --git a/ShareX/HotkeyManager.cs b/ShareX/HotkeyManager.cs index 52155bfa4..efa37f9f2 100644 --- a/ShareX/HotkeyManager.cs +++ b/ShareX/HotkeyManager.cs @@ -25,9 +25,7 @@ You should have received a copy of the GNU General Public License using ShareX.HelpersLib; using ShareX.Properties; -using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Windows.Forms; @@ -191,21 +189,10 @@ public void ShowFailedHotkeys() if (failedHotkeysList.Count > 0) { - string failedHotkeys = string.Join("\r\n", failedHotkeysList.Select(x => x.TaskSettings.ToString() + ": " + x.HotkeyInfo.ToString())); + string failedHotkeys = string.Join("\r\n", failedHotkeysList.Select(x => $"[{x.HotkeyInfo}] {x.TaskSettings}")); string hotkeyText = failedHotkeysList.Count > 1 ? Resources.HotkeyManager_ShowFailedHotkeys_hotkeys : Resources.HotkeyManager_ShowFailedHotkeys_hotkey; string text = string.Format(Resources.HotkeyManager_ShowFailedHotkeys_Unable_to_register_hotkey, hotkeyText, failedHotkeys); - string[] processNames = new string[] { "ShareX", "OneDrive", "Dropbox", "Greenshot", "ScreenshotCaptor", "FSCapture", "Snagit32", "puush", "Lightshot" }; - int ignoreProcess = Process.GetCurrentProcess().Id; - List conflictProcessNames = Process.GetProcesses().Where(x => x.Id != ignoreProcess && !string.IsNullOrEmpty(x.ProcessName) && - processNames.Any(x2 => x.ProcessName.Equals(x2, StringComparison.OrdinalIgnoreCase))). - Select(x => string.Format("{0} ({1})", x.MainModule.FileVersionInfo.ProductName, x.MainModule.ModuleName)).Distinct().ToList(); - - if (conflictProcessNames != null && conflictProcessNames.Count > 0) - { - text += "\r\n\r\n" + Resources.HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_ + "\r\n\r\n" + string.Join("\r\n", conflictProcessNames); - } - MessageBox.Show(text, "ShareX - " + Resources.HotkeyManager_ShowFailedHotkeys_Hotkey_registration_failed, MessageBoxButtons.OK, MessageBoxIcon.Warning); } } diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs index 77586fa6e..63275dc55 100644 --- a/ShareX/Properties/Resources.Designer.cs +++ b/ShareX/Properties/Resources.Designer.cs @@ -1683,15 +1683,6 @@ public static string HotkeyManager_ShowFailedHotkeys_hotkeys { } } - /// - /// Looks up a localized string similar to There may be an application conflict:. - /// - public static string HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_ { - get { - return ResourceManager.GetString("HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_", resourceCulture); - } - } - /// /// Looks up a localized string similar to Unable to register {0}: /// diff --git a/ShareX/Properties/Resources.de.resx b/ShareX/Properties/Resources.de.resx index d4f01a142..303fec4a5 100644 --- a/ShareX/Properties/Resources.de.resx +++ b/ShareX/Properties/Resources.de.resx @@ -141,9 +141,6 @@ Dateien hochladen - - Diese Anwendungen könnten die Benutzung vom ShareX stören: - Fehler diff --git a/ShareX/Properties/Resources.es-MX.resx b/ShareX/Properties/Resources.es-MX.resx index 8b91a9086..89150fcb2 100644 --- a/ShareX/Properties/Resources.es-MX.resx +++ b/ShareX/Properties/Resources.es-MX.resx @@ -265,9 +265,6 @@ Por favor seleccione un atajo de teclado diferente o salga de la aplicación que Coreano - - Alguna aplicación podría estar interfiriendo: - Separador diff --git a/ShareX/Properties/Resources.fr.resx b/ShareX/Properties/Resources.fr.resx index c58e875bf..8ed4c3720 100644 --- a/ShareX/Properties/Resources.fr.resx +++ b/ShareX/Properties/Resources.fr.resx @@ -160,9 +160,6 @@ Cliquez sur « Non » pour annuler la mise en ligne et désactiver la mise en li Mise en ligne de fichiers - - Ces applications pourraient être en conflit : - Erreur diff --git a/ShareX/Properties/Resources.he-IL.resx b/ShareX/Properties/Resources.he-IL.resx index 3a72b7967..8cf975fca 100644 --- a/ShareX/Properties/Resources.he-IL.resx +++ b/ShareX/Properties/Resources.he-IL.resx @@ -577,9 +577,6 @@ לחץ מקש ימני בעכבר כדי לפתוח את התפריט לחץ אמצעי לסגירה - - ייתכן שיש התנגשות באפליקציה: - רישום מקשי קיצור נכשל diff --git a/ShareX/Properties/Resources.id-ID.resx b/ShareX/Properties/Resources.id-ID.resx index 25806bb7b..ae9063b7a 100644 --- a/ShareX/Properties/Resources.id-ID.resx +++ b/ShareX/Properties/Resources.id-ID.resx @@ -266,9 +266,6 @@ Silakan pilih tombol cepat yang berbeda atau keluar dari aplikasi yang bertentan Bahasa Korea - - Mungkin ada konflik aplikasi: - Pemisah diff --git a/ShareX/Properties/Resources.it-IT.resx b/ShareX/Properties/Resources.it-IT.resx index b50fe38b6..420cc3b2f 100644 --- a/ShareX/Properties/Resources.it-IT.resx +++ b/ShareX/Properties/Resources.it-IT.resx @@ -262,9 +262,6 @@ Qui Seleziona una Scorciatoia... - - Potrebbe esserci un conflitto tra applicazioni: - Impossibile accedere al file "{0}". Esegui ShareX come amministratore per cambiare il percorso della cartella personale. diff --git a/ShareX/Properties/Resources.ja-JP.resx b/ShareX/Properties/Resources.ja-JP.resx index 60368a731..a1401de0d 100644 --- a/ShareX/Properties/Resources.ja-JP.resx +++ b/ShareX/Properties/Resources.ja-JP.resx @@ -272,9 +272,6 @@ スタートアップの設定はタスクマネージャーで無効にされています - - アプリケーションの競合: - 区切り線 diff --git a/ShareX/Properties/Resources.ko-KR.resx b/ShareX/Properties/Resources.ko-KR.resx index d87c45db3..efe2a3667 100644 --- a/ShareX/Properties/Resources.ko-KR.resx +++ b/ShareX/Properties/Resources.ko-KR.resx @@ -404,9 +404,6 @@ ShareX를 재시작할까요? 편집... - - 다른 어플리케이션과 단축키가 충돌하는 것 같습니다: - 포르투갈어 (브라질) diff --git a/ShareX/Properties/Resources.nl-NL.resx b/ShareX/Properties/Resources.nl-NL.resx index b2974653e..efc81b3d4 100644 --- a/ShareX/Properties/Resources.nl-NL.resx +++ b/ShareX/Properties/Resources.nl-NL.resx @@ -291,9 +291,6 @@ Wil je ShareX opnieuw opstarten? Upload bestanden - - Deze programma's kunnen conflicten veroorzaken: - Fout diff --git a/ShareX/Properties/Resources.pl.resx b/ShareX/Properties/Resources.pl.resx index d8cb55677..90445aeb9 100644 --- a/ShareX/Properties/Resources.pl.resx +++ b/ShareX/Properties/Resources.pl.resx @@ -542,9 +542,6 @@ Czy chcesz ponownie uruchomić ShareX? ShareX jest zminimalizowany do zasobnika systemowego. - - Może wystąpić konflikt aplikacji: - Tweet pomyślnie wysłany. diff --git a/ShareX/Properties/Resources.pt-BR.resx b/ShareX/Properties/Resources.pt-BR.resx index 34dc89a38..4a450d1b0 100644 --- a/ShareX/Properties/Resources.pt-BR.resx +++ b/ShareX/Properties/Resources.pt-BR.resx @@ -291,9 +291,6 @@ Gostaria de reiniciar agora? Enviar arquivos - - Estes aplicativos podem causar conflitos: - Erro diff --git a/ShareX/Properties/Resources.pt-PT.resx b/ShareX/Properties/Resources.pt-PT.resx index 1aa0b690f..c2fff7a0b 100644 --- a/ShareX/Properties/Resources.pt-PT.resx +++ b/ShareX/Properties/Resources.pt-PT.resx @@ -233,9 +233,6 @@ aqui teclas de atalho - - Estas aplicações podem causar conflitos: - Não foi possivel registar {0}: diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx index 4409bd2d8..c578cd8fa 100644 --- a/ShareX/Properties/Resources.resx +++ b/ShareX/Properties/Resources.resx @@ -1055,9 +1055,6 @@ Middle click to close ..\Resources\disk-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - There may be an application conflict: - ..\Resources\id.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/ShareX/Properties/Resources.ro.resx b/ShareX/Properties/Resources.ro.resx index 4ad597cbf..aa8364efe 100644 --- a/ShareX/Properties/Resources.ro.resx +++ b/ShareX/Properties/Resources.ro.resx @@ -335,9 +335,6 @@ aici taste rapide - - Este posibil să existe un conflict între aplicații: - Nu se poate înregistra {0}: diff --git a/ShareX/Properties/Resources.ru.resx b/ShareX/Properties/Resources.ru.resx index 3fa84066d..e546f6d1f 100644 --- a/ShareX/Properties/Resources.ru.resx +++ b/ShareX/Properties/Resources.ru.resx @@ -145,9 +145,6 @@ Загрузить файлы - - Эти приложения могут быть причиной конфликта: - Ошибка diff --git a/ShareX/Properties/Resources.tr.resx b/ShareX/Properties/Resources.tr.resx index c937a62c4..7db078e4d 100644 --- a/ShareX/Properties/Resources.tr.resx +++ b/ShareX/Properties/Resources.tr.resx @@ -160,9 +160,6 @@ Dosyaları yükle - - Bu uygulamalar çakışıyor olabilir: - Hata diff --git a/ShareX/Properties/Resources.uk.resx b/ShareX/Properties/Resources.uk.resx index 6356eb030..233e1362b 100644 --- a/ShareX/Properties/Resources.uk.resx +++ b/ShareX/Properties/Resources.uk.resx @@ -290,9 +290,6 @@ Корейська - - Можливий конфлікт програми: - Роздільник diff --git a/ShareX/Properties/Resources.vi-VN.resx b/ShareX/Properties/Resources.vi-VN.resx index 45d03ede8..58b3d371b 100644 --- a/ShareX/Properties/Resources.vi-VN.resx +++ b/ShareX/Properties/Resources.vi-VN.resx @@ -457,9 +457,6 @@ Nhấn "Không" để hủy tiến trình tải lên hiện tại và tắt ch Tự khởi động đã bị vô hiệu trong Task Manager - - Có thể đã có mâu thuẫn với một ứng dụng: - Nhấn chuột trái để kéo Nhấn chuột phải để mở menu diff --git a/ShareX/Properties/Resources.zh-CN.resx b/ShareX/Properties/Resources.zh-CN.resx index 7bf5a7b8e..2dd2cc3a1 100644 --- a/ShareX/Properties/Resources.zh-CN.resx +++ b/ShareX/Properties/Resources.zh-CN.resx @@ -291,9 +291,6 @@ 上传文件 - - 可能存在程序冲突： - 错误 diff --git a/ShareX/Properties/Resources.zh-TW.resx b/ShareX/Properties/Resources.zh-TW.resx index 1181ae428..b78ce181f 100644 --- a/ShareX/Properties/Resources.zh-TW.resx +++ b/ShareX/Properties/Resources.zh-TW.resx @@ -291,9 +291,6 @@ 上傳檔案 - - 可能有應用程式衝突： - 錯誤