Rename folders page

Author: yaira2

src/Files.App/Dialogs/SettingsDialog.xaml

@@ -104,21 +104,21 @@
 					</NavigationViewItem.Icon>
 				</NavigationViewItem>
 				<NavigationViewItem
-					AccessKey="F"
-					AutomationProperties.AutomationId="SettingsItemFolders"
-					Content="{helpers:ResourceString Name=Folders}"
+					AccessKey="L"
+					AutomationProperties.AutomationId="SettingsItemLayout"
+					Content="{helpers:ResourceString Name=Layout}"
 					Tag="2">
 					<NavigationViewItem.Icon>
-						<FontIcon Glyph="&#xE8B7;" />
+						<FontIcon Glyph="&#xE8A9;" />
 					</NavigationViewItem.Icon>
 				</NavigationViewItem>
 				<NavigationViewItem
-					AccessKey="L"
-					AutomationProperties.AutomationId="SettingsItemLayout"
-					Content="{helpers:ResourceString Name=Layout}"
+					AccessKey="F"
+					AutomationProperties.AutomationId="SettingsItemFolders"
+					Content="{helpers:ResourceString Name=FilesAndFolders}"
 					Tag="3">
 					<NavigationViewItem.Icon>
-						<FontIcon Glyph="&#xE8BA;" />
+						<FontIcon Glyph="&#xE8B7;" />
 					</NavigationViewItem.Icon>
 				</NavigationViewItem>
 				<NavigationViewItem

src/Files.App/Dialogs/SettingsDialog.xaml.cs

@@ -51,8 +51,8 @@ private void MainSettingsNavigationView_SelectionChanged(NavigationView sender,
 			{
 				0 => SettingsContentFrame.Navigate(typeof(GeneralPage)),
 				1 => SettingsContentFrame.Navigate(typeof(AppearancePage)),
-				2 => SettingsContentFrame.Navigate(typeof(FoldersPage)),
-				3 => SettingsContentFrame.Navigate(typeof(LayoutPage)),
+				2 => SettingsContentFrame.Navigate(typeof(LayoutPage)),
+				3 => SettingsContentFrame.Navigate(typeof(FoldersPage)),
 				4 => SettingsContentFrame.Navigate(typeof(TagsPage)),
 				5 => SettingsContentFrame.Navigate(typeof(GitPage)),
 				6 => SettingsContentFrame.Navigate(typeof(AdvancedPage)),

src/Files.App/Strings/en-US/Resources.resw

@@ -1029,8 +1029,8 @@
   <data name="OpenInNewPane" xml:space="preserve">
     <value>Open in new pane</value>
   </data>
-  <data name="Folders" xml:space="preserve">
-    <value>Folders</value>
+  <data name="FilesAndFolders" xml:space="preserve">
+    <value>Files &amp; folders</value>
   </data>
   <data name="NavToolbarDetails.ToolTipService.ToolTip" xml:space="preserve">
     <value>Details (Ctrl+Shift+1)</value>

src/Files.App/Views/Settings/FoldersPage.xaml

@@ -34,7 +34,7 @@
 				Padding="0,0,0,12"
 				FontSize="24"
 				FontWeight="Medium"
-				Text="{helpers:ResourceString Name=Folders}" />
+				Text="{helpers:ResourceString Name=FilesAndFolders}" />
 
 			<!--  Display  -->
 			<TextBlock

src/Files.App/Views/Settings/LayoutPage.xaml

@@ -168,7 +168,7 @@
 			<!--  Layout mode  -->
 			<local:SettingsBlockControl Title="{helpers:ResourceString Name=Layout}" HorizontalAlignment="Stretch">
 				<local:SettingsBlockControl.Icon>
-					<FontIcon Glyph="&#xE8A9;" />
+					<FontIcon Glyph="&#xE8BA;" />
 				</local:SettingsBlockControl.Icon>
 
 				<ComboBox AutomationProperties.Name="{helpers:ResourceString Name=Layout}" SelectedIndex="{x:Bind ViewModel.SelectedDefaultLayoutModeIndex, Mode=TwoWay}">

tests/Files.InteractionTests/Tests/SettingsTests.cs

@@ -28,8 +28,8 @@ public void VerifySettingsAreAccessible()
 			{
 				"SettingsItemGeneral",
 				"SettingsItemAppearance",
-				"SettingsItemFolders",
 				"SettingsItemLayout",
+				"SettingsItemFolders",
 				"SettingsItemTags",
 				"SettingsItemGit",
 				"SettingsItemAdvanced",