From efe98f7fad1803b1788498d7b32086ab47e7fde6 Mon Sep 17 00:00:00 2001
From: Clint Rutkas <clint@rutkas.com>
Date: Fri, 8 May 2020 14:13:48 -0700
Subject: [PATCH] Fixing ordering in settings and text tweaks (#2809)

* ordering alphabetically.

* test tweaks
---
 .../Strings/en-us/Resources.resw              | 16 +++---
 .../Views/ShellPage.xaml                      | 49 +++++++++----------
 2 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index b66a388f00..0bac7bad9d 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -273,7 +273,7 @@
     <value>Excluded apps</value>
   </data>
   <data name="FancyZones_ExcludeApps_TextBoxControl.Header" xml:space="preserve">
-    <value>To exclude an application from snapping to zones add its name here (one per line). Excluded apps will react to the Windows Snap regardless of all other settings.</value>
+    <value>To exclude an application from snapping to zones add its name here (one per line). These apps will react only to Windows Snap.</value>
   </data>
   <data name="FancyZones_HighlightOpacity.Header" xml:space="preserve">
     <value>Zone highlight opacity (%)</value>
@@ -295,7 +295,7 @@
   </data>
   <data name="FancyZones_MoveVindowsAcrossAllMonitorsCheckBoxControl.Content" xml:space="preserve">
     <value>Move windows between zones across all monitors when snapping with win+arrow</value>
-  </data>  
+  </data>
   <data name="FancyZones_OverrideSnapHotkeysCheckBoxControl.Content" xml:space="preserve">
     <value>Override Windows Snap hotkeys (Win + arrow) to move windows between zones</value>
   </data>
@@ -381,13 +381,13 @@
     <value>Show icon on context menu</value>
   </data>
   <data name="PowerRename_Toggle_EnableOnExtendedContextMenu.Header" xml:space="preserve">
-    <value>Only show the PowerRename menu item on the extended context menu (Shift + Right-click).</value>
+    <value>Appear only in extended context menu (Shift + Right-click)</value>
   </data>
   <data name="PowerRename_Toggle_MaxDispListNum.Text" xml:space="preserve">
-    <value>Maximum numbers of items to show in recently used list for autocomplete dropdown.</value>
+    <value>Maximum numbers of items to show in recently used list for autocomplete dropdown</value>
   </data>
   <data name="PowerRename_Toggle_RestoreFlagsOnLaunch.Header" xml:space="preserve">
-    <value>Restore search, replace and flags values on launch from previous run.</value>
+    <value>Show values from last use</value>
   </data>
   <data name="FileEplorerPreview_ToggleSwitch_Preview_MD.Header" xml:space="preserve">
     <value>Markdown Preview Handler</value>
@@ -405,7 +405,7 @@
     <value>Open-source notice</value>
   </data>
   <data name="PowerRename_Toggle_AutoComplete.Header" xml:space="preserve">
-    <value>Enable autocomplete and autosuggest of recently used list for autocomplete dropdown.</value>
+    <value>Enable auto-complete and auto-suggest of recently used list for autocomplete dropdown</value>
   </data>
   <data name="FancyZones_BorderColor.Text" xml:space="preserve">
     <value>Zone border color (Default #FFFFFF)</value>
@@ -423,7 +423,7 @@
     <value>Shows a help overlay with Windows shortcuts when the Windows key is pressed.</value>
   </data>
   <data name="ShortcutGuide_PressTime.Header" xml:space="preserve">
-    <value>How long to press the Windows key before showing the Shortcut Guide</value>
+    <value>Press duration before showing (ms)</value>
   </data>
   <data name="ShortcutGuide_Appearance_Behavior.Text" xml:space="preserve">
     <value>Appearance &amp; Behavior</value>
@@ -432,7 +432,7 @@
     <value>Enable Shortcut Guide</value>
   </data>
   <data name="ShortcutGuide_OverlayOpacity.Header" xml:space="preserve">
-    <value>Opacity of the Shortcut Guide's overlay background (%)</value>
+    <value>Opacity of background (%)</value>
   </data>
   <data name="ImageResizer_CustomSizes.Text" xml:space="preserve">
     <value>Image Sizes</value>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
index addae1292a..ef5adb72a4 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
@@ -40,12 +40,6 @@
           
         </winui:NavigationView.PaneHeader>   -->
             <winui:NavigationView.MenuItems>
-                <!--
-            TODO WTS: Change the symbols for each item as appropriate for your app
-            More on Segoe UI Symbol icons: https://docs.microsoft.com/windows/uwp/style/segoe-ui-symbol-font
-            Or to use an IconElement instead of a Symbol see https://github.com/Microsoft/WindowsTemplateStudio/blob/master/docs/projectTypes/navigationpane.md
-            Edit String/en-US/Resources.resw: Add a menu item title for each page
-            -->
                 <winui:NavigationViewItem x:Uid="Shell_General" helpers:NavHelper.NavigateTo="views:GeneralPage">
                     <winui:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE713;"/>
@@ -58,27 +52,6 @@
                         <PathIcon Data="M896 0v896H0V0h896zM768 768V128H128v640h640zM0 1920v-896h1920v896H0zm128-768v640h1664v-640H128zM1024 0h896v896h-896V0zm768 768V128h-640v640h640z"></PathIcon>
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>
-                
-                <!-- TO DO: Update icon -->
-            <winui:NavigationViewItem x:Uid="Shell_PowerRename" helpers:NavHelper.NavigateTo="views:PowerRenamePage">
-                <winui:NavigationViewItem.Icon>
-                    <FontIcon Glyph="&#xE8AC;"/>
-                </winui:NavigationViewItem.Icon>
-            </winui:NavigationViewItem>
-
-                <!-- TO DO: Update icon -->
-                <winui:NavigationViewItem x:Uid="Shell_ShortcutGuide" helpers:NavHelper.NavigateTo="views:ShortcutGuidePage">
-                    <winui:NavigationViewItem.Icon>
-                        <FontIcon Glyph="&#xEDA7;"/>
-                    </winui:NavigationViewItem.Icon>
-                </winui:NavigationViewItem>
-
-                <!-- TO DO: Update icon -->
-                <winui:NavigationViewItem x:Uid="Shell_PowerLauncher" helpers:NavHelper.NavigateTo="views:PowerLauncherPage">
-                    <winui:NavigationViewItem.Icon>
-                        <FontIcon Glyph="&#xE8A7;"/>
-                    </winui:NavigationViewItem.Icon>
-                </winui:NavigationViewItem>
 
                 <winui:NavigationViewItem x:Uid="Shell_PowerPreview" helpers:NavHelper.NavigateTo="views:PowerPreviewPage" >
                     <winui:NavigationViewItem.Icon>
@@ -99,6 +72,28 @@
                         <FontIcon Glyph="&#xE765;"/>
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>
+
+                <!-- TO DO: Update icon -->
+                <winui:NavigationViewItem x:Uid="Shell_PowerRename" helpers:NavHelper.NavigateTo="views:PowerRenamePage">
+                    <winui:NavigationViewItem.Icon>
+                        <FontIcon Glyph="&#xE8AC;"/>
+                    </winui:NavigationViewItem.Icon>
+                </winui:NavigationViewItem>
+
+                <!-- TO DO: Update icon -->
+                <winui:NavigationViewItem x:Uid="Shell_PowerLauncher" helpers:NavHelper.NavigateTo="views:PowerLauncherPage">
+                    <winui:NavigationViewItem.Icon>
+                        <FontIcon Glyph="&#xE8A7;"/>
+                    </winui:NavigationViewItem.Icon>
+                </winui:NavigationViewItem>
+
+                <!-- TO DO: Update icon -->
+                <winui:NavigationViewItem x:Uid="Shell_ShortcutGuide" helpers:NavHelper.NavigateTo="views:ShortcutGuidePage">
+                    <winui:NavigationViewItem.Icon>
+                        <FontIcon Glyph="&#xEDA7;"/>
+                    </winui:NavigationViewItem.Icon>
+                </winui:NavigationViewItem>
+
             </winui:NavigationView.MenuItems>
             <i:Interaction.Behaviors>
                 <behaviors:NavigationViewHeaderBehavior