Skip to content

Commit 1e9310b

Browse files
authored
Merge branch 'dev' into 240430PreviewSetting
2 parents cf54a67 + 6133e55 commit 1e9310b

File tree

68 files changed

+4753
-315
lines changed

Some content is hidden

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

68 files changed

+4753
-315
lines changed

Flow.Launcher/Languages/ar.xaml

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
<system:String x:Key="SoundEffectTip">Play a small sound when the search window opens</system:String>
157157
<system:String x:Key="SoundEffectVolume">Sound Effect Volume</system:String>
158158
<system:String x:Key="SoundEffectVolumeTip">Adjust the volume of the sound effect</system:String>
159+
<system:String x:Key="SoundEffectWarning">Windows Media Player is unavailable and is required for Flow's volume adjustment. Please check your installation if you need to adjust volume.</system:String>
159160
<system:String x:Key="Animation">Animation</system:String>
160161
<system:String x:Key="AnimationTip">Use Animation in UI</system:String>
161162
<system:String x:Key="AnimationSpeed">Animation Speed</system:String>
@@ -170,14 +171,37 @@
170171
<!-- Setting Hotkey -->
171172
<system:String x:Key="hotkey">Hotkey</system:String>
172173
<system:String x:Key="hotkeys">Hotkeys</system:String>
173-
<system:String x:Key="flowlauncherHotkey">Flow Launcher Hotkey</system:String>
174+
<system:String x:Key="flowlauncherHotkey">Open Flow Launcher</system:String>
174175
<system:String x:Key="flowlauncherHotkeyToolTip">Enter shortcut to show/hide Flow Launcher.</system:String>
175-
<system:String x:Key="previewHotkey">Preview Hotkey</system:String>
176+
<system:String x:Key="previewHotkey">Toggle Preview</system:String>
176177
<system:String x:Key="previewHotkeyToolTip">Enter shortcut to show/hide preview in search window.</system:String>
178+
<system:String x:Key="hotkeyPresets">Hotkey Presets</system:String>
179+
<system:String x:Key="hotkeyPresetsToolTip">List of currently registered hotkeys</system:String>
177180
<system:String x:Key="openResultModifiers">Open Result Modifier Key</system:String>
178181
<system:String x:Key="openResultModifiersToolTip">Select a modifier key to open selected result via keyboard.</system:String>
179182
<system:String x:Key="showOpenResultHotkey">Show Hotkey</system:String>
180183
<system:String x:Key="showOpenResultHotkeyToolTip">Show result selection hotkey with results.</system:String>
184+
<system:String x:Key="autoCompleteHotkey">Auto Complete</system:String>
185+
<system:String x:Key="autoCompleteHotkeyToolTip">Runs autocomplete for the selected items.</system:String>
186+
<system:String x:Key="SelectNextItemHotkey">Select Next Item</system:String>
187+
<system:String x:Key="SelectPrevItemHotkey">Select Previous Item</system:String>
188+
<system:String x:Key="SelectNextPageHotkey">Next Page</system:String>
189+
<system:String x:Key="SelectPrevPageHotkey">Previous Page</system:String>
190+
<system:String x:Key="CycleHistoryUpHotkey">Cycle Previous Query</system:String>
191+
<system:String x:Key="CycleHistoryDownHotkey">Cycle Next Query</system:String>
192+
<system:String x:Key="OpenContextMenuHotkey">Open Context Menu</system:String>
193+
<system:String x:Key="SettingWindowHotkey">Open Setting Window</system:String>
194+
<system:String x:Key="CopyFilePathHotkey">Copy File Path</system:String>
195+
<system:String x:Key="ToggleGameModeHotkey">Toggle Game Mode</system:String>
196+
<system:String x:Key="ToggleHistoryHotkey">Toggle History</system:String>
197+
<system:String x:Key="OpenContainFolderHotkey">Open Containing Folder</system:String>
198+
<system:String x:Key="RunAsAdminHotkey">Run As Admin</system:String>
199+
<system:String x:Key="RequeryHotkey">Refresh Search Results</system:String>
200+
<system:String x:Key="ReloadPluginHotkey">Reload Plugins Data</system:String>
201+
<system:String x:Key="QuickWidthHotkey">Quick Adjust Window Width</system:String>
202+
<system:String x:Key="QuickHeightHotkey">Quick Adjust Window Height</system:String>
203+
<system:String x:Key="ReloadPluginHotkeyToolTip">Use when require plugins to reload and update their existing data.</system:String>
204+
<system:String x:Key="AdditionalHotkeyToolTip">You can add one more hotkey for this function.</system:String>
181205
<system:String x:Key="customQueryHotkey">Custom Query Hotkeys</system:String>
182206
<system:String x:Key="customQueryShortcut">Custom Query Shortcuts</system:String>
183207
<system:String x:Key="builtinShortcuts">Built-in Shortcuts</system:String>
@@ -188,6 +212,7 @@
188212
<system:String x:Key="delete">Delete</system:String>
189213
<system:String x:Key="edit">Edit</system:String>
190214
<system:String x:Key="add">Add</system:String>
215+
<system:String x:Key="none">None</system:String>
191216
<system:String x:Key="pleaseSelectAnItem">Please select an item</system:String>
192217
<system:String x:Key="deleteCustomHotkeyWarning">Are you sure you want to delete {0} plugin hotkey?</system:String>
193218
<system:String x:Key="deleteCustomShortcutWarning">Are you sure you want to delete shortcut: {0} with expansion {1}?</system:String>
@@ -286,6 +311,11 @@
286311
<system:String x:Key="hotkeyIsNotUnavailable">Hotkey is unavailable, please select a new hotkey</system:String>
287312
<system:String x:Key="invalidPluginHotkey">Invalid plugin hotkey</system:String>
288313
<system:String x:Key="update">Update</system:String>
314+
<system:String x:Key="hotkeyRegTitle">Binding Hotkey</system:String>
315+
<system:String x:Key="hotkeyUnavailable">Current hotkey is unavailable.</system:String>
316+
<system:String x:Key="hotkeyUnavailableUneditable">This hotkey is reserved for &quot;{0}&quot; and can't be used. Please choose another hotkey.</system:String>
317+
<system:String x:Key="hotkeyUnavailableEditable">This hotkey is already in use by &quot;{0}&quot;. If you press &quot;Overwrite&quot;, it will be removed from &quot;{0}&quot;.</system:String>
318+
<system:String x:Key="hotkeyRegGuide">Press the keys you want to use for this function.</system:String>
289319

290320
<!-- Custom Query Shortcut Dialog -->
291321
<system:String x:Key="customeQueryShortcutTitle">Custom Query Shortcut</system:String>
@@ -297,8 +327,12 @@ If you add an '@' prefix while inputting a shortcut, it matches any position in
297327
<system:String x:Key="duplicateShortcut">Shortcut already exists, please enter a new Shortcut or edit the existing one.</system:String>
298328
<system:String x:Key="emptyShortcut">Shortcut and/or its expansion is empty.</system:String>
299329

300-
<!-- Hotkey Control -->
301-
<system:String x:Key="hotkeyUnavailable">Hotkey Unavailable</system:String>
330+
<!-- Common Action -->
331+
<system:String x:Key="commonSave">Save</system:String>
332+
<system:String x:Key="commonOverwrite">Overwrite</system:String>
333+
<system:String x:Key="commonCancel">Cancel</system:String>
334+
<system:String x:Key="commonReset">Reset</system:String>
335+
<system:String x:Key="commonDelete">Delete</system:String>
302336

303337
<!-- Crash Reporter -->
304338
<system:String x:Key="reportWindow_version">Version</system:String>
@@ -368,6 +402,12 @@ If you add an '@' prefix while inputting a shortcut, it matches any position in
368402
<system:String x:Key="HotkeyCtrlIDesc">Open Setting Window</system:String>
369403
<system:String x:Key="HotkeyF5Desc">Reload Plugin Data</system:String>
370404

405+
<system:String x:Key="HotkeySelectFirstResult">Select first result</system:String>
406+
<system:String x:Key="HotkeySelectLastResult">Select last result</system:String>
407+
<system:String x:Key="HotkeyRequery">Run current query again</system:String>
408+
<system:String x:Key="HotkeyOpenResult">Open result</system:String>
409+
<system:String x:Key="HotkeyOpenResultN">Open result #{0}</system:String>
410+
371411
<system:String x:Key="RecommendWeather">Weather</system:String>
372412
<system:String x:Key="RecommendWeatherDesc">Weather in Google Result</system:String>
373413
<system:String x:Key="RecommendShell">&gt; ping 8.8.8.8</system:String>

Flow.Launcher/Languages/cs.xaml

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
<system:String x:Key="SoundEffectTip">Přehrát krátký zvuk při otevření okna vyhledávání</system:String>
157157
<system:String x:Key="SoundEffectVolume">Sound Effect Volume</system:String>
158158
<system:String x:Key="SoundEffectVolumeTip">Adjust the volume of the sound effect</system:String>
159+
<system:String x:Key="SoundEffectWarning">Windows Media Player is unavailable and is required for Flow's volume adjustment. Please check your installation if you need to adjust volume.</system:String>
159160
<system:String x:Key="Animation">Animace</system:String>
160161
<system:String x:Key="AnimationTip">Použít animaci v UI</system:String>
161162
<system:String x:Key="AnimationSpeed">Rychlost animace</system:String>
@@ -170,14 +171,37 @@
170171
<!-- Setting Hotkey -->
171172
<system:String x:Key="hotkey">Klávesová zkratka</system:String>
172173
<system:String x:Key="hotkeys">Klávesové zkratky</system:String>
173-
<system:String x:Key="flowlauncherHotkey">Klávesová zkratka pro Flow Launcher</system:String>
174+
<system:String x:Key="flowlauncherHotkey">Open Flow Launcher</system:String>
174175
<system:String x:Key="flowlauncherHotkeyToolTip">Zadejte zkratku pro zobrazení/skrytí nástroje Flow Launcher.</system:String>
175-
<system:String x:Key="previewHotkey">Klávesová zkratka pro náhled</system:String>
176+
<system:String x:Key="previewHotkey">Toggle Preview</system:String>
176177
<system:String x:Key="previewHotkeyToolTip">Zadejte klávesovou zkratku pro zobrazení/skrytí náhledu v okně vyhledávání.</system:String>
178+
<system:String x:Key="hotkeyPresets">Hotkey Presets</system:String>
179+
<system:String x:Key="hotkeyPresetsToolTip">List of currently registered hotkeys</system:String>
177180
<system:String x:Key="openResultModifiers">Modifikační klávesa pro otevření výsledků</system:String>
178181
<system:String x:Key="openResultModifiersToolTip">Výběrem modifikační klávesy otevřete vybraný výsledek pomocí klávesnice.</system:String>
179182
<system:String x:Key="showOpenResultHotkey">Zobrazit klávesovou zkratku</system:String>
180183
<system:String x:Key="showOpenResultHotkeyToolTip">Zobrazí klávesovou zkratku spolu s výsledky.</system:String>
184+
<system:String x:Key="autoCompleteHotkey">Auto Complete</system:String>
185+
<system:String x:Key="autoCompleteHotkeyToolTip">Runs autocomplete for the selected items.</system:String>
186+
<system:String x:Key="SelectNextItemHotkey">Select Next Item</system:String>
187+
<system:String x:Key="SelectPrevItemHotkey">Select Previous Item</system:String>
188+
<system:String x:Key="SelectNextPageHotkey">Next Page</system:String>
189+
<system:String x:Key="SelectPrevPageHotkey">Previous Page</system:String>
190+
<system:String x:Key="CycleHistoryUpHotkey">Cycle Previous Query</system:String>
191+
<system:String x:Key="CycleHistoryDownHotkey">Cycle Next Query</system:String>
192+
<system:String x:Key="OpenContextMenuHotkey">Otevřít kontextovou nabídku</system:String>
193+
<system:String x:Key="SettingWindowHotkey">Otevřít okno s nastavením</system:String>
194+
<system:String x:Key="CopyFilePathHotkey">Copy File Path</system:String>
195+
<system:String x:Key="ToggleGameModeHotkey">Toggle Game Mode</system:String>
196+
<system:String x:Key="ToggleHistoryHotkey">Toggle History</system:String>
197+
<system:String x:Key="OpenContainFolderHotkey">Otevřít umístění složky</system:String>
198+
<system:String x:Key="RunAsAdminHotkey">Run As Admin</system:String>
199+
<system:String x:Key="RequeryHotkey">Refresh Search Results</system:String>
200+
<system:String x:Key="ReloadPluginHotkey">Reload Plugins Data</system:String>
201+
<system:String x:Key="QuickWidthHotkey">Quick Adjust Window Width</system:String>
202+
<system:String x:Key="QuickHeightHotkey">Quick Adjust Window Height</system:String>
203+
<system:String x:Key="ReloadPluginHotkeyToolTip">Use when require plugins to reload and update their existing data.</system:String>
204+
<system:String x:Key="AdditionalHotkeyToolTip">You can add one more hotkey for this function.</system:String>
181205
<system:String x:Key="customQueryHotkey">Vlastní klávesové zkratky pro vyhledávání</system:String>
182206
<system:String x:Key="customQueryShortcut">Vlastní zkratky dotazů</system:String>
183207
<system:String x:Key="builtinShortcuts">Vestavěné zkratky</system:String>
@@ -188,6 +212,7 @@
188212
<system:String x:Key="delete">Smazat</system:String>
189213
<system:String x:Key="edit">Editovat</system:String>
190214
<system:String x:Key="add">Přidat</system:String>
215+
<system:String x:Key="none">None</system:String>
191216
<system:String x:Key="pleaseSelectAnItem">Vyberte prosím položku</system:String>
192217
<system:String x:Key="deleteCustomHotkeyWarning">Jste si jisti, že chcete odstranit klávesovou zkratku {0} pro plugin?</system:String>
193218
<system:String x:Key="deleteCustomShortcutWarning">Opravdu chcete odstranit zástupce: {0} pro dotaz {1}?</system:String>
@@ -286,6 +311,11 @@
286311
<system:String x:Key="hotkeyIsNotUnavailable">Klávesová zkratka je nedostupná, zadejte prosím novou zkratku</system:String>
287312
<system:String x:Key="invalidPluginHotkey">Neplatná klávesová zkratka pluginu</system:String>
288313
<system:String x:Key="update">Aktualizovat</system:String>
314+
<system:String x:Key="hotkeyRegTitle">Binding Hotkey</system:String>
315+
<system:String x:Key="hotkeyUnavailable">Current hotkey is unavailable.</system:String>
316+
<system:String x:Key="hotkeyUnavailableUneditable">This hotkey is reserved for &quot;{0}&quot; and can't be used. Please choose another hotkey.</system:String>
317+
<system:String x:Key="hotkeyUnavailableEditable">This hotkey is already in use by &quot;{0}&quot;. If you press &quot;Overwrite&quot;, it will be removed from &quot;{0}&quot;.</system:String>
318+
<system:String x:Key="hotkeyRegGuide">Press the keys you want to use for this function.</system:String>
289319

290320
<!-- Custom Query Shortcut Dialog -->
291321
<system:String x:Key="customeQueryShortcutTitle">Vlastní klávesová zkratka pro zadávání dotazů</system:String>
@@ -297,8 +327,12 @@ Pokud před zkratku při zadávání přidáte znak &quot;@&quot;, bude odpovíd
297327
<system:String x:Key="duplicateShortcut">Zkratka již existuje, zadejte novou zkratku nebo upravte stávající.</system:String>
298328
<system:String x:Key="emptyShortcut">Zkratka a/nebo její plné znění je prázdné.</system:String>
299329

300-
<!-- Hotkey Control -->
301-
<system:String x:Key="hotkeyUnavailable">Klávesová zkratka je nedostupná</system:String>
330+
<!-- Common Action -->
331+
<system:String x:Key="commonSave">Uložit</system:String>
332+
<system:String x:Key="commonOverwrite">Overwrite</system:String>
333+
<system:String x:Key="commonCancel">Zrušit</system:String>
334+
<system:String x:Key="commonReset">Reset</system:String>
335+
<system:String x:Key="commonDelete">Smazat</system:String>
302336

303337
<!-- Crash Reporter -->
304338
<system:String x:Key="reportWindow_version">Verze</system:String>
@@ -368,6 +402,12 @@ Pokud před zkratku při zadávání přidáte znak &quot;@&quot;, bude odpovíd
368402
<system:String x:Key="HotkeyCtrlIDesc">Otevřít okno s nastavením</system:String>
369403
<system:String x:Key="HotkeyF5Desc">Znovu načíst data pluginů</system:String>
370404

405+
<system:String x:Key="HotkeySelectFirstResult">Select first result</system:String>
406+
<system:String x:Key="HotkeySelectLastResult">Select last result</system:String>
407+
<system:String x:Key="HotkeyRequery">Run current query again</system:String>
408+
<system:String x:Key="HotkeyOpenResult">Open result</system:String>
409+
<system:String x:Key="HotkeyOpenResultN">Open result #{0}</system:String>
410+
371411
<system:String x:Key="RecommendWeather">Počasí</system:String>
372412
<system:String x:Key="RecommendWeatherDesc">Výsledky počasí Google</system:String>
373413
<system:String x:Key="RecommendShell">&gt; ping 8.8.8</system:String>

0 commit comments

Comments
 (0)