Skip to content

Commit 3c2581d

Browse files
VictoriousRaptorVictoriousRaptor
authored
Merge branch 'dev' into double-pin
2 parents 31cd894 + 1415df2 commit 3c2581d

Some content is hidden

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

79 files changed

+716
-193
lines changed

‎Flow.Launcher/Languages/ar.xaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@
136136
<system:String x:Key="historyResultsForHomePage">Show History Results in Home Page</system:String>
137137
<system:String x:Key="historyResultsCountForHomePage">Maximum History Results Shown in Home Page</system:String>
138138
<system:String x:Key="homeToggleBoxToolTip">This can only be edited if plugin supports Home feature and Home Page is enabled.</system:String>
139+
<system:String x:Key="showAtTopmost">Show Search Window at Topmost</system:String>
140+
<system:String x:Key="showAtTopmostToolTip">Show search window above other windows</system:String>
139141

140142
<!-- Setting Plugin -->
141143
<system:String x:Key="searchplugin">البحث عن إضافة</system:String>
@@ -370,6 +372,13 @@
370372
<system:String x:Key="LogLevelINFO">Info</system:String>
371373
<system:String x:Key="settingWindowFontTitle">Setting Window Font</system:String>
372374

375+
<!-- Release Notes Window -->
376+
<system:String x:Key="seeMoreReleaseNotes">See more release notes on GitHub</system:String>
377+
<system:String x:Key="checkNetworkConnectionTitle">Failed to fetch release notes</system:String>
378+
<system:String x:Key="checkNetworkConnectionSubTitle">Please check your network connection or ensure GitHub is accessible</system:String>
379+
<system:String x:Key="appUpdateTitle">Flow Launcher has been updated to {0}</system:String>
380+
<system:String x:Key="appUpdateButtonContent">Click here to view the release notes</system:String>
381+
373382
<!-- FileManager Setting Dialog -->
374383
<system:String x:Key="fileManagerWindow">اختر مدير الملفات</system:String>
375384
<system:String x:Key="fileManager_learnMore">Learn more</system:String>
@@ -480,6 +489,7 @@
480489
</system:String>
481490
<system:String x:Key="errorTitle">خطأ</system:String>
482491
<system:String x:Key="folderOpenError">An error occurred while opening the folder. {0}</system:String>
492+
<system:String x:Key="browserOpenError">An error occurred while opening the URL in the browser. Please check your Default Web Browser configuration in the General section of the settings window</system:String>
483493

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

‎Flow.Launcher/Languages/cs.xaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@
136136
<system:String x:Key="historyResultsForHomePage">Show History Results in Home Page</system:String>
137137
<system:String x:Key="historyResultsCountForHomePage">Maximum History Results Shown in Home Page</system:String>
138138
<system:String x:Key="homeToggleBoxToolTip">This can only be edited if plugin supports Home feature and Home Page is enabled.</system:String>
139+
<system:String x:Key="showAtTopmost">Show Search Window at Topmost</system:String>
140+
<system:String x:Key="showAtTopmostToolTip">Show search window above other windows</system:String>
139141

140142
<!-- Setting Plugin -->
141143
<system:String x:Key="searchplugin">Vyhledat plugin</system:String>
@@ -370,6 +372,13 @@
370372
<system:String x:Key="LogLevelINFO">Info</system:String>
371373
<system:String x:Key="settingWindowFontTitle">Setting Window Font</system:String>
372374

375+
<!-- Release Notes Window -->
376+
<system:String x:Key="seeMoreReleaseNotes">See more release notes on GitHub</system:String>
377+
<system:String x:Key="checkNetworkConnectionTitle">Failed to fetch release notes</system:String>
378+
<system:String x:Key="checkNetworkConnectionSubTitle">Please check your network connection or ensure GitHub is accessible</system:String>
379+
<system:String x:Key="appUpdateTitle">Flow Launcher has been updated to {0}</system:String>
380+
<system:String x:Key="appUpdateButtonContent">Click here to view the release notes</system:String>
381+
373382
<!-- FileManager Setting Dialog -->
374383
<system:String x:Key="fileManagerWindow">Vybrat správce souborů</system:String>
375384
<system:String x:Key="fileManager_learnMore">Learn more</system:String>
@@ -480,6 +489,7 @@ Pokud před zkratku při zadávání přidáte znak &quot;@&quot;, bude odpovíd
480489
</system:String>
481490
<system:String x:Key="errorTitle">Chyba</system:String>
482491
<system:String x:Key="folderOpenError">An error occurred while opening the folder. {0}</system:String>
492+
<system:String x:Key="browserOpenError">An error occurred while opening the URL in the browser. Please check your Default Web Browser configuration in the General section of the settings window</system:String>
483493

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

‎Flow.Launcher/Languages/da.xaml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<system:String x:Key="select">Vælg</system:String>
9595
<system:String x:Key="hideOnStartup">Skjul Flow Launcher ved opstart</system:String>
9696
<system:String x:Key="hideOnStartupToolTip">Flow Launcher search window is hidden in the tray after starting up.</system:String>
97-
<system:String x:Key="hideNotifyIcon">Hide tray icon</system:String>
97+
<system:String x:Key="hideNotifyIcon"></system:String>
9898
<system:String x:Key="hideNotifyIconToolTip">When the icon is hidden from the tray, the Settings menu can be opened by right-clicking on the search window.</system:String>
9999
<system:String x:Key="querySearchPrecision">Query Search Precision</system:String>
100100
<system:String x:Key="querySearchPrecisionToolTip">Changes minimum match score required for results.</system:String>
@@ -136,6 +136,8 @@
136136
<system:String x:Key="historyResultsForHomePage">Show History Results in Home Page</system:String>
137137
<system:String x:Key="historyResultsCountForHomePage">Maximum History Results Shown in Home Page</system:String>
138138
<system:String x:Key="homeToggleBoxToolTip">This can only be edited if plugin supports Home feature and Home Page is enabled.</system:String>
139+
<system:String x:Key="showAtTopmost">Show Search Window at Topmost</system:String>
140+
<system:String x:Key="showAtTopmostToolTip">Show search window above other windows</system:String>
139141

140142
<!-- Setting Plugin -->
141143
<system:String x:Key="searchplugin">Search Plugin</system:String>
@@ -370,6 +372,13 @@
370372
<system:String x:Key="LogLevelINFO">Info</system:String>
371373
<system:String x:Key="settingWindowFontTitle">Setting Window Font</system:String>
372374

375+
<!-- Release Notes Window -->
376+
<system:String x:Key="seeMoreReleaseNotes">See more release notes on GitHub</system:String>
377+
<system:String x:Key="checkNetworkConnectionTitle">Failed to fetch release notes</system:String>
378+
<system:String x:Key="checkNetworkConnectionSubTitle">Please check your network connection or ensure GitHub is accessible</system:String>
379+
<system:String x:Key="appUpdateTitle">Flow Launcher has been updated to {0}</system:String>
380+
<system:String x:Key="appUpdateButtonContent">Click here to view the release notes</system:String>
381+
373382
<!-- FileManager Setting Dialog -->
374383
<system:String x:Key="fileManagerWindow">Select File Manager</system:String>
375384
<system:String x:Key="fileManager_learnMore">Learn more</system:String>
@@ -480,6 +489,7 @@ If you add an '@' prefix while inputting a shortcut, it matches any position in
480489
</system:String>
481490
<system:String x:Key="errorTitle">Error</system:String>
482491
<system:String x:Key="folderOpenError">An error occurred while opening the folder. {0}</system:String>
492+
<system:String x:Key="browserOpenError">An error occurred while opening the URL in the browser. Please check your Default Web Browser configuration in the General section of the settings window</system:String>
483493

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

‎Flow.Launcher/Languages/de.xaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@
136136
<system:String x:Key="historyResultsForHomePage">Show History Results in Home Page</system:String>
137137
<system:String x:Key="historyResultsCountForHomePage">Maximum History Results Shown in Home Page</system:String>
138138
<system:String x:Key="homeToggleBoxToolTip">This can only be edited if plugin supports Home feature and Home Page is enabled.</system:String>
139+
<system:String x:Key="showAtTopmost">Show Search Window at Topmost</system:String>
140+
<system:String x:Key="showAtTopmostToolTip">Show search window above other windows</system:String>
139141

140142
<!-- Setting Plugin -->
141143
<system:String x:Key="searchplugin">Plug-in suchen</system:String>
@@ -370,6 +372,13 @@
370372
<system:String x:Key="LogLevelINFO">Info</system:String>
371373
<system:String x:Key="settingWindowFontTitle">Setting Window Font</system:String>
372374

375+
<!-- Release Notes Window -->
376+
<system:String x:Key="seeMoreReleaseNotes">See more release notes on GitHub</system:String>
377+
<system:String x:Key="checkNetworkConnectionTitle">Failed to fetch release notes</system:String>
378+
<system:String x:Key="checkNetworkConnectionSubTitle">Please check your network connection or ensure GitHub is accessible</system:String>
379+
<system:String x:Key="appUpdateTitle">Flow Launcher has been updated to {0}</system:String>
380+
<system:String x:Key="appUpdateButtonContent">Click here to view the release notes</system:String>
381+
373382
<!-- FileManager Setting Dialog -->
374383
<system:String x:Key="fileManagerWindow">Dateimanager auswählen</system:String>
375384
<system:String x:Key="fileManager_learnMore">Mehr erfahren</system:String>
@@ -480,6 +489,7 @@ Wenn Sie bei der Eingabe eines Shortcuts ein '@'-Präfix hinzufügen, stimmt die
480489
</system:String>
481490
<system:String x:Key="errorTitle">Fehler</system:String>
482491
<system:String x:Key="folderOpenError">An error occurred while opening the folder. {0}</system:String>
492+
<system:String x:Key="browserOpenError">An error occurred while opening the URL in the browser. Please check your Default Web Browser configuration in the General section of the settings window</system:String>
483493

484494
<!-- General Notice -->
485495
<system:String x:Key="pleaseWait">Bitte warten Sie ...</system:String>

‎Flow.Launcher/Languages/es-419.xaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@
136136
<system:String x:Key="historyResultsForHomePage">Show History Results in Home Page</system:String>
137137
<system:String x:Key="historyResultsCountForHomePage">Maximum History Results Shown in Home Page</system:String>
138138
<system:String x:Key="homeToggleBoxToolTip">This can only be edited if plugin supports Home feature and Home Page is enabled.</system:String>
139+
<system:String x:Key="showAtTopmost">Show Search Window at Topmost</system:String>
140+
<system:String x:Key="showAtTopmostToolTip">Show search window above other windows</system:String>
139141

140142
<!-- Setting Plugin -->
141143
<system:String x:Key="searchplugin">Search Plugin</system:String>
@@ -370,6 +372,13 @@
370372
<system:String x:Key="LogLevelINFO">Info</system:String>
371373
<system:String x:Key="settingWindowFontTitle">Setting Window Font</system:String>
372374

375+
<!-- Release Notes Window -->
376+
<system:String x:Key="seeMoreReleaseNotes">See more release notes on GitHub</system:String>
377+
<system:String x:Key="checkNetworkConnectionTitle">Failed to fetch release notes</system:String>
378+
<system:String x:Key="checkNetworkConnectionSubTitle">Please check your network connection or ensure GitHub is accessible</system:String>
379+
<system:String x:Key="appUpdateTitle">Flow Launcher has been updated to {0}</system:String>
380+
<system:String x:Key="appUpdateButtonContent">Click here to view the release notes</system:String>
381+
373382
<!-- FileManager Setting Dialog -->
374383
<system:String x:Key="fileManagerWindow">Seleccionar Gestor de Archivos</system:String>
375384
<system:String x:Key="fileManager_learnMore">Learn more</system:String>
@@ -480,6 +489,7 @@ If you add an '@' prefix while inputting a shortcut, it matches any position in
480489
</system:String>
481490
<system:String x:Key="errorTitle">Error</system:String>
482491
<system:String x:Key="folderOpenError">An error occurred while opening the folder. {0}</system:String>
492+
<system:String x:Key="browserOpenError">An error occurred while opening the URL in the browser. Please check your Default Web Browser configuration in the General section of the settings window</system:String>
483493

484494
<!-- General Notice -->
485495
<system:String x:Key="pleaseWait">Por favor espere...</system:String>

‎Flow.Launcher/Languages/es.xaml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@
136136
<system:String x:Key="historyResultsForHomePage">Mostrar historial de resultados en la página de inicio</system:String>
137137
<system:String x:Key="historyResultsCountForHomePage">Número máximo de resultados del historial en la página de inicio</system:String>
138138
<system:String x:Key="homeToggleBoxToolTip">Esto solo se puede editar si el complemento soporta la función de Inicio y la Página de Inicio está activada.</system:String>
139+
<system:String x:Key="showAtTopmost">Show Search Window at Topmost</system:String>
140+
<system:String x:Key="showAtTopmostToolTip">Show search window above other windows</system:String>
139141

140142
<!-- Setting Plugin -->
141143
<system:String x:Key="searchplugin">Buscar complemento</system:String>
@@ -364,12 +366,19 @@
364366
<system:String x:Key="userdatapath">Ubicación de datos del usuario</system:String>
365367
<system:String x:Key="userdatapathToolTip">La configuración del usuario y los complementos instalados se guardan en la carpeta de datos del usuario. Esta ubicación puede variar dependiendo de si está en modo portable o no.</system:String>
366368
<system:String x:Key="userdatapathButton">Abrir carpeta</system:String>
367-
<system:String x:Key="advanced">Advanced</system:String>
369+
<system:String x:Key="advanced">Avanzado</system:String>
368370
<system:String x:Key="logLevel">Nivel de registro</system:String>
369371
<system:String x:Key="LogLevelDEBUG">Depurar</system:String>
370372
<system:String x:Key="LogLevelINFO">Información</system:String>
371373
<system:String x:Key="settingWindowFontTitle">Configuración de fuente de la ventana</system:String>
372374

375+
<!-- Release Notes Window -->
376+
<system:String x:Key="seeMoreReleaseNotes">Ver más notas de la versión en GitHub</system:String>
377+
<system:String x:Key="checkNetworkConnectionTitle">No se pudo obtener las notas de la versión</system:String>
378+
<system:String x:Key="checkNetworkConnectionSubTitle">Por favor, compruebe su conexión de red o asegúrese de que GitHub es accesible</system:String>
379+
<system:String x:Key="appUpdateTitle">Flow Launcher ha sido actualizado a {0}</system:String>
380+
<system:String x:Key="appUpdateButtonContent">Haga clic aquí para ver las notas de la versión</system:String>
381+
373382
<!-- FileManager Setting Dialog -->
374383
<system:String x:Key="fileManagerWindow">Seleccionar administrador de archivos</system:String>
375384
<system:String x:Key="fileManager_learnMore">Más información</system:String>
@@ -480,6 +489,7 @@ Si añade un prefijo &quot;@&quot; al introducir un acceso directo, éste coinci
480489
</system:String>
481490
<system:String x:Key="errorTitle">Error</system:String>
482491
<system:String x:Key="folderOpenError">Se ha producido un error al abrir la carpeta. {0}</system:String>
492+
<system:String x:Key="browserOpenError">Se ha producido un error al abrir la URL en el navegador. Por favor, compruebe la configuración de su navegador web predeterminado en la sección General de la ventana de configuración</system:String>
483493

484494
<!-- General Notice -->
485495
<system:String x:Key="pleaseWait">Por favor espere...</system:String>

‎Flow.Launcher/Languages/fr.xaml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@
136136
<system:String x:Key="historyResultsForHomePage">Afficher les résultats de l'historique sur la page d'accueil</system:String>
137137
<system:String x:Key="historyResultsCountForHomePage">Maximum de résultats de l'historique affichés sur la page d'accueil</system:String>
138138
<system:String x:Key="homeToggleBoxToolTip">Ceci ne peut être édité que si le plugin prend en charge la fonction Accueil et que la page d'accueil est activée.</system:String>
139+
<system:String x:Key="showAtTopmost">Afficher la fenêtre de recherche en premier plan</system:String>
140+
<system:String x:Key="showAtTopmostToolTip">Afficher la fenêtre de recherche au-dessus des autres fenêtres</system:String>
139141

140142
<!-- Setting Plugin -->
141143
<system:String x:Key="searchplugin">Rechercher des plugins</system:String>
@@ -369,6 +371,13 @@
369371
<system:String x:Key="LogLevelINFO">Info</system:String>
370372
<system:String x:Key="settingWindowFontTitle">Réglage de la police de la fenêtre</system:String>
371373

374+
<!-- Release Notes Window -->
375+
<system:String x:Key="seeMoreReleaseNotes">Voir plus de notes de version sur GitHub</system:String>
376+
<system:String x:Key="checkNetworkConnectionTitle">Impossible de récupérer les notes de version</system:String>
377+
<system:String x:Key="checkNetworkConnectionSubTitle">Veuillez vérifier votre connexion réseau ou vous assurer que GitHub est accessible</system:String>
378+
<system:String x:Key="appUpdateTitle">Flow Launcher a été mis à jour à {0}</system:String>
379+
<system:String x:Key="appUpdateButtonContent">Cliquez ici pour voir les notes de version</system:String>
380+
372381
<!-- FileManager Setting Dialog -->
373382
<system:String x:Key="fileManagerWindow">Sélectionner le gestionnaire de fichiers</system:String>
374383
<system:String x:Key="fileManager_learnMore">En savoir plus</system:String>
@@ -388,7 +397,7 @@
388397
<system:String x:Key="defaultBrowser_name">Navigateur</system:String>
389398
<system:String x:Key="defaultBrowser_profile_name">Nom du navigateur</system:String>
390399
<system:String x:Key="defaultBrowser_path">Chemin du navigateur</system:String>
391-
<system:String x:Key="defaultBrowser_newWindow">Nouvel onglet</system:String>
400+
<system:String x:Key="defaultBrowser_newWindow">Nouvelle fenêtre</system:String>
392401
<system:String x:Key="defaultBrowser_newTab">Nouvel onglet</system:String>
393402
<system:String x:Key="defaultBrowser_parameter">Mode privé</system:String>
394403

@@ -479,6 +488,7 @@ Si vous ajoutez un préfixe &quot;@&quot; lors de la saisie d'un raccourci, celu
479488
</system:String>
480489
<system:String x:Key="errorTitle">Erreur</system:String>
481490
<system:String x:Key="folderOpenError">Une erreur s'est produite lors de l'ouverture du dossier. {0}</system:String>
491+
<system:String x:Key="browserOpenError">Une erreur s'est produite lors de l'ouverture de l'URL dans le navigateur. Veuillez vérifier la configuration de votre navigateur Web par défaut dans la section &quot;Général&quot; de la fenêtre des paramètres</system:String>
482492

483493
<!-- General Notice -->
484494
<system:String x:Key="pleaseWait">Veuillez patienter...</system:String>

0 commit comments

Comments
 (0)