Skip to content

Commit 2d8c7a3

Browse files
authored
Merge branch 'dev' into plugin_initialization
2 parents cf8096f + b898c46 commit 2d8c7a3

File tree

31 files changed

+194
-160
lines changed

31 files changed

+194
-160
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
</PropertyGroup>
1616

1717
<PropertyGroup>
18-
<Version>4.7.0</Version>
19-
<PackageVersion>4.7.0</PackageVersion>
20-
<AssemblyVersion>4.7.0</AssemblyVersion>
21-
<FileVersion>4.7.0</FileVersion>
18+
<Version>5.0.0</Version>
19+
<PackageVersion>5.0.0</PackageVersion>
20+
<AssemblyVersion>5.0.0</AssemblyVersion>
21+
<FileVersion>5.0.0</FileVersion>
2222
<PackageId>Flow.Launcher.Plugin</PackageId>
2323
<Authors>Flow-Launcher</Authors>
2424
<PackageLicenseExpression>MIT</PackageLicenseExpression>

Flow.Launcher/Languages/ar.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@
332332
<system:String x:Key="PlaceholderTextTip">Change placeholder text. Input empty will use: {0}</system:String>
333333
<system:String x:Key="KeepMaxResults">Fixed Window Size</system:String>
334334
<system:String x:Key="KeepMaxResultsToolTip">The window size is not adjustable by dragging.</system:String>
335+
<system:String x:Key="MaxShowResultsCannotWorkWithAlwaysPreview">Since Always Preview is on, maximum results shown may not take effect because preview panel requires a certain minimum height</system:String>
335336

336337
<!-- Setting Hotkey -->
337338
<system:String x:Key="hotkey">مفتاح الاختصار</system:String>

Flow.Launcher/Languages/cs.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@
332332
<system:String x:Key="PlaceholderTextTip">Change placeholder text. Input empty will use: {0}</system:String>
333333
<system:String x:Key="KeepMaxResults">Fixed Window Size</system:String>
334334
<system:String x:Key="KeepMaxResultsToolTip">The window size is not adjustable by dragging.</system:String>
335+
<system:String x:Key="MaxShowResultsCannotWorkWithAlwaysPreview">Since Always Preview is on, maximum results shown may not take effect because preview panel requires a certain minimum height</system:String>
335336

336337
<!-- Setting Hotkey -->
337338
<system:String x:Key="hotkey">Klávesová zkratka</system:String>

Flow.Launcher/Languages/da.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@
332332
<system:String x:Key="PlaceholderTextTip">Change placeholder text. Input empty will use: {0}</system:String>
333333
<system:String x:Key="KeepMaxResults">Fixed Window Size</system:String>
334334
<system:String x:Key="KeepMaxResultsToolTip">The window size is not adjustable by dragging.</system:String>
335+
<system:String x:Key="MaxShowResultsCannotWorkWithAlwaysPreview">Since Always Preview is on, maximum results shown may not take effect because preview panel requires a certain minimum height</system:String>
335336

336337
<!-- Setting Hotkey -->
337338
<system:String x:Key="hotkey">Genvejstast</system:String>

Flow.Launcher/Languages/de.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@
332332
<system:String x:Key="PlaceholderTextTip">Platzhaltertext ändern. Eingabe leer wird verwendet: {0}</system:String>
333333
<system:String x:Key="KeepMaxResults">Festgelegte Fenstergröße</system:String>
334334
<system:String x:Key="KeepMaxResultsToolTip">Die Fenstergröße ist durch Ziehen nicht anpassbar.</system:String>
335+
<system:String x:Key="MaxShowResultsCannotWorkWithAlwaysPreview">Since Always Preview is on, maximum results shown may not take effect because preview panel requires a certain minimum height</system:String>
335336

336337
<!-- Setting Hotkey -->
337338
<system:String x:Key="hotkey">Hotkey</system:String>

Flow.Launcher/Languages/es-419.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@
332332
<system:String x:Key="PlaceholderTextTip">Change placeholder text. Input empty will use: {0}</system:String>
333333
<system:String x:Key="KeepMaxResults">Fixed Window Size</system:String>
334334
<system:String x:Key="KeepMaxResultsToolTip">The window size is not adjustable by dragging.</system:String>
335+
<system:String x:Key="MaxShowResultsCannotWorkWithAlwaysPreview">Since Always Preview is on, maximum results shown may not take effect because preview panel requires a certain minimum height</system:String>
335336

336337
<!-- Setting Hotkey -->
337338
<system:String x:Key="hotkey">Tecla Rápida</system:String>

Flow.Launcher/Languages/es.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@
332332
<system:String x:Key="PlaceholderTextTip">Cambia el texto del marcador de posición. La entrada vacía utilizará: {0}</system:String>
333333
<system:String x:Key="KeepMaxResults">Tamaño fijo de la ventana</system:String>
334334
<system:String x:Key="KeepMaxResultsToolTip">El tamaño de la ventana no se puede ajustar mediante arrastre.</system:String>
335+
<system:String x:Key="MaxShowResultsCannotWorkWithAlwaysPreview">Since Always Preview is on, maximum results shown may not take effect because preview panel requires a certain minimum height</system:String>
335336

336337
<!-- Setting Hotkey -->
337338
<system:String x:Key="hotkey">Atajo de teclado</system:String>

Flow.Launcher/Languages/fr.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@
332332
<system:String x:Key="PlaceholderTextTip">Modifier le texte de l'espace réservé. Les entrées vides utiliseront : {0}</system:String>
333333
<system:String x:Key="KeepMaxResults">Taille de la fenêtre fixe</system:String>
334334
<system:String x:Key="KeepMaxResultsToolTip">La taille de la fenêtre n'est pas réglable par glissement.</system:String>
335+
<system:String x:Key="MaxShowResultsCannotWorkWithAlwaysPreview">Étant donné que Always Preview est toujours activé, les résultats maximaux indiqués peuvent ne pas prendre effet car le panneau d'aperçu nécessite une certaine hauteur minimale</system:String>
335336

336337
<!-- Setting Hotkey -->
337338
<system:String x:Key="hotkey">Raccourcis</system:String>

Flow.Launcher/Languages/he.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@
331331
<system:String x:Key="PlaceholderTextTip">שנה את טקסט מציין המיקום. אם הקלט ריק, ייעשה שימוש ב: {0}</system:String>
332332
<system:String x:Key="KeepMaxResults">גודל חלון קבוע</system:String>
333333
<system:String x:Key="KeepMaxResultsToolTip">לא ניתן להתאים את גודל החלון באמצעות גרירה.</system:String>
334+
<system:String x:Key="MaxShowResultsCannotWorkWithAlwaysPreview">Since Always Preview is on, maximum results shown may not take effect because preview panel requires a certain minimum height</system:String>
334335

335336
<!-- Setting Hotkey -->
336337
<system:String x:Key="hotkey">מקש קיצור</system:String>

Flow.Launcher/Languages/it.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@
332332
<system:String x:Key="PlaceholderTextTip">Change placeholder text. Input empty will use: {0}</system:String>
333333
<system:String x:Key="KeepMaxResults">Fixed Window Size</system:String>
334334
<system:String x:Key="KeepMaxResultsToolTip">The window size is not adjustable by dragging.</system:String>
335+
<system:String x:Key="MaxShowResultsCannotWorkWithAlwaysPreview">Since Always Preview is on, maximum results shown may not take effect because preview panel requires a certain minimum height</system:String>
335336

336337
<!-- Setting Hotkey -->
337338
<system:String x:Key="hotkey">Tasti scelta rapida</system:String>

0 commit comments

Comments
 (0)