Skip to content

Commit 5a76084

Browse files
Jack251970Jack251970
authored
Merge branch 'dev' into dependency_injection_code_quality
2 parents a6e99bb + eb2a24d commit 5a76084

File tree

155 files changed

+2707
-1808
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+2707
-1808
lines changed

‎Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
</ItemGroup>
6767

6868
<ItemGroup>
69-
<PackageReference Include="Fody" Version="6.5.4">
69+
<PackageReference Include="Fody" Version="6.5.5">
7070
<PrivateAssets>all</PrivateAssets>
7171
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7272
</PackageReference>

‎Flow.Launcher/Flow.Launcher.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<ItemGroup>
8686
<PackageReference Include="ChefKeys" Version="0.1.2" />
8787
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
88-
<PackageReference Include="Fody" Version="6.5.4">
88+
<PackageReference Include="Fody" Version="6.5.5">
8989
<PrivateAssets>all</PrivateAssets>
9090
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
9191
</PackageReference>

‎Flow.Launcher/Languages/ar.xaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
<!-- MainWindow -->
1515
<system:String x:Key="registerHotkeyFailed">فشل في تسجيل مفتاح التشغيل السريع &quot;{0}&quot;. قد يكون المفتاح مستخدمًا من قبل برنامج آخر. قم بتغيير المفتاح، أو قم بإغلاق البرنامج الآخر.</system:String>
16+
<system:String x:Key="unregisterHotkeyFailed">Failed to unregister hotkey &quot;{0}&quot;. Please try again or see log for details</system:String>
1617
<system:String x:Key="MessageBoxTitle">Flow Launcher</system:String>
1718
<system:String x:Key="couldnotStartCmd">تعذر بدء {0}</system:String>
1819
<system:String x:Key="invalidFlowLauncherPluginFileFormat">تنسيق ملف إضافة Flow Launcher غير صالح</system:String>
@@ -44,6 +45,8 @@
4445
<system:String x:Key="portableMode">وضع المحمول</system:String>
4546
<system:String x:Key="portableModeToolTIp">تخزين جميع الإعدادات وبيانات المستخدم في مجلد واحد (مفيد عند استخدام الأقراص القابلة للإزالة أو الخدمات السحابية).</system:String>
4647
<system:String x:Key="startFlowLauncherOnSystemStartup">تشغيل Flow Launcher عند بدء تشغيل النظام</system:String>
48+
<system:String x:Key="useLogonTaskForStartup">Use logon task instead of startup entry for faster startup experience</system:String>
49+
<system:String x:Key="useLogonTaskForStartupTooltip">After uninstallation, you need to manually remove this task (Flow.Launcher Startup) via Task Scheduler</system:String>
4750
<system:String x:Key="setAutoStartFailed">خطأ في إعداد التشغيل عند بدء التشغيل</system:String>
4851
<system:String x:Key="hideFlowLauncherWhenLoseFocus">إخفاء Flow Launcher عند فقدان التركيز</system:String>
4952
<system:String x:Key="dontPromptUpdateMsg">عدم عرض إشعارات الإصدار الجديد</system:String>
@@ -126,7 +129,8 @@
126129
<system:String x:Key="plugin_query_version">الإصدار</system:String>
127130
<system:String x:Key="plugin_query_web">الموقع الإلكتروني</system:String>
128131
<system:String x:Key="plugin_uninstall">إلغاء التثبيت</system:String>
129-
132+
<system:String x:Key="failedToRemovePluginSettingsTitle">Fail to remove plugin settings</system:String>
133+
<system:String x:Key="failedToRemovePluginSettingsMessage">Plugins: {0} - Fail to remove plugin settings files, please remove them manually</system:String>
130134

131135
<!-- Setting Plugin Store -->
132136
<system:String x:Key="pluginStore">متجر الإضافات</system:String>
@@ -143,8 +147,6 @@
143147
<system:String x:Key="LabelNewToolTip">تم تحديث هذه الإضافة في آخر 7 أيام</system:String>
144148
<system:String x:Key="LabelUpdateToolTip">يتوفر تحديث جديد</system:String>
145149

146-
147-
148150
<!-- Setting Theme -->
149151
<system:String x:Key="theme">السمة</system:String>
150152
<system:String x:Key="appearance">المظهر</system:String>
@@ -194,7 +196,6 @@
194196
<system:String x:Key="TypeIsDarkToolTip">هذه السمة تدعم الوضعين (فاتح/داكن).</system:String>
195197
<system:String x:Key="TypeHasBlurToolTip">هذه السمة تدعم الخلفية الضبابية الشفافة.</system:String>
196198

197-
198199
<!-- Setting Hotkey -->
199200
<system:String x:Key="hotkey">مفتاح الاختصار</system:String>
200201
<system:String x:Key="hotkeys">مفاتيح الاختصار</system:String>
@@ -297,6 +298,9 @@
297298
<system:String x:Key="userdatapath">موقع بيانات المستخدم</system:String>
298299
<system:String x:Key="userdatapathToolTip">يتم حفظ إعدادات المستخدم والإضافات المثبتة في مجلد بيانات المستخدم. قد يختلف هذا الموقع اعتمادًا على ما إذا كان في وضع النقل أم لا.</system:String>
299300
<system:String x:Key="userdatapathButton">فتح المجلد</system:String>
301+
<system:String x:Key="logLevel">Log Level</system:String>
302+
<system:String x:Key="LogLevelDEBUG">Debug</system:String>
303+
<system:String x:Key="LogLevelINFO">Info</system:String>
300304

301305
<!-- FileManager Setting Dialog -->
302306
<system:String x:Key="fileManagerWindow">اختر مدير الملفات</system:String>
@@ -367,6 +371,7 @@
367371
<system:String x:Key="commonOK">حسناً</system:String>
368372
<system:String x:Key="commonYes">نعم</system:String>
369373
<system:String x:Key="commonNo">لا</system:String>
374+
<system:String x:Key="commonBackground">الخلفية</system:String>
370375

371376
<!-- Crash Reporter -->
372377
<system:String x:Key="reportWindow_version">الإصدار</system:String>
@@ -383,6 +388,9 @@
383388
<system:String x:Key="reportWindow_report_succeed">تم إرسال التقرير بنجاح</system:String>
384389
<system:String x:Key="reportWindow_report_failed">فشل في إرسال التقرير</system:String>
385390
<system:String x:Key="reportWindow_flowlauncher_got_an_error">حدث خطأ في Flow Launcher</system:String>
391+
<system:String x:Key="reportWindow_please_open_issue">Please open new issue in</system:String>
392+
<system:String x:Key="reportWindow_upload_log">1. Upload log file: {0}</system:String>
393+
<system:String x:Key="reportWindow_copy_below">2. Copy below exception message</system:String>
386394

387395
<!-- General Notice -->
388396
<system:String x:Key="pleaseWait">يرجى الانتظار...</system:String>

‎Flow.Launcher/Languages/cs.xaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
<!-- MainWindow -->
1515
<system:String x:Key="registerHotkeyFailed">Nepodařilo se zaregistrovat hotkey &quot;{0}&quot;. Klávesová zkratka může být používána jiným programem. Změňte na jinou klávesu nebo ukončíte jiný program.</system:String>
16+
<system:String x:Key="unregisterHotkeyFailed">Failed to unregister hotkey &quot;{0}&quot;. Please try again or see log for details</system:String>
1617
<system:String x:Key="MessageBoxTitle">Flow Launcher</system:String>
1718
<system:String x:Key="couldnotStartCmd">Nepodařilo se spustit {0}</system:String>
1819
<system:String x:Key="invalidFlowLauncherPluginFileFormat">Neplatný typ souboru pluginu aplikace Flow Launcher</system:String>
@@ -44,6 +45,8 @@
4445
<system:String x:Key="portableMode">Přenosný režim</system:String>
4546
<system:String x:Key="portableModeToolTIp">Ukládat všechna nastavení a uživatelská data v jedné složce (Užitečné při užití s přenosnými zařízeními).</system:String>
4647
<system:String x:Key="startFlowLauncherOnSystemStartup">Spustit Flow Launcher při spuštění systému</system:String>
48+
<system:String x:Key="useLogonTaskForStartup">Use logon task instead of startup entry for faster startup experience</system:String>
49+
<system:String x:Key="useLogonTaskForStartupTooltip">After uninstallation, you need to manually remove this task (Flow.Launcher Startup) via Task Scheduler</system:String>
4750
<system:String x:Key="setAutoStartFailed">Při nastavování spouštění došlo k chybě</system:String>
4851
<system:String x:Key="hideFlowLauncherWhenLoseFocus">Skrýt Flow Launcher při vykliknutí</system:String>
4952
<system:String x:Key="dontPromptUpdateMsg">Nezobrazovat oznámení o nové verzi</system:String>
@@ -126,7 +129,8 @@
126129
<system:String x:Key="plugin_query_version">Verze</system:String>
127130
<system:String x:Key="plugin_query_web">Webová stránka</system:String>
128131
<system:String x:Key="plugin_uninstall">Odinstalovat</system:String>
129-
132+
<system:String x:Key="failedToRemovePluginSettingsTitle">Fail to remove plugin settings</system:String>
133+
<system:String x:Key="failedToRemovePluginSettingsMessage">Plugins: {0} - Fail to remove plugin settings files, please remove them manually</system:String>
130134

131135
<!-- Setting Plugin Store -->
132136
<system:String x:Key="pluginStore">Obchod s pluginy</system:String>
@@ -143,8 +147,6 @@
143147
<system:String x:Key="LabelNewToolTip">Tento plugin byl aktualizován během posledních 7 dní</system:String>
144148
<system:String x:Key="LabelUpdateToolTip">Nová aktualizace je k dispozici</system:String>
145149

146-
147-
148150
<!-- Setting Theme -->
149151
<system:String x:Key="theme">Motiv</system:String>
150152
<system:String x:Key="appearance">Vzhled</system:String>
@@ -194,7 +196,6 @@
194196
<system:String x:Key="TypeIsDarkToolTip">This theme supports two(light/dark) modes.</system:String>
195197
<system:String x:Key="TypeHasBlurToolTip">This theme supports Blur Transparent Background.</system:String>
196198

197-
198199
<!-- Setting Hotkey -->
199200
<system:String x:Key="hotkey">Klávesová zkratka</system:String>
200201
<system:String x:Key="hotkeys">Klávesové zkratky</system:String>
@@ -297,6 +298,9 @@
297298
<system:String x:Key="userdatapath">User Data Location</system:String>
298299
<system:String x:Key="userdatapathToolTip">User settings and installed plugins are saved in the user data folder. This location may vary depending on whether it's in portable mode or not.</system:String>
299300
<system:String x:Key="userdatapathButton">Open Folder</system:String>
301+
<system:String x:Key="logLevel">Log Level</system:String>
302+
<system:String x:Key="LogLevelDEBUG">Debug</system:String>
303+
<system:String x:Key="LogLevelINFO">Info</system:String>
300304

301305
<!-- FileManager Setting Dialog -->
302306
<system:String x:Key="fileManagerWindow">Vybrat správce souborů</system:String>
@@ -367,6 +371,7 @@ Pokud před zkratku při zadávání přidáte znak &quot;@&quot;, bude odpovíd
367371
<system:String x:Key="commonOK">Dobře</system:String>
368372
<system:String x:Key="commonYes">Yes</system:String>
369373
<system:String x:Key="commonNo">No</system:String>
374+
<system:String x:Key="commonBackground">Pozadí</system:String>
370375

371376
<!-- Crash Reporter -->
372377
<system:String x:Key="reportWindow_version">Verze</system:String>
@@ -383,6 +388,9 @@ Pokud před zkratku při zadávání přidáte znak &quot;@&quot;, bude odpovíd
383388
<system:String x:Key="reportWindow_report_succeed">Hlášení bylo úspěšně odesláno</system:String>
384389
<system:String x:Key="reportWindow_report_failed">Nepodařilo se odeslat hlášení</system:String>
385390
<system:String x:Key="reportWindow_flowlauncher_got_an_error">Flow Launcher zaznamenal chybu</system:String>
391+
<system:String x:Key="reportWindow_please_open_issue">Please open new issue in</system:String>
392+
<system:String x:Key="reportWindow_upload_log">1. Upload log file: {0}</system:String>
393+
<system:String x:Key="reportWindow_copy_below">2. Copy below exception message</system:String>
386394

387395
<!-- General Notice -->
388396
<system:String x:Key="pleaseWait">Počkejte prosím...</system:String>

‎Flow.Launcher/Languages/da.xaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
<!-- MainWindow -->
1515
<system:String x:Key="registerHotkeyFailed">Failed to register hotkey &quot;{0}&quot;. The hotkey may be in use by another program. Change to a different hotkey, or exit another program.</system:String>
16+
<system:String x:Key="unregisterHotkeyFailed">Failed to unregister hotkey &quot;{0}&quot;. Please try again or see log for details</system:String>
1617
<system:String x:Key="MessageBoxTitle">Flow Launcher</system:String>
1718
<system:String x:Key="couldnotStartCmd">Kunne ikke starte {0}</system:String>
1819
<system:String x:Key="invalidFlowLauncherPluginFileFormat">Ugyldigt Flow Launcher plugin filformat</system:String>
@@ -44,6 +45,8 @@
4445
<system:String x:Key="portableMode">Portable Mode</system:String>
4546
<system:String x:Key="portableModeToolTIp">Store all settings and user data in one folder (Useful when used with removable drives or cloud services).</system:String>
4647
<system:String x:Key="startFlowLauncherOnSystemStartup">Start Flow Launcher ved system start</system:String>
48+
<system:String x:Key="useLogonTaskForStartup">Use logon task instead of startup entry for faster startup experience</system:String>
49+
<system:String x:Key="useLogonTaskForStartupTooltip">After uninstallation, you need to manually remove this task (Flow.Launcher Startup) via Task Scheduler</system:String>
4750
<system:String x:Key="setAutoStartFailed">Error setting launch on startup</system:String>
4851
<system:String x:Key="hideFlowLauncherWhenLoseFocus">Skjul Flow Launcher ved mistet fokus</system:String>
4952
<system:String x:Key="dontPromptUpdateMsg">Vis ikke notifikationer om nye versioner</system:String>
@@ -126,7 +129,8 @@
126129
<system:String x:Key="plugin_query_version">Version</system:String>
127130
<system:String x:Key="plugin_query_web">Website</system:String>
128131
<system:String x:Key="plugin_uninstall">Uninstall</system:String>
129-
132+
<system:String x:Key="failedToRemovePluginSettingsTitle">Fail to remove plugin settings</system:String>
133+
<system:String x:Key="failedToRemovePluginSettingsMessage">Plugins: {0} - Fail to remove plugin settings files, please remove them manually</system:String>
130134

131135
<!-- Setting Plugin Store -->
132136
<system:String x:Key="pluginStore">Plugin Store</system:String>
@@ -143,8 +147,6 @@
143147
<system:String x:Key="LabelNewToolTip">This plugin has been updated within the last 7 days</system:String>
144148
<system:String x:Key="LabelUpdateToolTip">New Update is Available</system:String>
145149

146-
147-
148150
<!-- Setting Theme -->
149151
<system:String x:Key="theme">Tema</system:String>
150152
<system:String x:Key="appearance">Appearance</system:String>
@@ -194,7 +196,6 @@
194196
<system:String x:Key="TypeIsDarkToolTip">This theme supports two(light/dark) modes.</system:String>
195197
<system:String x:Key="TypeHasBlurToolTip">This theme supports Blur Transparent Background.</system:String>
196198

197-
198199
<!-- Setting Hotkey -->
199200
<system:String x:Key="hotkey">Genvejstast</system:String>
200201
<system:String x:Key="hotkeys">Genvejstast</system:String>
@@ -297,6 +298,9 @@
297298
<system:String x:Key="userdatapath">User Data Location</system:String>
298299
<system:String x:Key="userdatapathToolTip">User settings and installed plugins are saved in the user data folder. This location may vary depending on whether it's in portable mode or not.</system:String>
299300
<system:String x:Key="userdatapathButton">Open Folder</system:String>
301+
<system:String x:Key="logLevel">Log Level</system:String>
302+
<system:String x:Key="LogLevelDEBUG">Debug</system:String>
303+
<system:String x:Key="LogLevelINFO">Info</system:String>
300304

301305
<!-- FileManager Setting Dialog -->
302306
<system:String x:Key="fileManagerWindow">Select File Manager</system:String>
@@ -367,6 +371,7 @@ If you add an '@' prefix while inputting a shortcut, it matches any position in
367371
<system:String x:Key="commonOK">OK</system:String>
368372
<system:String x:Key="commonYes">Yes</system:String>
369373
<system:String x:Key="commonNo">No</system:String>
374+
<system:String x:Key="commonBackground">Background</system:String>
370375

371376
<!-- Crash Reporter -->
372377
<system:String x:Key="reportWindow_version">Version</system:String>
@@ -383,6 +388,9 @@ If you add an '@' prefix while inputting a shortcut, it matches any position in
383388
<system:String x:Key="reportWindow_report_succeed">Rapport sendt korrekt</system:String>
384389
<system:String x:Key="reportWindow_report_failed">Kunne ikke sende rapport</system:String>
385390
<system:String x:Key="reportWindow_flowlauncher_got_an_error">Flow Launcher fik en fejl</system:String>
391+
<system:String x:Key="reportWindow_please_open_issue">Please open new issue in</system:String>
392+
<system:String x:Key="reportWindow_upload_log">1. Upload log file: {0}</system:String>
393+
<system:String x:Key="reportWindow_copy_below">2. Copy below exception message</system:String>
386394

387395
<!-- General Notice -->
388396
<system:String x:Key="pleaseWait">Please wait...</system:String>

0 commit comments

Comments
 (0)