resolve conflict, translation preferred over English

Author: jjw24

.github/actions/spelling/allow.txt

@@ -6,3 +6,6 @@ runcount
 Firefox
 Português
 Português (Brasil)
+favicons
+moz
+workaround

.github/actions/spelling/expect.txt

@@ -104,12 +104,7 @@ metadatas
 WMP
 VSTHRD
 CJK
-XiaoHe
-ZiRanMa
-WeiRuan
-ZhiNengABC
-ZiGuangPinYin
-PinYinJiaJia
-XingKongJianDao
-DaNiu
-XiaoLang
+Msix
+dummyprofile
+browserbookmark
+copyurl

.github/actions/spelling/patterns.txt

@@ -124,6 +124,10 @@
 # version suffix <word>v#
 (?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
 
+# Non-English
+[a-zA-Z]*[ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*
+
+
 \bjjw24\b
 \bappref-ms\b
 \bTobiasSekan\b
@@ -134,3 +138,13 @@
 \bčeština\b
 \bPortuguês\b
 \bIoc\b
+\bXiao\s*He\b
+\bZi\s*Ran\s*Ma\b
+\bWei\s*Ruan\b
+\bZhi\s*Neng\s*ABC\b
+\bZi\s*Guang\s*Pin\s*Yin\b
+\bPin\s*Yin\s*Jia\s*Jia\b
+\bXing\s*Kong\s*Jian\s*Dao\b
+\bDa\s*Niu\b
+\bXiao\s*Lang\b
+\b[Ss]ettings [Ss]ettings\b

.github/workflows/default_plugins.yml

@@ -10,11 +10,11 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 9.0.x
 
       - name: Update Plugins To Production Version
         run: |
@@ -42,7 +42,7 @@ jobs:
 
       - name: Build BrowserBookmark
         run: |
-          dotnet publish 'Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj' --framework net7.0-windows  -c Release -o "Flow.Launcher.Plugin.BrowserBookmark"
+          dotnet publish 'Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj' --framework net9.0-windows  -c Release -o "Flow.Launcher.Plugin.BrowserBookmark"
           7z a -tzip "Flow.Launcher.Plugin.BrowserBookmark.zip" "./Flow.Launcher.Plugin.BrowserBookmark/*"
           rm -r "Flow.Launcher.Plugin.BrowserBookmark"
 
@@ -66,7 +66,7 @@ jobs:
 
       - name: Build Calculator
         run: |
-          dotnet publish 'Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj' --framework net7.0-windows  -c Release -o "Flow.Launcher.Plugin.Calculator"
+          dotnet publish 'Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj' --framework net9.0-windows  -c Release -o "Flow.Launcher.Plugin.Calculator"
           7z a -tzip "Flow.Launcher.Plugin.Calculator.zip" "./Flow.Launcher.Plugin.Calculator/*"
           rm -r "Flow.Launcher.Plugin.Calculator"
 
@@ -90,7 +90,7 @@ jobs:
 
       - name: Build Explorer
         run: |
-          dotnet publish 'Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj' --framework net7.0-windows  -c Release -o "Flow.Launcher.Plugin.Explorer"
+          dotnet publish 'Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj' --framework net9.0-windows  -c Release -o "Flow.Launcher.Plugin.Explorer"
           7z a -tzip "Flow.Launcher.Plugin.Explorer.zip" "./Flow.Launcher.Plugin.Explorer/*"
           rm -r "Flow.Launcher.Plugin.Explorer"
 
@@ -114,7 +114,7 @@ jobs:
 
       - name: Build PluginIndicator
         run: |
-          dotnet publish 'Plugins/Flow.Launcher.Plugin.PluginIndicator/Flow.Launcher.Plugin.PluginIndicator.csproj' --framework net7.0-windows  -c Release -o "Flow.Launcher.Plugin.PluginIndicator"
+          dotnet publish 'Plugins/Flow.Launcher.Plugin.PluginIndicator/Flow.Launcher.Plugin.PluginIndicator.csproj' --framework net9.0-windows  -c Release -o "Flow.Launcher.Plugin.PluginIndicator"
           7z a -tzip "Flow.Launcher.Plugin.PluginIndicator.zip" "./Flow.Launcher.Plugin.PluginIndicator/*"
           rm -r "Flow.Launcher.Plugin.PluginIndicator"
 
@@ -138,7 +138,7 @@ jobs:
 
       - name: Build PluginsManager
         run: |
-          dotnet publish 'Plugins/Flow.Launcher.Plugin.PluginsManager/Flow.Launcher.Plugin.PluginsManager.csproj' --framework net7.0-windows  -c Release -o "Flow.Launcher.Plugin.PluginsManager"
+          dotnet publish 'Plugins/Flow.Launcher.Plugin.PluginsManager/Flow.Launcher.Plugin.PluginsManager.csproj' --framework net9.0-windows  -c Release -o "Flow.Launcher.Plugin.PluginsManager"
           7z a -tzip "Flow.Launcher.Plugin.PluginsManager.zip" "./Flow.Launcher.Plugin.PluginsManager/*"
           rm -r "Flow.Launcher.Plugin.PluginsManager"
 
@@ -162,7 +162,7 @@ jobs:
 
       - name: Build ProcessKiller
         run: |
-          dotnet publish 'Plugins/Flow.Launcher.Plugin.ProcessKiller/Flow.Launcher.Plugin.ProcessKiller.csproj' --framework net7.0-windows  -c Release -o "Flow.Launcher.Plugin.ProcessKiller"
+          dotnet publish 'Plugins/Flow.Launcher.Plugin.ProcessKiller/Flow.Launcher.Plugin.ProcessKiller.csproj' --framework net9.0-windows  -c Release -o "Flow.Launcher.Plugin.ProcessKiller"
           7z a -tzip "Flow.Launcher.Plugin.ProcessKiller.zip" "./Flow.Launcher.Plugin.ProcessKiller/*"
           rm -r "Flow.Launcher.Plugin.ProcessKiller"
 
@@ -186,7 +186,7 @@ jobs:
 
       - name: Build Program
         run: |
-          dotnet publish 'Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj' --framework net7.0-windows10.0.19041.0  -c Release -o "Flow.Launcher.Plugin.Program"
+          dotnet publish 'Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj' --framework net9.0-windows10.0.19041.0  -c Release -o "Flow.Launcher.Plugin.Program"
           7z a -tzip "Flow.Launcher.Plugin.Program.zip" "./Flow.Launcher.Plugin.Program/*"
           rm -r "Flow.Launcher.Plugin.Program"
 
@@ -210,7 +210,7 @@ jobs:
 
       - name: Build Shell
         run: |
-          dotnet publish 'Plugins/Flow.Launcher.Plugin.Shell/Flow.Launcher.Plugin.Shell.csproj' --framework net7.0-windows  -c Release -o "Flow.Launcher.Plugin.Shell"
+          dotnet publish 'Plugins/Flow.Launcher.Plugin.Shell/Flow.Launcher.Plugin.Shell.csproj' --framework net9.0-windows  -c Release -o "Flow.Launcher.Plugin.Shell"
           7z a -tzip "Flow.Launcher.Plugin.Shell.zip" "./Flow.Launcher.Plugin.Shell/*"
           rm -r "Flow.Launcher.Plugin.Shell"
 
@@ -234,7 +234,7 @@ jobs:
 
       - name: Build Sys
         run: |
-          dotnet publish 'Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj' --framework net7.0-windows  -c Release -o "Flow.Launcher.Plugin.Sys"
+          dotnet publish 'Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj' --framework net9.0-windows  -c Release -o "Flow.Launcher.Plugin.Sys"
           7z a -tzip "Flow.Launcher.Plugin.Sys.zip" "./Flow.Launcher.Plugin.Sys/*"
           rm -r "Flow.Launcher.Plugin.Sys"
 
@@ -258,7 +258,7 @@ jobs:
 
       - name: Build Url
         run: |
-          dotnet publish 'Plugins/Flow.Launcher.Plugin.Url/Flow.Launcher.Plugin.Url.csproj' --framework net7.0-windows  -c Release -o "Flow.Launcher.Plugin.Url"
+          dotnet publish 'Plugins/Flow.Launcher.Plugin.Url/Flow.Launcher.Plugin.Url.csproj' --framework net9.0-windows  -c Release -o "Flow.Launcher.Plugin.Url"
           7z a -tzip "Flow.Launcher.Plugin.Url.zip" "./Flow.Launcher.Plugin.Url/*"
           rm -r "Flow.Launcher.Plugin.Url"
 
@@ -282,7 +282,7 @@ jobs:
 
       - name: Build WebSearch
         run: |
-          dotnet publish 'Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj' --framework net7.0-windows  -c Release -o "Flow.Launcher.Plugin.WebSearch"
+          dotnet publish 'Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj' --framework net9.0-windows  -c Release -o "Flow.Launcher.Plugin.WebSearch"
           7z a -tzip "Flow.Launcher.Plugin.WebSearch.zip" "./Flow.Launcher.Plugin.WebSearch/*"
           rm -r "Flow.Launcher.Plugin.WebSearch"
 
@@ -306,7 +306,7 @@ jobs:
 
       - name: Build WindowsSettings
         run: |
-          dotnet publish 'Plugins/Flow.Launcher.Plugin.WindowsSettings/Flow.Launcher.Plugin.WindowsSettings.csproj' --framework net7.0-windows  -c Release -o "Flow.Launcher.Plugin.WindowsSettings"
+          dotnet publish 'Plugins/Flow.Launcher.Plugin.WindowsSettings/Flow.Launcher.Plugin.WindowsSettings.csproj' --framework net9.0-windows  -c Release -o "Flow.Launcher.Plugin.WindowsSettings"
           7z a -tzip "Flow.Launcher.Plugin.WindowsSettings.zip" "./Flow.Launcher.Plugin.WindowsSettings/*"
           rm -r "Flow.Launcher.Plugin.WindowsSettings"
 

.github/workflows/dotnet.yml

@@ -20,7 +20,7 @@ jobs:
       NUGET_CERT_REVOCATION_MODE: offline
       BUILD_NUMBER: ${{ github.run_number }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set Flow.Launcher.csproj version
         id: update
         uses: vers-one/[email protected]
@@ -31,7 +31,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 9.0.x
 #          cache: true
 #          cache-dependency-path: |
 #            Flow.Launcher/packages.lock.json

.github/workflows/release_pr.yml

@@ -11,7 +11,7 @@ jobs:
   update-pr:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: actions/setup-python@v5
         with:

.github/workflows/spelling.yml

@@ -72,7 +72,7 @@ jobs:
     steps:
     - name: check-spelling
       id: spelling
-      uses: check-spelling/check-spelling@prerelease
+      uses: check-spelling/check-spelling@v0.0.25
       with:
         suppress_push_for_open_pull_request: 1
         checkout: true
@@ -128,7 +128,7 @@ jobs:
     if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
     steps:
     - name: comment
-      uses: check-spelling/check-spelling@prerelease
+      uses: check-spelling/check-spelling@v0.0.25
       with:
         checkout: true
         spell_check_this: check-spelling/spell-check-this@main

Directory.Build.props

@@ -1,5 +1,7 @@
 <Project>
   <PropertyGroup>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
+    <!-- Work around https://github.com/dotnet/runtime/issues/109682 -->
+    <CETCompat>false</CETCompat>
   </PropertyGroup>
 </Project>

Flow.Launcher.Core/Configuration/Portable.cs

@@ -45,8 +45,7 @@ public void DisablePortableMode()
 #endif
                 IndicateDeletion(DataLocation.PortableDataPath);
 
-                API.ShowMsgBox("Flow Launcher needs to restart to finish disabling portable mode, " +
-                    "after the restart your portable data profile will be deleted and roaming data profile kept");
+                API.ShowMsgBox(API.GetTranslation("restartToDisablePortableMode"));
 
                 UpdateManager.RestartApp(Constant.ApplicationFileName);
             }
@@ -69,8 +68,7 @@ public void EnablePortableMode()
 #endif
                 IndicateDeletion(DataLocation.RoamingDataPath);
 
-                API.ShowMsgBox("Flow Launcher needs to restart to finish enabling portable mode, " +
-                    "after the restart your roaming data profile will be deleted and portable data profile kept");
+                API.ShowMsgBox(API.GetTranslation("restartToEnablePortableMode"));
 
                 UpdateManager.RestartApp(Constant.ApplicationFileName);
             }
@@ -154,9 +152,8 @@ public void PreStartCleanUpAfterPortabilityUpdate()
             {
                 FilesFolders.RemoveFolderIfExists(roamingDataDir, (s) => API.ShowMsgBox(s));
 
-                if (API.ShowMsgBox("Flow Launcher has detected you enabled portable mode, " +
-                                    "would you like to move it to a different location?", string.Empty,
-                                    MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+                if (API.ShowMsgBox(API.GetTranslation("moveToDifferentLocation"), 
+                    string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.Yes)
                 {
                     FilesFolders.OpenPath(Constant.RootDirectory, (s) => API.ShowMsgBox(s));
 
@@ -169,8 +166,7 @@ public void PreStartCleanUpAfterPortabilityUpdate()
             {
                 FilesFolders.RemoveFolderIfExists(portableDataDir, (s) => API.ShowMsgBox(s));
 
-                API.ShowMsgBox("Flow Launcher has detected you disabled portable mode, " +
-                                    "the relevant shortcuts and uninstaller entry have been created");
+                API.ShowMsgBox(API.GetTranslation("shortcutsUninstallerCreated"));
             }
         }
 
@@ -181,9 +177,8 @@ public bool CanUpdatePortability()
 
             if (roamingLocationExists && portableLocationExists)
             {
-                API.ShowMsgBox(string.Format("Flow Launcher detected your user data exists both in {0} and " +
-                                    "{1}. {2}{2}Please delete {1} in order to proceed. No changes have occurred.", 
-                                    DataLocation.PortableDataPath, DataLocation.RoamingDataPath, Environment.NewLine));
+                API.ShowMsgBox(string.Format(API.GetTranslation("userDataDuplicated"), 
+                    DataLocation.PortableDataPath, DataLocation.RoamingDataPath, Environment.NewLine));
 
                 return false;
             }

Flow.Launcher.Core/ExternalPlugins/Environments/PythonEnvironment.cs

@@ -11,6 +11,8 @@ namespace Flow.Launcher.Core.ExternalPlugins.Environments
 {
     internal class PythonEnvironment : AbstractPluginEnvironment
     {
+        private static readonly string ClassName = nameof(PythonEnvironment);
+
         internal override string Language => AllowedLanguage.Python;
 
         internal override string EnvName => DataLocation.PythonEnvironmentName;
@@ -39,9 +41,20 @@ internal override void InstallEnvironment()
 
             // Python 3.11.4 is no longer Windows 7 compatible. If user is on Win 7 and
             // uses Python plugin they need to custom install and use v3.8.9
-            JTF.Run(() => DroplexPackage.Drop(App.python_3_11_4_embeddable, InstallPath));
+            JTF.Run(async () =>
+            {
+                try
+                {
+                    await DroplexPackage.Drop(App.python_3_11_4_embeddable, InstallPath);
 
-            PluginsSettingsFilePath = ExecutablePath;
+                    PluginsSettingsFilePath = ExecutablePath;
+                }
+                catch (System.Exception e)
+                {
+                    API.ShowMsgError(API.GetTranslation("failToInstallPythonEnv"));
+                    API.LogException(ClassName, "Failed to install Python environment", e);
+                }
+            });
         }
 
         internal override PluginPair CreatePluginPair(string filePath, PluginMetadata metadata)