From 534da91386c47d1d1353658aa23db19de6c5dbbc Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Wed, 10 Jan 2024 10:18:16 -0500
Subject: [PATCH] Strings: Update strings

---
 src/Files.App/Services/Settings/FoldersSettingsService.cs | 4 ++--
 src/Files.App/Strings/en-US/Resources.resw                | 4 ++--
 src/Files.App/ViewModels/Settings/FoldersViewModel.cs     | 8 ++++----
 src/Files.App/Views/Settings/FoldersPage.xaml             | 6 +++---
 src/Files.App/Views/Shells/BaseShellPage.cs               | 2 +-
 .../Services/Settings/IFoldersSettingsService.cs          | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Files.App/Services/Settings/FoldersSettingsService.cs b/src/Files.App/Services/Settings/FoldersSettingsService.cs
index b92d9d3fd027..aa2d3fddf934 100644
--- a/src/Files.App/Services/Settings/FoldersSettingsService.cs
+++ b/src/Files.App/Services/Settings/FoldersSettingsService.cs
@@ -297,7 +297,7 @@ public bool OpenFoldersInNewTab
 			set => Set(value);
 		}
 
-		public bool ScrollToParentFolderWhenNavigatingUp
+		public bool ScrollToPreviousFolderWhenNavigatingUp
 		{
 			get => Get(true);
 			set => Set(value);
@@ -427,7 +427,7 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
 				case nameof(OpenItemsWithOneClick):
 				case nameof(ColumnLayoutOpenFoldersWithOneClick):
 				case nameof(OpenFoldersInNewTab):
-				case nameof(ScrollToParentFolderWhenNavigatingUp):
+				case nameof(ScrollToPreviousFolderWhenNavigatingUp):
 				case nameof(CalculateFolderSizes):
 				case nameof(ShowFileExtensions):
 				case nameof(ShowThumbnails):
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
index 86bb44964375..dfebaf835958 100644
--- a/src/Files.App/Strings/en-US/Resources.resw
+++ b/src/Files.App/Strings/en-US/Resources.resw
@@ -3683,7 +3683,7 @@
   <data name="FaildToShareItems" xml:space="preserve">
     <value>Failed to share items</value>
   </data>
-  <data name="ScrollToParentFolderWhenNavigatingUp" xml:space="preserve">
-    <value>Scroll to parent folder when navigating up</value>
+  <data name="ScrollToPreviousFolderWhenNavigatingUp" xml:space="preserve">
+    <value>Scroll to previous folder when navigating up</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/Files.App/ViewModels/Settings/FoldersViewModel.cs b/src/Files.App/ViewModels/Settings/FoldersViewModel.cs
index fa2e4e7c8453..fd524e6f52ac 100644
--- a/src/Files.App/ViewModels/Settings/FoldersViewModel.cs
+++ b/src/Files.App/ViewModels/Settings/FoldersViewModel.cs
@@ -338,14 +338,14 @@ public bool CalculateFolderSizes
 			}
 		}
 
-		public bool ScrollToParentFolderWhenNavigatingUp
+		public bool ScrollToPreviousFolderWhenNavigatingUp
 		{
-			get => UserSettingsService.FoldersSettingsService.ScrollToParentFolderWhenNavigatingUp;
+			get => UserSettingsService.FoldersSettingsService.ScrollToPreviousFolderWhenNavigatingUp;
 			set
 			{
-				if (value != UserSettingsService.FoldersSettingsService.ScrollToParentFolderWhenNavigatingUp)
+				if (value != UserSettingsService.FoldersSettingsService.ScrollToPreviousFolderWhenNavigatingUp)
 				{
-					UserSettingsService.FoldersSettingsService.ScrollToParentFolderWhenNavigatingUp = value;
+					UserSettingsService.FoldersSettingsService.ScrollToPreviousFolderWhenNavigatingUp = value;
 
 					OnPropertyChanged();
 				}
diff --git a/src/Files.App/Views/Settings/FoldersPage.xaml b/src/Files.App/Views/Settings/FoldersPage.xaml
index 5559bda09894..766972021e4d 100644
--- a/src/Files.App/Views/Settings/FoldersPage.xaml
+++ b/src/Files.App/Views/Settings/FoldersPage.xaml
@@ -352,14 +352,14 @@
 			</local:SettingsBlockControl>
 
 			<!--  Scroll to parent folder when navigating up  -->
-			<local:SettingsBlockControl Title="{helpers:ResourceString Name=ScrollToParentFolderWhenNavigatingUp}" HorizontalAlignment="Stretch">
+			<local:SettingsBlockControl Title="{helpers:ResourceString Name=ScrollToPreviousFolderWhenNavigatingUp}" HorizontalAlignment="Stretch">
 				<local:SettingsBlockControl.Icon>
 					<FontIcon Glyph="&#xECE7;" />
 				</local:SettingsBlockControl.Icon>
 
 				<ToggleSwitch
-					AutomationProperties.Name="{helpers:ResourceString Name=ScrollToParentFolderWhenNavigatingUp}"
-					IsOn="{x:Bind ViewModel.ScrollToParentFolderWhenNavigatingUp, Mode=TwoWay}"
+					AutomationProperties.Name="{helpers:ResourceString Name=ScrollToPreviousFolderWhenNavigatingUp}"
+					IsOn="{x:Bind ViewModel.ScrollToPreviousFolderWhenNavigatingUp, Mode=TwoWay}"
 					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
 			</local:SettingsBlockControl>
 
diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs
index 4bfb2e37a511..d98bcf9a2e48 100644
--- a/src/Files.App/Views/Shells/BaseShellPage.cs
+++ b/src/Files.App/Views/Shells/BaseShellPage.cs
@@ -670,7 +670,7 @@ protected void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoad
 
 						if (itemToSelect is not null && ContentPage is not null)
 						{
-							if (userSettingsService.FoldersSettingsService.ScrollToParentFolderWhenNavigatingUp)
+							if (userSettingsService.FoldersSettingsService.ScrollToPreviousFolderWhenNavigatingUp)
 							{
 								ContentPage.ItemManipulationModel.SetSelectedItem(itemToSelect);
 								ContentPage.ItemManipulationModel.ScrollIntoView(itemToSelect);
diff --git a/src/Files.Core/Services/Settings/IFoldersSettingsService.cs b/src/Files.Core/Services/Settings/IFoldersSettingsService.cs
index 19bf964e7d14..316d2fde8636 100644
--- a/src/Files.Core/Services/Settings/IFoldersSettingsService.cs
+++ b/src/Files.Core/Services/Settings/IFoldersSettingsService.cs
@@ -203,7 +203,7 @@ public interface IFoldersSettingsService : IBaseSettingsService, INotifyProperty
 		/// <summary>
 		/// Gets or sets a value indicating whether or not to scroll to the parent folder when navigating up.
 		/// </summary>
-		bool ScrollToParentFolderWhenNavigatingUp { get; set; }
+		bool ScrollToPreviousFolderWhenNavigatingUp { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value indicating the default sorting option.