Skip to content

Commit d114bfc

Browse files
codingonHPcodingonHP
authored
Merge branch 'srwi:develop' into feature/auto-start-everything-when-not-running
2 parents a25acef + 5920797 commit d114bfc

9 files changed

Lines changed: 250 additions & 250 deletions

File tree

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
3-
<FileVersion>2.0.4.0</FileVersion>
4-
<AssemblyVersion>2.0.4.0</AssemblyVersion>
3+
<FileVersion>2.1.0.0</FileVersion>
4+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
55
<SelfContained>false</SelfContained>
66
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
77
<PublishReadyToRun>true</PublishReadyToRun>

‎EverythingToolbar.Launcher/Properties/Resources.he.resx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -142,30 +142,30 @@
142142
<value>יציאה ממסייע ההגדרה</value>
143143
</data>
144144
<data name="SetupAssistantPinToTaskbar" xml:space="preserve">
145-
<value>Pin to taskbar</value>
145+
<value>הצמד לשורת המשימות</value>
146146
</data>
147147
<data name="SetupAssistantPreferences" xml:space="preserve">
148-
<value>Preferences</value>
148+
<value>העדפות</value>
149149
</data>
150150
<data name="SetupAssistantHideWindowsSearch" xml:space="preserve">
151-
<value>Hide Windows search icon</value>
151+
<value>הסתר את החיפוש של Windows</value>
152152
</data>
153153
<data name="SetupAssistantHideWindowsSearchHelp" xml:space="preserve">
154-
<value>Hides the original Windows search icon from the taskbar</value>
154+
<value>מסתיר את סמל החיפוש המקורי של Windows משורת המשימות</value>
155155
</data>
156156
<data name="SetupAssistantEnableSystemTray" xml:space="preserve">
157-
<value>Enable system tray icon</value>
157+
<value>הפעל סמל מגש המערכת</value>
158158
</data>
159159
<data name="SetupAssistantEnableSystemTrayHelp" xml:space="preserve">
160-
<value>Enables the system tray icon for quick access to settings</value>
160+
<value>הפעל סמל במגש המערכת, לגישה מהירה להגדרות</value>
161161
</data>
162162
<data name="SetupAssistantEnableAutostart" xml:space="preserve">
163-
<value>Enable autostart</value>
163+
<value>אפשר הפעלה אוטומטית ליישום</value>
164164
</data>
165165
<data name="SetupAssistantEnableAutostartHelp" xml:space="preserve">
166-
<value>Automatically starts EverythingToolbar when Windows starts</value>
166+
<value>מפעיל אוטומטית את סרגל הכלים של EverythingToolbar בעת הפעלת Windows</value>
167167
</data>
168168
<data name="SetupAssistantDone" xml:space="preserve">
169-
<value>Done</value>
169+
<value>בוצע</value>
170170
</data>
171171
</root>

‎EverythingToolbar.Launcher/Properties/Resources.hu.resx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -142,30 +142,30 @@
142142
<value>Kilépés a Beállítási asszisztensből</value>
143143
</data>
144144
<data name="SetupAssistantPinToTaskbar" xml:space="preserve">
145-
<value>Pin to taskbar</value>
145+
<value>Kitűzés a tálcára</value>
146146
</data>
147147
<data name="SetupAssistantPreferences" xml:space="preserve">
148-
<value>Preferences</value>
148+
<value>Beállítások</value>
149149
</data>
150150
<data name="SetupAssistantHideWindowsSearch" xml:space="preserve">
151-
<value>Hide Windows search icon</value>
151+
<value>Windows kereső elrejtése</value>
152152
</data>
153153
<data name="SetupAssistantHideWindowsSearchHelp" xml:space="preserve">
154-
<value>Hides the original Windows search icon from the taskbar</value>
154+
<value>Elrejti a Windows keresőt az tálcáról</value>
155155
</data>
156156
<data name="SetupAssistantEnableSystemTray" xml:space="preserve">
157-
<value>Enable system tray icon</value>
157+
<value>Rejtett ikon engedélyezése</value>
158158
</data>
159159
<data name="SetupAssistantEnableSystemTrayHelp" xml:space="preserve">
160-
<value>Enables the system tray icon for quick access to settings</value>
160+
<value>Engedélyezi a rejtett ikont a beállítások gyors eléréséért</value>
161161
</data>
162162
<data name="SetupAssistantEnableAutostart" xml:space="preserve">
163-
<value>Enable autostart</value>
163+
<value>Alkalmazás automatikus indítása</value>
164164
</data>
165165
<data name="SetupAssistantEnableAutostartHelp" xml:space="preserve">
166-
<value>Automatically starts EverythingToolbar when Windows starts</value>
166+
<value>Automatikusan elindítja az EverythingToolbart a Windows indításakor</value>
167167
</data>
168168
<data name="SetupAssistantDone" xml:space="preserve">
169-
<value>Done</value>
169+
<value>Kész</value>
170170
</data>
171171
</root>

‎EverythingToolbar.Launcher/Properties/Resources.pt-BR.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
<value>Enable autostart</value>
164164
</data>
165165
<data name="SetupAssistantEnableAutostartHelp" xml:space="preserve">
166-
<value>Automatically starts EverythingToolbar when Windows starts</value>
166+
<value>Iniciar automaticamente o EverythingToolbar com o Windows</value>
167167
</data>
168168
<data name="SetupAssistantDone" xml:space="preserve">
169169
<value>Done</value>

‎EverythingToolbar.Launcher/Properties/Resources.zh.resx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@
121121
<value>離開</value>
122122
</data>
123123
<data name="ContextMenuRunSetupAssistant" xml:space="preserve">
124-
<value>執行設置助手……</value>
124+
<value>執行設定精靈...</value>
125125
</data>
126126
<data name="SetupAssistantPinToTaskbarHelp" xml:space="preserve">
127-
<value>要將 EverythingToobar 釘選至工作列，請在圖示上點擊右鍵並選擇「釘選到工作列」。</value>
127+
<value>要將 EverythingToolbar 釘選到工作列，請在其圖示上按右鍵並選擇「釘選到工作列」。</value>
128128
</data>
129129
<data name="SetupAssistantRestartExplorerDialogText" xml:space="preserve">
130130
<value>更新工作列圖示需要重啟檔案總管，您想要立即重新啟動嗎？</value>
@@ -133,39 +133,39 @@
133133
<value>重啟檔案總管</value>
134134
</data>
135135
<data name="SetupAssistantTitle" xml:space="preserve">
136-
<value>EverythingToolbar 設置助手</value>
136+
<value>EverythingToolbar 設定精靈</value>
137137
</data>
138138
<data name="SetupAssistantDisableWarningText" xml:space="preserve">
139-
<value>您確定要退出設置助手嗎？退出後，EverythingToolbar 只能通過鍵盤快捷鍵訪問。您可以通過系統匣圖示再次進入設置助手，將搜尋圖示固定到任務欄。</value>
139+
<value>您確定要結束設定精靈嗎？結束後只能透過快速鍵使用 EverythingToolbar。您隨時可透過系統匣圖示重新開啟設定精靈，以將搜尋圖示釘選到工作列。</value>
140140
</data>
141141
<data name="SetupAssistantDisableWarningTitle" xml:space="preserve">
142-
<value>執行設置助手</value>
142+
<value>執行設定精靈</value>
143143
</data>
144144
<data name="SetupAssistantPinToTaskbar" xml:space="preserve">
145-
<value>Pin to taskbar</value>
145+
<value>釘選到工作列</value>
146146
</data>
147147
<data name="SetupAssistantPreferences" xml:space="preserve">
148-
<value>Preferences</value>
148+
<value>偏好設定</value>
149149
</data>
150150
<data name="SetupAssistantHideWindowsSearch" xml:space="preserve">
151-
<value>Hide Windows search icon</value>
151+
<value>隱藏 Windows 搜尋圖示</value>
152152
</data>
153153
<data name="SetupAssistantHideWindowsSearchHelp" xml:space="preserve">
154-
<value>Hides the original Windows search icon from the taskbar</value>
154+
<value>隱藏工作列上原有的 Windows 搜尋圖示</value>
155155
</data>
156156
<data name="SetupAssistantEnableSystemTray" xml:space="preserve">
157-
<value>Enable system tray icon</value>
157+
<value>啟用系統匣圖示</value>
158158
</data>
159159
<data name="SetupAssistantEnableSystemTrayHelp" xml:space="preserve">
160-
<value>Enables the system tray icon for quick access to settings</value>
160+
<value>啟用系統匣圖示以快速存取設定</value>
161161
</data>
162162
<data name="SetupAssistantEnableAutostart" xml:space="preserve">
163-
<value>Enable autostart</value>
163+
<value>啟用自動啟動</value>
164164
</data>
165165
<data name="SetupAssistantEnableAutostartHelp" xml:space="preserve">
166-
<value>Automatically starts EverythingToolbar when Windows starts</value>
166+
<value>當 Windows 啟動時自動執行 EverythingToolbar</value>
167167
</data>
168168
<data name="SetupAssistantDone" xml:space="preserve">
169-
<value>Done</value>
169+
<value>完成</value>
170170
</data>
171171
</root>

‎EverythingToolbar/Controls/SettingsControl.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
Padding="10, 4, 10, 4">
1616
<Button.ContextMenu>
1717
<ContextMenu Name="SortByMenu"
18-
FontFamily="Global User Interface">
18+
FontFamily="{Binding RelativeSource={RelativeSource AncestorType={x:Type Window}}, Path=FontFamily}">
1919
<MenuItem IsCheckable="True"
2020
Header="{x:Static properties:Resources.SortByName}"
2121
Click="OnSortByClicked" />
@@ -75,7 +75,7 @@
7575
Style="{DynamicResource TabBarButtonStyle}"
7676
Padding="10, 4, 10, 4">
7777
<Button.ContextMenu>
78-
<ContextMenu FontFamily="Global User Interface">
78+
<ContextMenu FontFamily="{Binding RelativeSource={RelativeSource AncestorType={x:Type Window}}, Path=FontFamily}">
7979
<MenuItem IsCheckable="True"
8080
Header="{x:Static properties:Resources.SettingsRegularExpressions}"
8181
IsChecked="{Binding Source={x:Static local:ToolbarSettings.User}, Path=IsRegExEnabled, Mode=TwoWay}" />

0 commit comments

Comments
 (0)