Skip to content

Commit 2212eac

Browse files
authored
Merge branch 'dev' into search-open-explorer-window-tweaks
2 parents 55dee4f + e215c3f commit 2212eac

File tree

77 files changed

+362
-183
lines changed

Some content is hidden

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

77 files changed

+362
-183
lines changed

.github/workflows/spelling.yml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ name: Check Spelling
3434
# For background, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Update-with-deploy-key
3535

3636
on:
37-
push:
38-
branches:
39-
- '**'
40-
- '!l10n_dev'
41-
tags-ignore:
42-
- "**"
37+
# push:
38+
# branches:
39+
# - '**'
40+
# - '!l10n_dev'
41+
# tags-ignore:
42+
# - "**"
4343
pull_request_target:
4444
branches:
4545
- '**'
@@ -65,7 +65,7 @@ jobs:
6565
outputs:
6666
followup: ${{ steps.spelling.outputs.followup }}
6767
runs-on: ubuntu-latest
68-
if: (contains(github.event_name, 'pull_request') && github.head_ref != 'l10n_dev') || github.event_name == 'push'
68+
if: (contains(github.event_name, 'pull_request') && github.head_ref != 'l10n_dev')
6969
concurrency:
7070
group: spelling-${{ github.event.pull_request.number || github.ref }}
7171
# note: If you use only_check_changed_files, you do not want cancel-in-progress
@@ -103,21 +103,21 @@ jobs:
103103

104104

105105

106-
comment-push:
107-
name: Report (Push)
108-
# If your workflow isn't running on push, you can remove this job
109-
runs-on: ubuntu-latest
110-
needs: spelling
111-
permissions:
112-
contents: write
113-
if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
114-
steps:
115-
- name: comment
116-
uses: check-spelling/check-spelling@main
117-
with:
118-
checkout: true
119-
spell_check_this: check-spelling/spell-check-this@main
120-
task: ${{ needs.spelling.outputs.followup }}
106+
# comment-push:
107+
# name: Report (Push)
108+
# # If your workflow isn't running on push, you can remove this job
109+
# runs-on: ubuntu-latest
110+
# needs: spelling
111+
# permissions:
112+
# contents: write
113+
# if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
114+
# steps:
115+
# - name: comment
116+
# uses: check-spelling/check-spelling@main
117+
# with:
118+
# checkout: true
119+
# spell_check_this: check-spelling/spell-check-this@main
120+
# task: ${{ needs.spelling.outputs.followup }}
121121

122122
comment-pr:
123123
name: Report (PR)

Flow.Launcher/Languages/it.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@
336336
<system:String x:Key="HotkeyUpDownDesc">Indietro / Menu contestuale</system:String>
337337
<system:String x:Key="HotkeyLeftRightDesc">Navigazione tra le voci</system:String>
338338
<system:String x:Key="HotkeyShiftEnterDesc">Apri il menu di scelta rapida</system:String>
339-
<system:String x:Key="HotkeyCtrlEnterDesc">Apri la cartella Contaning</system:String>
339+
<system:String x:Key="HotkeyCtrlEnterDesc">Apri cartella superiore</system:String>
340340
<system:String x:Key="HotkeyCtrlShiftEnterDesc">Esegui come amministratore</system:String>
341341
<system:String x:Key="HotkeyCtrlHDesc">Cronologia Query</system:String>
342342
<system:String x:Key="HotkeyESCDesc">Torna al risultato nel menu contestuale</system:String>

Flow.Launcher/Languages/pt-pt.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ Queira por favor mover a pasta do seu perfil de {0} para {1}
335335
<system:String x:Key="HotkeyUpDownDesc">Recuar/Menu de contexto</system:String>
336336
<system:String x:Key="HotkeyLeftRightDesc">Navegação nos itens</system:String>
337337
<system:String x:Key="HotkeyShiftEnterDesc">Abrir menu de contexto</system:String>
338-
<system:String x:Key="HotkeyCtrlEnterDesc">Abrir pasta</system:String>
338+
<system:String x:Key="HotkeyCtrlEnterDesc">Abrir pasta do resultado</system:String>
339339
<system:String x:Key="HotkeyCtrlShiftEnterDesc">Executar como administrador</system:String>
340340
<system:String x:Key="HotkeyCtrlHDesc">Histórico de consultas</system:String>
341341
<system:String x:Key="HotkeyESCDesc">Voltar aos resultados no menu de contexto</system:String>

Flow.Launcher/Languages/tr.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
<system:String x:Key="fileManager_file_arg">Arg For File</system:String>
235235

236236
<!-- DefaultBrowser Setting Dialog -->
237-
<system:String x:Key="defaultBrowserTitle">Default Web Browser</system:String>
237+
<system:String x:Key="defaultBrowserTitle">Varsayılan İnternet Tarayıcısı</system:String>
238238
<system:String x:Key="defaultBrowser_tips">The default setting follows the OS default browser setting. If specified separately, flow uses that browser.</system:String>
239239
<system:String x:Key="defaultBrowser_name">Browser</system:String>
240240
<system:String x:Key="defaultBrowser_profile_name">Browser Name</system:String>

Plugins/Flow.Launcher.Plugin.Explorer/Languages/es.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@
8989
<system:String x:Key="plugin_explorer_add_to_quickaccess_title">Añadir al acceso rápido</system:String>
9090
<system:String x:Key="plugin_explorer_add_to_quickaccess_subtitle">Añade elemento actual al acceso rápido</system:String>
9191
<system:String x:Key="plugin_explorer_addfilefoldersuccess">Añadido/a correctamente</system:String>
92-
<system:String x:Key="plugin_explorer_addfilefoldersuccess_detail">Añadido/a correctamente al acceso rápido</system:String>
92+
<system:String x:Key="plugin_explorer_addfilefoldersuccess_detail">Añadido correctamente al acceso rápido</system:String>
9393
<system:String x:Key="plugin_explorer_removefilefoldersuccess">Eliminado/a correctamente</system:String>
94-
<system:String x:Key="plugin_explorer_removefilefoldersuccess_detail">Eliminado/a correctamente del acceso rápido</system:String>
94+
<system:String x:Key="plugin_explorer_removefilefoldersuccess_detail">Eliminado correctamente del acceso rápido</system:String>
9595
<system:String x:Key="plugin_explorer_contextmenu_titletooltip">Añade al acceso rápido para que se pueda abrir con la palabra clave de acción que activa la búsqueda del explorador</system:String>
9696
<system:String x:Key="plugin_explorer_contextmenu_remove_titletooltip">Eliminar del acceso rápido</system:String>
9797
<system:String x:Key="plugin_explorer_remove_from_quickaccess_title">Eliminar del acceso rápido</system:String>

Plugins/Flow.Launcher.Plugin.Explorer/Languages/sk.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<system:String x:Key="plugin_explorer_opencontainingfolder_subtitle">Otvoriť umiestnenie aktuálnej položky</system:String>
8080
<system:String x:Key="plugin_explorer_openwitheditor">Otvoriť v editore:</system:String>
8181
<system:String x:Key="plugin_explorer_openwitheditor_error">Nepodarilo sa otvoriť súbor {0} v editore {1} – {2}</system:String>
82-
<system:String x:Key="plugin_explorer_openwithshell">Otvori v príkazovom riadku:</system:String>
82+
<system:String x:Key="plugin_explorer_openwithshell">Otvoriť v príkazovom riadku:</system:String>
8383
<system:String x:Key="plugin_explorer_openwithshell_error">Nepodarilo sa otvoriť priečinok {0} v prostredí {1} – {2}</system:String>
8484
<system:String x:Key="plugin_explorer_excludefromindexsearch">Vylúčiť položku a jej podpriečinky z indexu vyhľadávania</system:String>
8585
<system:String x:Key="plugin_explorer_excludedfromindexsearch_msg">Vylúčiť z indexu vyhľadávania</system:String>
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0"?>
22
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
33

4+
<system:String x:Key="flowlauncher_plugin_pluginindicator_result_subtitle">Activate {0} plugin action keyword</system:String>
5+
46
<system:String x:Key="flowlauncher_plugin_pluginindicator_plugin_name">Plugin Indicator</system:String>
57
<system:String x:Key="flowlauncher_plugin_pluginindicator_plugin_description">Provides plugins action words suggestions</system:String>
6-
8+
79
</ResourceDictionary>
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0"?>
22
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
33

4+
<system:String x:Key="flowlauncher_plugin_pluginindicator_result_subtitle">Activate {0} plugin action keyword</system:String>
5+
46
<system:String x:Key="flowlauncher_plugin_pluginindicator_plugin_name">Plugin Indikator</system:String>
57
<system:String x:Key="flowlauncher_plugin_pluginindicator_plugin_description">Stellt Vorschläge für Plugin-Befehle bereit</system:String>
6-
8+
79
</ResourceDictionary>
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0"?>
22
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
33

4+
<system:String x:Key="flowlauncher_plugin_pluginindicator_result_subtitle">Activate {0} plugin action keyword</system:String>
5+
46
<system:String x:Key="flowlauncher_plugin_pluginindicator_plugin_name">Indicador de Plugins</system:String>
57
<system:String x:Key="flowlauncher_plugin_pluginindicator_plugin_description">Sugiere palabras clave de plugins</system:String>
6-
8+
79
</ResourceDictionary>
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0"?>
22
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
33

4+
<system:String x:Key="flowlauncher_plugin_pluginindicator_result_subtitle">Activa {0} palabra clave de acción del complemento</system:String>
5+
46
<system:String x:Key="flowlauncher_plugin_pluginindicator_plugin_name">Indicador de complementos</system:String>
57
<system:String x:Key="flowlauncher_plugin_pluginindicator_plugin_description">Proporciona sugerencias de palabras de acción para los complementos</system:String>
6-
8+
79
</ResourceDictionary>

0 commit comments

Comments
 (0)