Removed duplicate strings

src/Files/Dialogs/AddItemDialog.xaml.cs

@@ -27,7 +27,7 @@ public async void AddItemsToList()
 
             AddItemsList.Add(new AddListItem
             {
-                Header = "AddDialogListFolderHeader".GetLocalized(),
+                Header = "Folder".GetLocalized(),
                 SubHeader = "AddDialogListFolderSubHeader".GetLocalized(),
                 Glyph = "\xE838",
                 IsItemEnabled = true,

src/Files/Dialogs/DecompressArchiveDialog.xaml

@@ -37,12 +37,11 @@
             Text="{x:Bind ViewModel.DestinationFolderPath, Mode=OneWay}" />
 
         <Button
-            x:Uid="DecompressArchiveDialogBrowseFolder"
             Grid.Column="1"
             VerticalAlignment="Center"
             Background="Transparent"
             Command="{x:Bind ViewModel.SelectDestinationCommand}"
-            Content="Browse" />
+            Content="{helpers:ResourceString Name=Browse}" />
 
         <CheckBox
             x:Uid="DecompressArchiveDialogOpenDestinationWhenComplete"

src/Files/Dialogs/ElevateConfirmDialog.xaml

@@ -8,7 +8,7 @@
     x:Name="ConfirmElevationDialog"
     x:Uid="ElevateConfirmDialog"
     Title="This action requires adminstrator rights"
-    CloseButtonText="No"
+    CloseButtonText="{local2:ResourceString Name=No}"
     Content="Would you like to continue as administrator?"
     CornerRadius="{StaticResource OverlayCornerRadius}"
     DefaultButton="None"

src/Files/Dialogs/FilesystemOperationDialog.xaml

@@ -45,10 +45,9 @@
                     Tag="1"
                     Text="Replace existing" />
                 <MenuFlyoutItem
-                    x:Uid="ConflictingItemsDialogOptionSkip"
                     Click="MenuFlyoutItem_Click"
                     Tag="2"
-                    Text="Skip" />
+                    Text="{helpers:ResourceString Name=Skip}" />
                 <MenuFlyoutSeparator x:Name="ApplyToAllSeparator" />
                 <MenuFlyoutItem
                     x:Name="ApplyToAllOption"
@@ -215,9 +214,8 @@
                                                 Command="{Binding ReplaceExistingCommand}"
                                                 Text="Replace" />
                                             <MenuFlyoutItem
-                                                x:Uid="ConflictingItemsDialogItemOptionSkip"
                                                 Command="{Binding SkipCommand}"
-                                                Text="Skip" />
+                                                Text="{helpers:ResourceString Name=Skip}" />
                                         </MenuFlyout>
                                     </muxc:SplitButton.Flyout>
                                 </muxc:SplitButton>

src/Files/Filesystem/FilesystemOperations/FilesystemOperations.cs

@@ -210,7 +210,7 @@ await DialogDisplayHelper.ShowDialogAsync(
                     {
                         Title = "ErrorDialogThisActionCannotBeDone".GetLocalized(),
                         Content = $"{"ErrorDialogTheDestinationFolder".GetLocalized()} ({destinationName}) {"ErrorDialogIsASubfolder".GetLocalized()} (sourceName)",
-                        //PrimaryButtonText = "ErrorDialogSkip".GetLocalized(),
+                        //PrimaryButtonText = "Skip".GetLocalized(),
                         CloseButtonText = "Cancel".GetLocalized()
                     };
 
@@ -426,7 +426,7 @@ await DialogDisplayHelper.ShowDialogAsync(
                     {
                         Title = "ErrorDialogThisActionCannotBeDone".GetLocalized(),
                         Content = "ErrorDialogTheDestinationFolder".GetLocalized() + " (" + destinationName + ") " + "ErrorDialogIsASubfolder".GetLocalized() + " (" + sourceName + ")",
-                        //PrimaryButtonText = "ErrorDialogSkip".GetLocalized(),
+                        //PrimaryButtonText = "Skip".GetLocalized(),
                         CloseButtonText = "Cancel".GetLocalized()
                     };
 

src/Files/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs

@@ -884,7 +884,7 @@ public async Task<ReturnResult> RenameAsync(IStorageItemWithPath source, string
                        not when file name has changed */
                     if (Path.GetExtension(source.Path) != Path.GetExtension(newName))
                     {
-                        var yesSelected = await DialogDisplayHelper.ShowDialogAsync("RenameFileDialogTitle".GetLocalized(), "RenameFileDialog/Text".GetLocalized(), "ButtonYes/Content".GetLocalized(), "ButtonNo/Content".GetLocalized());
+                        var yesSelected = await DialogDisplayHelper.ShowDialogAsync("RenameFileDialogTitle".GetLocalized(), "RenameFileDialog/Text".GetLocalized(), "Yes".GetLocalized(), "No".GetLocalized());
                         if (yesSelected)
                         {
                             history = await filesystemOperations.RenameAsync(source, newName, collision, errorCode, cancellationToken);

src/Files/Filesystem/ListedItem.cs

@@ -403,7 +403,7 @@ public override string ToString()
             }
             else
             {
-                suffix = PrimaryItemAttribute == StorageItemTypes.File ? "FileItemAutomation".GetLocalized() : "FolderItemAutomation".GetLocalized();
+                suffix = PrimaryItemAttribute == StorageItemTypes.File ? "Folder".GetLocalized() : "FolderItemAutomation".GetLocalized();
             }
 
             return $"{ItemName}, {suffix}";

src/Files/Filesystem/Permissions/FileSystemAccessRuleForUI.cs

@@ -109,7 +109,7 @@ public FileSystemRights FileSystemRights
             _ => "\xF140"
         };
 
-        public string IsInheritedForUI => IsInherited ? "Yes".GetLocalized() : "SecurityAdvancedInheritedNoLabel".GetLocalized();
+        public string IsInheritedForUI => IsInherited ? "Yes".GetLocalized() : "No".GetLocalized();
 
         public string FileSystemRightsForUI => string.Join(", ", GetPermissionStrings());
 
@@ -332,7 +332,7 @@ private List<GrantedPermission> GetGrantedPermissions()
                 gpl.Add(new GrantedPermission(this)
                 {
                     Permission = FileSystemRights.Write,
-                    Name = "SecurityWriteLabel/Text".GetLocalized(),
+                    Name = "Write".GetLocalized(),
                     IsEditable = !IsInherited
                 });
                 gpl.Add(new SpecialPermission(this)
@@ -392,7 +392,7 @@ private IList<string> GetPermissionStrings()
             var ret = new List<string>();
             if (FileSystemRights == 0)
             {
-                ret.Add("SecurityNoneLabel/Text".GetLocalized());
+                ret.Add("None".GetLocalized());
             }
             if (GrantsFullControl)
             {
@@ -412,7 +412,7 @@ private IList<string> GetPermissionStrings()
             }
             if (!GrantsFullControl && !GrantsModify && GrantsWrite)
             {
-                ret.Add("SecurityWriteLabel/Text".GetLocalized());
+                ret.Add("Write".GetLocalized());
             }
             if (GrantsSpecial)
             {

src/Files/Helpers/AcrylicTheme.cs

@@ -31,7 +31,7 @@ public AcrylicTheme()
             FallbackColor = (Color)App.Current.Resources["SolidBackgroundFillColorBase"];
         }
 
-        public void SetDefaultTheme()
+        public void SetDefault()
         {
             if (Application.Current.RequestedTheme == ApplicationTheme.Light)
             {

src/Files/Helpers/ContextFlyoutItemHelper.cs

@@ -112,7 +112,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
                         // Details view
                         new ContextMenuFlyoutItemViewModel()
                         {
-                            Text = "BaseLayoutContextFlyoutDetails/Text".GetLocalized(),
+                            Text = "Details".GetLocalized(),
                             Glyph = "\uE179",
                             ShowInRecycleBin = true,
                             ShowInSearchPage = true,
@@ -182,7 +182,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
                         // Column view
                         new ContextMenuFlyoutItemViewModel()
                         {
-                            Text = "BaseLayoutContextFlyoutColumn/Text".GetLocalized(),
+                            Text = "Columns".GetLocalized(),
                             Glyph = "\uF115",
                             GlyphFontFamilyName = "CustomGlyph",
                             ShowInRecycleBin = true,
@@ -234,7 +234,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
                         },
                         new ContextMenuFlyoutItemViewModel()
                         {
-                            Text = "BaseLayoutContextFlyoutSortByDateCreated/Text".GetLocalized(),
+                            Text = "DateCreated".GetLocalized(),
                             IsChecked = itemViewModel.IsSortedByDateCreated,
                             Command = new RelayCommand(() => itemViewModel.IsSortedByDateCreated = true),
                             ShowInRecycleBin = true,
@@ -256,7 +256,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
                         },
                         new ContextMenuFlyoutItemViewModel()
                         {
-                            Text = "BaseLayoutContextFlyoutSortBySize/Text".GetLocalized(),
+                            Text = "Size".GetLocalized(),
                             IsChecked = itemViewModel.IsSortedBySize,
                             Command = new RelayCommand(() => itemViewModel.IsSortedBySize = true),
                             ShowInRecycleBin = true,
@@ -294,7 +294,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
                         },
                         new ContextMenuFlyoutItemViewModel()
                         {
-                            Text = "BaseLayoutContextFlyoutSortByDateDeleted/Text".GetLocalized(),
+                            Text = "DateDeleted".GetLocalized(),
                             IsChecked = itemViewModel.IsSortedByDateDeleted,
                             Command = new RelayCommand(() => itemViewModel.IsSortedByDateDeleted = true),
                             ShowInRecycleBin = true,
@@ -311,7 +311,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
                         },
                         new ContextMenuFlyoutItemViewModel()
                         {
-                            Text = "BaseLayoutContextFlyoutSortByAscending/Text".GetLocalized(),
+                            Text = "Ascending".GetLocalized(),
                             IsChecked = itemViewModel.IsSortedAscending,
                             Command = new RelayCommand(() => itemViewModel.IsSortedAscending = true),
                             ShowInRecycleBin = true,
@@ -345,7 +345,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
                     {
                         new ContextMenuFlyoutItemViewModel()
                         {
-                            Text = "NavToolbarGroupByOptionNone/Text".GetLocalized(),
+                            Text = "None".GetLocalized(),
                             IsChecked = currentInstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.None,
                             ShowInRecycleBin = true,
                             ShowInSearchPage = true,
@@ -381,7 +381,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
                         },
                         new ContextMenuFlyoutItemViewModel()
                         {
-                            Text = "BaseLayoutContextFlyoutSortByDateCreated/Text".GetLocalized(),
+                            Text = "DateCreated".GetLocalized(),
                             IsChecked = currentInstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.DateCreated,
                             ShowInRecycleBin = true,
                             ShowInSearchPage = true,
@@ -405,7 +405,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
                         },
                         new ContextMenuFlyoutItemViewModel()
                         {
-                            Text = "BaseLayoutContextFlyoutSortBySize/Text".GetLocalized(),
+                            Text = "Size".GetLocalized(),
                             IsChecked = currentInstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.Size,
                             ShowInRecycleBin = true,
                             ShowInSearchPage = true,
@@ -447,7 +447,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
                         },
                         new ContextMenuFlyoutItemViewModel()
                         {
-                            Text = "BaseLayoutContextFlyoutSortByDateDeleted/Text".GetLocalized(),
+                            Text = "DateDeleted".GetLocalized(),
                             IsChecked = currentInstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.DateDeleted,
                             ShowInRecycleBin = true,
                             Command = currentInstanceViewModel.FolderSettings.ChangeGroupOptionCommand,
@@ -503,7 +503,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
                 },
                 new ContextMenuFlyoutItemViewModel()
                 {
-                    Text = "BaseLayoutContextFlyoutOpenInTerminal/Text".GetLocalized(),
+                    Text = "OpenInTerminal".GetLocalized(),
                     Glyph = "\uE756",
                     Command = commandsViewModel.OpenDirectoryInDefaultTerminalCommand,
                 },
@@ -766,7 +766,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(BaseLayo
                 },
                 new ContextMenuFlyoutItemViewModel()
                 {
-                    Text = "BaseLayoutItemContextFlyoutCopy/Text".GetLocalized(),
+                    Text = "Copy".GetLocalized(),
                     //Glyph = "\uF8C8",
                     ColoredIcon = new ColoredIconModel()
                     {
@@ -1023,7 +1023,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetNewItemItems(BaseLayoutCom
             {
                 new ContextMenuFlyoutItemViewModel()
                 {
-                    Text = "BaseLayoutContextFlyoutNewFolder/Text".GetLocalized(),
+                    Text = "Folder".GetLocalized(),
                     Glyph = "\uE8B7",
                     Command = commandsViewModel.CreateNewFolderCommand,
                     ShowInFtpPage = true,

src/Files/Helpers/ExternalResourcesHelper.cs

@@ -16,7 +16,7 @@ public class ExternalResourcesHelper
         {
             new AppTheme
             {
-                Name = "DefaultTheme".GetLocalized(),
+                Name = "Default".GetLocalized(),
             },
         };
 

src/Files/Helpers/ItemListDisplayHelpers/GroupingHelper.cs

@@ -93,7 +93,7 @@ public static (Action<GroupedCollection<ListedItem>>, Action<GroupedCollection<L
                 {
                     ListedItem first = x.First();
                     x.Model.ShowCountTextBelow = true;
-                    x.Model.Text = first.FileTagUI?.TagName ?? "NavToolbarGroupByOptionNone/Text".GetLocalized();
+                    x.Model.Text = first.FileTagUI?.TagName ?? "None".GetLocalized();
                     //x.Model.Icon = first?.FileTagUI?.Color;
                 }, null),
 

src/Files/Helpers/ThemeHelper.cs

@@ -88,7 +88,7 @@ private static void ApplyTheme()
             switch (rootTheme)
             {
                 case ElementTheme.Default:
-                    App.AppSettings.AcrylicTheme.SetDefaultTheme();
+                    App.AppSettings.AcrylicTheme.SetDefault();
                     titleBar.ButtonHoverBackgroundColor = (Color)Application.Current.Resources["SystemBaseLowColor"];
                     titleBar.ButtonForegroundColor = (Color)Application.Current.Resources["SystemBaseHighColor"];
                     break;