Skip to content

Commit efcce81

Browse files
Merge branch 'dev' into double-pin
2 parents 2316c36 + 3cdf919 commit efcce81

File tree

61 files changed

+1201
-264
lines changed

Some content is hidden

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

61 files changed

+1201
-264
lines changed

.github/update_release_pr.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def get_prs(
8989
count += 1
9090

9191
print(
92-
f"Found {count} PRs with {label if label else 'no filter on'} label, state as {state}, and milestone {pr["milestone"] if pr["milestone"] is not None else "None"}"
92+
f"Found {count} PRs with {label if label else 'no filter on'} label, state as {state}, and milestone {milestone_title if milestone_title else "any"}"
9393
)
9494

9595
return pr_list

Flow.Launcher.Infrastructure/TranslationMapping.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Linq;
43

54
namespace Flow.Launcher.Infrastructure
65
{
76
public class TranslationMapping
87
{
98
private bool _isConstructed;
109

11-
// Assuming one original item maps to multi translated items
12-
// list[i] is the last translated index + 1 of original index i
10+
// Assuming one original item maps to multi translated items
11+
// list[i] is the last translated index + 1 of original index i
1312
private readonly List<int> _originalToTranslated = new();
1413

14+
1515
public void AddNewIndex(int translatedIndex, int length)
1616
{
1717
if (_isConstructed)

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ public CustomBrowserViewModel CustomBrowser
330330
/// </summary>
331331
public bool ShouldUsePinyin { get; set; } = false;
332332

333-
private bool _useDoublePinyin = true; // TODO: change default to false BEFORE RELEASE
333+
private bool _useDoublePinyin = false;
334334
public bool UseDoublePinyin
335335
{
336336
get => _useDoublePinyin;

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

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

1616
<PropertyGroup>
17-
<Version>4.6.0</Version>
18-
<PackageVersion>4.6.0</PackageVersion>
19-
<AssemblyVersion>4.6.0</AssemblyVersion>
20-
<FileVersion>4.6.0</FileVersion>
17+
<Version>4.7.0</Version>
18+
<PackageVersion>4.7.0</PackageVersion>
19+
<AssemblyVersion>4.7.0</AssemblyVersion>
20+
<FileVersion>4.7.0</FileVersion>
2121
<PackageId>Flow.Launcher.Plugin</PackageId>
2222
<Authors>Flow-Launcher</Authors>
2323
<PackageLicenseExpression>MIT</PackageLicenseExpression>

Flow.Launcher/Languages/ar.xaml

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<system:String x:Key="runtimeExecutableInvalidChooseDownload">
1111
Your selected {0} executable is invalid.
1212
{2}{2}
13-
Click yes if you would like select the {0} executable agian. Click no if you would like to download {1}
13+
Click yes if you would like select the {0} executable again. Click no if you would like to download {1}
1414
</system:String>
1515
<system:String x:Key="runtimePluginUnableToSetExecutablePath">تعذر تعيين مسار الملف التنفيذي لـ {0}، يرجى المحاولة من إعدادات Flow (قم بالتمرير إلى الأسفل).</system:String>
1616
<system:String x:Key="failedToInitializePluginsTitle">فشل في تهيئة الإضافات</system:String>
@@ -138,6 +138,10 @@
138138
<system:String x:Key="homeToggleBoxToolTip">This can only be edited if plugin supports Home feature and Home Page is enabled.</system:String>
139139
<system:String x:Key="showAtTopmost">Show Search Window at Foremost</system:String>
140140
<system:String x:Key="showAtTopmostToolTip">Overrides other programs' 'Always on Top' setting and displays Flow in the foremost position.</system:String>
141+
<system:String x:Key="autoRestartAfterChanging">Restart after modifying plugin via Plugin Store</system:String>
142+
<system:String x:Key="autoRestartAfterChangingToolTip">Restart Flow Launcher automatically after installing/uninstalling/updating plugin via Plugin Store</system:String>
143+
<system:String x:Key="showUnknownSourceWarning">Show unknown source warning</system:String>
144+
<system:String x:Key="showUnknownSourceWarningToolTip">Show warning when installing plugins from unknown sources</system:String>
141145

142146
<!-- Setting Plugin -->
143147
<system:String x:Key="searchplugin">البحث عن إضافة</system:String>
@@ -176,6 +180,12 @@
176180
<system:String x:Key="failedToRemovePluginSettingsMessage">Plugins: {0} - Fail to remove plugin settings files, please remove them manually</system:String>
177181
<system:String x:Key="failedToRemovePluginCacheTitle">Fail to remove plugin cache</system:String>
178182
<system:String x:Key="failedToRemovePluginCacheMessage">Plugins: {0} - Fail to remove plugin cache files, please remove them manually</system:String>
183+
<system:String x:Key="pluginModifiedAlreadyTitle">{0} modified already</system:String>
184+
<system:String x:Key="pluginModifiedAlreadyMessage">Please restart Flow before making any further changes</system:String>
185+
<system:String x:Key="failedToInstallPluginTitle">Fail to install {0}</system:String>
186+
<system:String x:Key="failedToUninstallPluginTitle">Fail to uninstall {0}</system:String>
187+
<system:String x:Key="fileNotFoundMessage">Unable to find plugin.json from the extracted zip file, or this path {0} does not exist</system:String>
188+
<system:String x:Key="pluginExistAlreadyMessage">A plugin with the same ID and version already exists, or the version is greater than this downloaded plugin</system:String>
179189

180190
<!-- Setting Plugin Store -->
181191
<system:String x:Key="pluginStore">متجر الإضافات</system:String>
@@ -191,6 +201,28 @@
191201
<system:String x:Key="LabelNew">إصدار جديد</system:String>
192202
<system:String x:Key="LabelNewToolTip">تم تحديث هذه الإضافة في آخر 7 أيام</system:String>
193203
<system:String x:Key="LabelUpdateToolTip">يتوفر تحديث جديد</system:String>
204+
<system:String x:Key="ErrorInstallingPlugin">خطأ في تثبيت الإضاف</system:String>
205+
<system:String x:Key="ErrorUninstallingPlugin">خطأ في إلغاء تثبيت الإضافة</system:String>
206+
<system:String x:Key="ErrorUpdatingPlugin">Error updating plugin</system:String>
207+
<system:String x:Key="KeepPluginSettingsTitle">Keep plugin settings</system:String>
208+
<system:String x:Key="KeepPluginSettingsSubtitle">Do you want to keep the settings of the plugin for the next usage?</system:String>
209+
<system:String x:Key="InstallSuccessNoRestart">تم تثبيت الإضافة {0} بنجاح. يرجى إعادة تشغيل Flow.</system:String>
210+
<system:String x:Key="UninstallSuccessNoRestart">تم إلغاء تثبيت الإضافة {0} بنجاح. يرجى إعادة تشغيل Flow.</system:String>
211+
<system:String x:Key="UpdateSuccessNoRestart">تم تحديث الإضافة {0} بنجاح. يرجى إعادة تشغيل Flow.</system:String>
212+
<system:String x:Key="InstallPromptTitle">Plugin install</system:String>
213+
<system:String x:Key="InstallPromptSubtitle">{0} بواسطة {1} {2}{2}هل ترغب في تثبيت هذه الإضافة؟</system:String>
214+
<system:String x:Key="UninstallPromptTitle">Plugin uninstall</system:String>
215+
<system:String x:Key="UninstallPromptSubtitle">{0} بواسطة {1} {2}{2}هل ترغب في إلغاء تثبيت هذه الإضافة؟</system:String>
216+
<system:String x:Key="UpdatePromptTitle">Plugin update</system:String>
217+
<system:String x:Key="UpdatePromptSubtitle">{0} بواسطة {1} {2}{2}هل ترغب في تحديث هذه الإضافة؟</system:String>
218+
<system:String x:Key="DownloadingPlugin">تحميل الإضاف</system:String>
219+
<system:String x:Key="AutoRestartAfterChange">Automatically restart after installing/uninstalling/updating plugins in plugin store</system:String>
220+
<system:String x:Key="ZipFileNotHavePluginJson">Zip file does not have a valid plugin.json configuration</system:String>
221+
<system:String x:Key="InstallFromUnknownSourceTitle">التثبيت من مصدر غير معرو</system:String>
222+
<system:String x:Key="InstallFromUnknownSourceSubtitle">This plugin is from an unknown source and it may contain potential risks!{0}{0}Please ensure you understand where this plugin is from and that it is safe.{0}{0}Would you like to continue still?{0}{0}(You can switch off this warning in general section of setting window)</system:String>
223+
<system:String x:Key="ZipFiles">Zip files</system:String>
224+
<system:String x:Key="SelectZipFile">Please select zip file</system:String>
225+
<system:String x:Key="installLocalPluginTooltip">Install plugin from local path</system:String>
194226

195227
<!-- Setting Theme -->
196228
<system:String x:Key="theme">السمة</system:String>
@@ -383,7 +415,7 @@
383415
<system:String x:Key="fileManagerWindow">اختر مدير الملفات</system:String>
384416
<system:String x:Key="fileManager_learnMore">Learn more</system:String>
385417
<system:String x:Key="fileManager_tips">يرجى تحديد موقع ملف مدير الملفات الذي تستخدمه وإضافة الحجج حسب الحاجة. يمثل &quot;%d&quot; مسار الدليل المفتوح، ويستخدمه الحقل &quot;الحجة للمجلد&quot; للأوامر التي تفتح أدلة محددة. يمثل &quot;%f&quot; مسار الملف المفتوح، ويستخدمه الحقل &quot;الحجة للملف&quot; للأوامر التي تفتح ملفات محددة.</system:String>
386-
<system:String x:Key="fileManager_tips2">على سبيل المثال، إذا كان مدير الملفات يستخدم أمرًا مثل &quot;totalcmd.exe /A c:\windows&quot; لفتح دليل c:\windows، فإن مسار مدير الملفات سيكون totalcmd.exe، وحجة المجلد ستكون /A &quot;%d&quot;. قد تحتاج بعض مديري الملفات مثل QTTabBar فقط إلى توفير مسار، في هذه الحالة استخدم &quot;%d&quot; كمسار مدير الملفات واترك باقي الحقول فارغة.</system:String>
418+
<system:String x:Key="fileManager_tips2">For example, if the file manager uses a command such as &quot;totalcmd.exe /A c:\windows&quot; to open the c:\windows directory, the File Manager Path will be totalcmd.exe, and the Arg For Folder will be /A &quot;%d&quot;. Certain file managers like QTTabBar may just require a path to be supplied, in this instance use &quot;%d&quot; as the File Manager Path and leave the rest of the fields blank.</system:String>
387419
<system:String x:Key="fileManager_name">مدير الملفات</system:String>
388420
<system:String x:Key="fileManager_profile_name">اسم الملف الشخصي</system:String>
389421
<system:String x:Key="fileManager_path">مسار مدير الملفات</system:String>
@@ -434,13 +466,14 @@
434466
<system:String x:Key="customeQueryHotkeyTips">اضغط على مفتاح اختصار مخصص لفتح Flow Launcher وإدخال الاستعلام المحدد تلقائيًا.</system:String>
435467
<system:String x:Key="preview">معاينة</system:String>
436468
<system:String x:Key="hotkeyIsNotUnavailable">مفتاح الاختصار غير متاح، يرجى اختيار مفتاح اختصار جديد</system:String>
437-
<system:String x:Key="invalidPluginHotkey">مفتاح اختصار غير صالح للإضافة</system:String>
469+
<system:String x:Key="invalidPluginHotkey">Hotkey is invalid</system:String>
438470
<system:String x:Key="update">تحديث</system:String>
439471
<system:String x:Key="hotkeyRegTitle">ربط مفتاح الاختصار</system:String>
440472
<system:String x:Key="hotkeyUnavailable">مفتاح الاختصار الحالي غير متاح.</system:String>
441473
<system:String x:Key="hotkeyUnavailableUneditable">تم حجز هذا المفتاح لـ &quot;{0}&quot; ولا يمكن استخدامه. يرجى اختيار مفتاح اختصار آخر.</system:String>
442474
<system:String x:Key="hotkeyUnavailableEditable">يتم استخدام هذا المفتاح بالفعل من قبل &quot;{0}&quot;. إذا ضغطت على &quot;استبدال&quot;، سيتم إزالته من &quot;{0}&quot;.</system:String>
443475
<system:String x:Key="hotkeyRegGuide">اضغط على المفاتيح التي تريد استخدامها لهذه الوظيفة.</system:String>
476+
<system:String x:Key="emptyPluginHotkey">Hotkey and action keyword are empty</system:String>
444477

445478
<!-- Custom Query Shortcut Dialog -->
446479
<system:String x:Key="customeQueryShortcutTitle">اختصار الاستعلام المخصص</system:String>
@@ -451,6 +484,7 @@
451484
</system:String>
452485
<system:String x:Key="duplicateShortcut">الاختصار موجود بالفعل، يرجى إدخال اختصار جديد أو تعديل الموجود.</system:String>
453486
<system:String x:Key="emptyShortcut">الاختصار و/أو توسيعه فارغ.</system:String>
487+
<system:String x:Key="invalidShortcut">Shortcut is invalid</system:String>
454488

455489
<!-- Common Action -->
456490
<system:String x:Key="commonSave">حفظ</system:String>

0 commit comments

Comments
 (0)