Skip to content

Commit cdc5f0e

Browse files
authored
Merge branch 'dev' into dev4
2 parents 8d83849 + a9d77d8 commit cdc5f0e

File tree

8 files changed

+80
-84
lines changed

8 files changed

+80
-84
lines changed

Flow.Launcher/Flow.Launcher.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<PackageReference Include="ModernWpfUI" Version="0.9.4" />
101101
<PackageReference Include="NHotkey.Wpf" Version="3.0.0" />
102102
<PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
103-
<PackageReference Include="SemanticVersioning" Version="3.0.0-beta2" />
103+
<PackageReference Include="SemanticVersioning" Version="3.0.0" />
104104
<PackageReference Include="VirtualizingWrapPanel" Version="2.1.0" />
105105
</ItemGroup>
106106

Flow.Launcher/Languages/de.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
<system:String x:Key="LastQueryPreserved">Letzte Abfrage beibehalten</system:String>
6666
<system:String x:Key="LastQuerySelected">Letzte Abfrage auswählen</system:String>
6767
<system:String x:Key="LastQueryEmpty">Letzte Abfrage leeren</system:String>
68-
<system:String x:Key="LastQueryActionKeywordPreserved">Preserve Last Action Keyword</system:String>
69-
<system:String x:Key="LastQueryActionKeywordSelected">Select Last Action Keyword</system:String>
68+
<system:String x:Key="LastQueryActionKeywordPreserved">Letztes Aktions-Schlüsselwort beibehalten</system:String>
69+
<system:String x:Key="LastQueryActionKeywordSelected">Letztes Aktions-Schlüsselwort auswählen</system:String>
7070
<system:String x:Key="KeepMaxResults">Feste Fensterhöhe</system:String>
7171
<system:String x:Key="KeepMaxResultsToolTip">Die Fensterhöhe ist durch Ziehen nicht anpassbar.</system:String>
7272
<system:String x:Key="maxShowResults">Maximal gezeigte Ergebnisse</system:String>

Flow.Launcher/Languages/es.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
<system:String x:Key="LastQueryPreserved">Mantener la última consulta</system:String>
6666
<system:String x:Key="LastQuerySelected">Seleccionar la última consulta</system:String>
6767
<system:String x:Key="LastQueryEmpty">Limpiar la última consulta</system:String>
68-
<system:String x:Key="LastQueryActionKeywordPreserved">Conservar palabra clave de última acción</system:String>
69-
<system:String x:Key="LastQueryActionKeywordSelected">Seleccionar palabra clave de última acción</system:String>
68+
<system:String x:Key="LastQueryActionKeywordPreserved">Conservar última palabra clave de acción</system:String>
69+
<system:String x:Key="LastQueryActionKeywordSelected">Seleccionar última palabra clave de acción</system:String>
7070
<system:String x:Key="KeepMaxResults">Altura de la ventana fija</system:String>
7171
<system:String x:Key="KeepMaxResultsToolTip">La altura de la ventana no se puede ajustar arrastrando el ratón.</system:String>
7272
<system:String x:Key="maxShowResults">Número máximo de resultados mostrados</system:String>

Flow.Launcher/Languages/he.xaml

Lines changed: 54 additions & 54 deletions
Large diffs are not rendered by default.

Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
</ItemGroup>
6363

6464
<ItemGroup>
65-
<PackageReference Include="Mages" Version="2.0.2" />
65+
<PackageReference Include="Mages" Version="3.0.0" />
6666
</ItemGroup>
6767

6868
</Project>

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<system:String x:Key="plugin_explorer_everything_setting_header">Everything Setting</system:String>
3030
<system:String x:Key="plugin_explorer_previewpanel_setting_header">Preview Panel</system:String>
3131
<system:String x:Key="plugin_explorer_previewpanel_display_file_size_checkbox">Size</system:String>
32-
<system:String x:Key="plugin_explorer_previewpanel_display_file_creation_checkbox">Date Created</system:String>
33-
<system:String x:Key="plugin_explorer_previewpanel_display_file_modification_checkbox">Date Modified</system:String>
32+
<system:String x:Key="plugin_explorer_previewpanel_display_file_creation_checkbox">תאריך יצירה</system:String>
33+
<system:String x:Key="plugin_explorer_previewpanel_display_file_modification_checkbox">תאריך שינוי</system:String>
3434
<system:String x:Key="plugin_explorer_previewpanel_file_info_label">Display File Info</system:String>
3535
<system:String x:Key="plugin_explorer_previewpanel_date_and_time_format_label">Date and time format</system:String>
3636
<system:String x:Key="plugin_explorer_everything_sort_option">Sort Option:</system:String>
@@ -126,20 +126,20 @@
126126
<system:String x:Key="flowlauncher_plugin_everything_sdk_issue">Failed to load Everything SDK</system:String>
127127
<system:String x:Key="flowlauncher_plugin_everything_is_not_running">אזהרה: שירות Everything אינו פועל</system:String>
128128
<system:String x:Key="flowlauncher_plugin_everything_query_error">שגיאה במהלך שאילתה לEverything</system:String>
129-
<system:String x:Key="flowlauncher_plugin_everything_sort_by">Sort By</system:String>
129+
<system:String x:Key="flowlauncher_plugin_everything_sort_by">מיין לפי</system:String>
130130
<system:String x:Key="flowlauncher_plugin_everything_sort_by_name">Name</system:String>
131-
<system:String x:Key="flowlauncher_plugin_everything_sort_by_path">Path</system:String>
131+
<system:String x:Key="flowlauncher_plugin_everything_sort_by_path">נתיב</system:String>
132132
<system:String x:Key="flowlauncher_plugin_everything_sort_by_size">Size</system:String>
133133
<system:String x:Key="flowlauncher_plugin_everything_sort_by_extension">Extension</system:String>
134134
<system:String x:Key="flowlauncher_plugin_everything_sort_by_type_name">Type Name</system:String>
135-
<system:String x:Key="flowlauncher_plugin_everything_sort_by_date_created">Date Created</system:String>
136-
<system:String x:Key="flowlauncher_plugin_everything_sort_by_date_modified">Date Modified</system:String>
137-
<system:String x:Key="flowlauncher_plugin_everything_sort_by_attributes">Attributes</system:String>
135+
<system:String x:Key="flowlauncher_plugin_everything_sort_by_date_created">תאריך יצירה</system:String>
136+
<system:String x:Key="flowlauncher_plugin_everything_sort_by_date_modified">תאריך שינוי</system:String>
137+
<system:String x:Key="flowlauncher_plugin_everything_sort_by_attributes">מאפיינים</system:String>
138138
<system:String x:Key="flowlauncher_plugin_everything_sort_by_file_list_filename">File List FileName</system:String>
139139
<system:String x:Key="flowlauncher_plugin_everything_sort_by_run_count">Run Count</system:String>
140-
<system:String x:Key="flowlauncher_plugin_everything_sort_by_date_recently_changed">Date Recently Changed</system:String>
141-
<system:String x:Key="flowlauncher_plugin_everything_sort_by_date_accessed">Date Accessed</system:String>
142-
<system:String x:Key="flowlauncher_plugin_everything_sort_by_date_run">Date Run</system:String>
140+
<system:String x:Key="flowlauncher_plugin_everything_sort_by_date_recently_changed">תאריך שינוי אחרון</system:String>
141+
<system:String x:Key="flowlauncher_plugin_everything_sort_by_date_accessed">תאריך גישה</system:String>
142+
<system:String x:Key="flowlauncher_plugin_everything_sort_by_date_run">תאריך הרצה</system:String>
143143
<system:String x:Key="flowlauncher_plugin_everything_sort_by_ascending">↑</system:String>
144144
<system:String x:Key="flowlauncher_plugin_everything_sort_by_descending">↓</system:String>
145145
<system:String x:Key="flowlauncher_plugin_everything_nonfastsort_warning">Warning: This is not a Fast Sort option, searches may be slow</system:String>
@@ -149,11 +149,11 @@
149149

150150
<system:String x:Key="flowlauncher_plugin_everything_click_to_launch_or_install">Click to launch or install Everything</system:String>
151151
<system:String x:Key="flowlauncher_plugin_everything_installing_title">Everything Installation</system:String>
152-
<system:String x:Key="flowlauncher_plugin_everything_installing_subtitle">Installing Everything service. Please wait...</system:String>
153-
<system:String x:Key="flowlauncher_plugin_everything_installationsuccess_subtitle">Successfully installed Everything service</system:String>
154-
<system:String x:Key="flowlauncher_plugin_everything_installationfailed_subtitle">Failed to automatically install Everything service. Please manually install it from https://www.voidtools.com</system:String>
152+
<system:String x:Key="flowlauncher_plugin_everything_installing_subtitle">מתקין את שירות Everything. אנא המתן...</system:String>
153+
<system:String x:Key="flowlauncher_plugin_everything_installationsuccess_subtitle">שירות Everything הותקן בהצלחה</system:String>
154+
<system:String x:Key="flowlauncher_plugin_everything_installationfailed_subtitle">התקנה אוטומטית של שירות Everything נכשלה. אנא הורד אותו ידנית מ- https://www.voidtools.com</system:String>
155155
<system:String x:Key="flowlauncher_plugin_everything_run_service">Click here to start it</system:String>
156-
<system:String x:Key="flowlauncher_plugin_everything_installing_select">Unable to find an Everything installation, would you like to manually select a location?{0}{0}Click no and Everything will be automatically installed for you</system:String>
156+
<system:String x:Key="flowlauncher_plugin_everything_installing_select">לא מצליח למצוא התקנה של Everything, האם תרצה לבחור מיקום באופן ידני?{0}{0}לחץ על לא וEverything יותקן עבורך אוטומטית</system:String>
157157
<system:String x:Key="flowlauncher_plugin_everything_enable_content_search">Do you want to enable content search for Everything?</system:String>
158158
<system:String x:Key="flowlauncher_plugin_everything_enable_content_search_tips">It can be very slow without index (which is only supported in Everything v1.5+)</system:String>
159159

Plugins/Flow.Launcher.Plugin.PluginsManager/Utilities.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
using Flow.Launcher.Core.ExternalPlugins;
2-
using Flow.Launcher.Infrastructure.UserSettings;
32
using ICSharpCode.SharpZipLib.Zip;
4-
using Newtonsoft.Json;
53
using System.IO;
64
using System.IO.Compression;
75
using System.Linq;
6+
using System.Text.Json;
87

98
namespace Flow.Launcher.Plugin.PluginsManager
109
{
@@ -72,12 +71,9 @@ internal static UserPlugin GetPluginInfoFromZip(string filePath)
7271

7372
if (pluginJsonEntry != null)
7473
{
75-
using (StreamReader reader = new StreamReader(pluginJsonEntry.Open()))
76-
{
77-
string pluginJsonContent = reader.ReadToEnd();
78-
plugin = JsonConvert.DeserializeObject<UserPlugin>(pluginJsonContent);
79-
plugin.IcoPath = "Images\\zipfolder.png";
80-
}
74+
using Stream stream = pluginJsonEntry.Open();
75+
plugin = JsonSerializer.Deserialize<UserPlugin>(stream);
76+
plugin.IcoPath = "Images\\zipfolder.png";
8177
}
8278
}
8379

Plugins/Flow.Launcher.Plugin.WindowsSettings/Properties/Resources.de-DE.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2130,7 +2130,7 @@
21302130
<value>Ändern, wie der Mauszeiger ausschaut</value>
21312131
</data>
21322132
<data name="ChangePowerSavingSettings" xml:space="preserve">
2133-
<value>Change power-saving settings</value>
2133+
<value>Energiespareinstellungen ändern</value>
21342134
</data>
21352135
<data name="OptimiseForBlindness" xml:space="preserve">
21362136
<value>Optimieren für Blindheit</value>
@@ -2143,7 +2143,7 @@
21432143
<value>Windows-Features ein- oder ausschalten</value>
21442144
</data>
21452145
<data name="ShowWhichOperatingSystemYourComputerIsRunning" xml:space="preserve">
2146-
<value>Show which operating system your computer is running</value>
2146+
<value>Betriebssystem, welches auf deinem Computer läuft, anzeigen</value>
21472147
</data>
21482148
<data name="ViewLocalServices" xml:space="preserve">
21492149
<value>Lokale Dienste ansehen</value>

0 commit comments

Comments
 (0)