Code Quality: Deleted duplicate string resources

src/Files.App/DataModels/NavigationControlItems/DriveItem.cs

@@ -215,15 +215,15 @@ public async Task UpdatePropertiesAsync()
 				}
 				else
 				{
-					SpaceText = "DriveCapacityUnknown".GetLocalizedResource();
+					SpaceText = "Unknown".GetLocalizedResource();
 					MaxSpace = SpaceUsed = FreeSpace = ByteSize.FromBytes(0);
 				}
 
 				OnPropertyChanged(nameof(ShowDriveDetails));
 			}
 			catch (Exception)
 			{
-				SpaceText = "DriveCapacityUnknown".GetLocalizedResource();
+				SpaceText = "Unknown".GetLocalizedResource();
 				MaxSpace = SpaceUsed = FreeSpace = ByteSize.FromBytes(0);
 
 				OnPropertyChanged(nameof(ShowDriveDetails));

src/Files.App/Dialogs/CredentialDialog.xaml

@@ -10,7 +10,7 @@
 	CornerRadius="{StaticResource OverlayCornerRadius}"
 	PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
 	PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
-	PrimaryButtonText="{helpers:ResourceString Name=AskCredentialDialog/PrimaryButtonText}"
+	PrimaryButtonText="{helpers:ResourceString Name=OK}"
 	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
 	SecondaryButtonText="{helpers:ResourceString Name=Cancel}"
 	Style="{StaticResource DefaultContentDialogStyle}"
@@ -42,7 +42,7 @@
 				x:Name="Password"
 				Margin="4"
 				IsEnabled="{x:Bind ViewModel.IsAnonymous, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
-				PlaceholderText="{helpers:ResourceString Name=CredentialDialogPassword/PlaceholderText}" />
+				PlaceholderText="{helpers:ResourceString Name=Password}" />
 			<CheckBox
 				x:Name="Anonymous"
 				Margin="4"

src/Files.App/Dialogs/DecompressArchiveDialog.xaml

@@ -68,7 +68,7 @@
 					x:Name="Password"
 					HorizontalAlignment="Stretch"
 					VerticalAlignment="Stretch"
-					PlaceholderText="{helpers:ResourceString Name=CredentialDialogPassword/PlaceholderText}" />
+					PlaceholderText="{helpers:ResourceString Name=Password}" />
 			</StackPanel>
 
 			<!--  Open when complete  -->

src/Files.App/Dialogs/FilesystemOperationDialog.xaml

@@ -116,7 +116,7 @@
 					SelectedIndex="{x:Bind ConflictResolveOption, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, Converter={StaticResource ConflictResolveOptionToIndexConverter}}">
 					<ComboBox.Items>
 						<ComboBoxItem Content="{helpers:ResourceString Name=GenerateNewName}" />
-						<ComboBoxItem Content="{helpers:ResourceString Name=ConflictingItemsDialogItemOptionReplaceExisting/Text}" />
+						<ComboBoxItem Content="{helpers:ResourceString Name=ReplaceExisting}" />
 						<ComboBoxItem Content="{helpers:ResourceString Name=Skip}" />
 					</ComboBox.Items>
 				</ComboBox>
@@ -180,7 +180,7 @@
 					<ComboBox.Items>
 						<ComboBoxItem Content="{helpers:ResourceString Name=Custom}" />
 						<ComboBoxItem Content="{helpers:ResourceString Name=GenerateNewName}" />
-						<ComboBoxItem Content="{helpers:ResourceString Name=ConflictingItemsDialogOptionReplaceExisting/Text}" />
+						<ComboBoxItem Content="{helpers:ResourceString Name=ReplaceExisting}" />
 						<ComboBoxItem Content="{helpers:ResourceString Name=Skip}" />
 					</ComboBox.Items>
 				</ComboBox>

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

@@ -563,7 +563,7 @@ await DialogDisplayHelper.ShowDialogAsync(
 					if (showExtensionDialog &&
 						Path.GetExtension(source.Path) != Path.GetExtension(newName)) // Only prompt user when extension has changed, not when file name has changed
 					{
-						var yesSelected = await DialogDisplayHelper.ShowDialogAsync("RenameFileDialogTitle".GetLocalizedResource(), "RenameFileDialog/Text".GetLocalizedResource(), "Yes".GetLocalizedResource(), "No".GetLocalizedResource());
+						var yesSelected = await DialogDisplayHelper.ShowDialogAsync("Rename".GetLocalizedResource(), "RenameFileDialog/Text".GetLocalizedResource(), "Yes".GetLocalizedResource(), "No".GetLocalizedResource());
 						if (yesSelected)
 						{
 							history = await filesystemOperations.RenameAsync(source, newName, collision, progress, cancellationToken);

src/Files.App/Filesystem/LibraryManager.cs

@@ -302,7 +302,7 @@ public static async void ShowRestoreDefaultLibrariesDialog()
 			{
 				TitleText = "DialogRestoreLibrariesTitleText".GetLocalizedResource(),
 				SubtitleText = "DialogRestoreLibrariesSubtitleText".GetLocalizedResource(),
-				PrimaryButtonText = "DialogRestoreLibrariesButtonText".GetLocalizedResource(),
+				PrimaryButtonText = "Restore".GetLocalizedResource(),
 				CloseButtonText = "Cancel".GetLocalizedResource(),
 				PrimaryButtonAction = async (vm, e) =>
 				{
@@ -353,7 +353,7 @@ public static async void ShowCreateNewLibraryDialog()
 				},
 				TitleText = "FolderWidgetCreateNewLibraryDialogTitleText".GetLocalizedResource(),
 				SubtitleText = "SideBarCreateNewLibrary/Text".GetLocalizedResource(),
-				PrimaryButtonText = "DialogCreateLibraryButtonText".GetLocalizedResource(),
+				PrimaryButtonText = "Create".GetLocalizedResource(),
 				CloseButtonText = "Cancel".GetLocalizedResource(),
 				PrimaryButtonAction = async (vm, e) =>
 				{

src/Files.App/Filesystem/ListedItem.cs

@@ -53,7 +53,7 @@ public string ItemTooltipText
 				tooltipBuilder.AppendLine($"{"ToolTipDescriptionType".GetLocalizedResource()} {itemType}");
 				tooltipBuilder.Append($"{"ToolTipDescriptionDate".GetLocalizedResource()} {ItemDateModified}");
 				if(!string.IsNullOrWhiteSpace(FileSize))
-					tooltipBuilder.Append($"{Environment.NewLine}{"ToolTipDescriptionSize".GetLocalizedResource()} {FileSize}");
+					tooltipBuilder.Append($"{Environment.NewLine}{"SizeLabel".GetLocalizedResource()} {FileSize}");
 				if(SyncStatusUI.LoadSyncStatus)
 					tooltipBuilder.Append($"{Environment.NewLine}{"syncStatusColumn/Header".GetLocalizedResource()}: {syncStatusUI.SyncStatusString}");
 
@@ -400,7 +400,7 @@ public override string ToString()
 			}
 			else if (IsLibrary)
 			{
-				suffix = "LibraryItemAutomation".GetLocalizedResource();
+				suffix = "Library".GetLocalizedResource();
 			}
 			else
 			{
@@ -493,7 +493,7 @@ public FtpItem(FtpListItem item, string folder) : base(null)
 			PrimaryItemAttribute = isFile ? StorageItemTypes.File : StorageItemTypes.Folder;
 			ItemPropertiesInitialized = false;
 
-			var itemType = isFile ? "ItemTypeFile".GetLocalizedResource() : "Folder".GetLocalizedResource();
+			var itemType = isFile ? "File".GetLocalizedResource() : "Folder".GetLocalizedResource();
 			if (isFile && Name.Contains('.', StringComparison.Ordinal))
 			{
 				itemType = FileExtension.Trim('.') + " " + itemType;
@@ -571,7 +571,7 @@ public LibraryItem(LibraryLocationItem library) : base(null)
 			ItemPath = library.Path;
 			ItemNameRaw = library.Text;
 			PrimaryItemAttribute = StorageItemTypes.Folder;
-			ItemType = "ItemTypeLibrary".GetLocalizedResource();
+			ItemType = "Library".GetLocalizedResource();
 			LoadCustomIcon = true;
 			CustomIcon = library.Icon;
 			//CustomIconSource = library.IconSource;

src/Files.App/Filesystem/StorageEnumerators/Win32StorageEnumerator.cs

@@ -139,7 +139,7 @@ private static IEnumerable<ListedItem> EnumAdsForPath(string itemPath, ListedIte
 
 		public static ListedItem GetAlternateStream((string Name, long Size) ads, ListedItem main)
 		{
-			string itemType = "ItemTypeFile".GetLocalizedResource();
+			string itemType = "File".GetLocalizedResource();
 			string itemFileExtension = null;
 			if (ads.Name.Contains('.'))
 			{
@@ -253,7 +253,7 @@ CancellationToken cancellationToken
 
 			long itemSizeBytes = findData.GetSize();
 			var itemSize = itemSizeBytes.ToSizeString();
-			string itemType = "ItemTypeFile".GetLocalizedResource();
+			string itemType = "File".GetLocalizedResource();
 			string itemFileExtension = null;
 
 			if (findData.cFileName.Contains('.'))
@@ -293,7 +293,7 @@ CancellationToken cancellationToken
 					ItemDateModifiedReal = itemModifiedDate,
 					ItemDateAccessedReal = itemLastAccessDate,
 					ItemDateCreatedReal = itemCreatedDate,
-					ItemType = "ShortcutFileType".GetLocalizedResource(),
+					ItemType = "Shortcut".GetLocalizedResource(),
 					ItemPath = itemPath,
 					FileSize = itemSize,
 					FileSizeBytes = itemSizeBytes,
@@ -322,7 +322,7 @@ CancellationToken cancellationToken
 					ItemDateModifiedReal = itemModifiedDate,
 					ItemDateAccessedReal = itemLastAccessDate,
 					ItemDateCreatedReal = itemCreatedDate,
-					ItemType = isUrl ? "ShortcutWebLinkFileType".GetLocalizedResource() : "ShortcutFileType".GetLocalizedResource(),
+					ItemType = isUrl ? "ShortcutWebLinkFileType".GetLocalizedResource() : "Shortcut".GetLocalizedResource(),
 					ItemPath = itemPath,
 					FileSize = itemSize,
 					FileSizeBytes = itemSizeBytes,

src/Files.App/Filesystem/StorageItems/FtpStorageFile.cs

@@ -28,7 +28,7 @@ public override string DisplayType
 		{
 			get
 			{
-				var itemType = "ItemTypeFile".GetLocalizedResource();
+				var itemType = "File".GetLocalizedResource();
 				if (Name.Contains('.', StringComparison.Ordinal))
 				{
 					itemType = IO.Path.GetExtension(Name).Trim('.') + " " + itemType;

src/Files.App/Filesystem/StorageItems/NativeStorageFile.cs

@@ -35,7 +35,7 @@ public override string DisplayType
 		{
 			get
 			{
-				var itemType = "ItemTypeFile".GetLocalizedResource();
+				var itemType = "File".GetLocalizedResource();
 
 				if (Name.Contains('.', StringComparison.Ordinal))
 					itemType = IO.Path.GetExtension(Name).Trim('.') + " " + itemType;

src/Files.App/Filesystem/StorageItems/ZipStorageFile.cs

@@ -32,7 +32,7 @@ public override string DisplayType
 		{
 			get
 			{
-				var itemType = "ItemTypeFile".GetLocalizedResource();
+				var itemType = "File".GetLocalizedResource();
 				if (Name.Contains('.', StringComparison.Ordinal))
 				{
 					itemType = FileType.Trim('.') + " " + itemType;

src/Files.App/Helpers/ContextFlyoutItemHelper.cs

@@ -100,7 +100,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 			{
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutContextFlyoutLayoutMode/Text".GetLocalizedResource(),
+					Text = "LayoutMode".GetLocalizedResource(),
 					Glyph = "\uE152",
 					ShowInRecycleBin = true,
 					ShowInSearchPage = true,
@@ -139,7 +139,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 						// Grid view small
 						new ContextMenuFlyoutItemViewModel()
 						{
-							Text = "BaseLayoutContextFlyoutSmallIcons/Text".GetLocalizedResource(),
+							Text = "SmallIcons".GetLocalizedResource(),
 							Glyph = "\uE80A",
 							ShowInRecycleBin = true,
 							ShowInSearchPage = true,
@@ -153,7 +153,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 						// Grid view medium
 						new ContextMenuFlyoutItemViewModel()
 						{
-							Text = "BaseLayoutContextFlyoutMediumIcons/Text".GetLocalizedResource(),
+							Text = "MediumIcons".GetLocalizedResource(),
 							Glyph = "\uF0E2",
 							ShowInRecycleBin = true,
 							ShowInSearchPage = true,
@@ -167,7 +167,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 						// Grid view large
 						new ContextMenuFlyoutItemViewModel()
 						{
-							Text = "BaseLayoutContextFlyoutLargeIcons/Text".GetLocalizedResource(),
+							Text = "LargeIcons".GetLocalizedResource(),
 							Glyph = "\uE739",
 							ShowInRecycleBin = true,
 							ShowInSearchPage = true,
@@ -211,7 +211,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutContextFlyoutSortBy/Text".GetLocalizedResource(),
+					Text = "SortBy".GetLocalizedResource(),
 					ColoredIcon = new ColoredIconModel()
 					{
 						BaseLayerGlyph = "\uF029",
@@ -258,7 +258,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 						},
 						new ContextMenuFlyoutItemViewModel()
 						{
-							Text = "BaseLayoutContextFlyoutSortByType/Text".GetLocalizedResource(),
+							Text = "Type".GetLocalizedResource(),
 							IsChecked = itemViewModel?.IsSortedByType ?? false,
 							Command = itemViewModel is not null ? new RelayCommand(() => itemViewModel.IsSortedByType = true) : null!,
 							ShowInRecycleBin = true,
@@ -297,7 +297,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 						},
 						new ContextMenuFlyoutItemViewModel()
 						{
-							Text = "BaseLayoutContextFlyoutSortByOriginalPath/Text".GetLocalizedResource(),
+							Text = "OriginalPath".GetLocalizedResource(),
 							IsChecked = itemViewModel?.IsSortedByOriginalPath ?? false,
 							ShowInRecycleBin = true,
 							Command = itemViewModel is not null ? new RelayCommand(() => itemViewModel.IsSortedByOriginalPath = true) : null!,
@@ -406,7 +406,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 						},
 						new ContextMenuFlyoutItemViewModel()
 						{
-							Text = "BaseLayoutContextFlyoutSortByType/Text".GetLocalizedResource(),
+							Text = "Type".GetLocalizedResource(),
 							IsChecked = currentInstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.FileType,
 							ShowInRecycleBin = true,
 							ShowInSearchPage = true,
@@ -578,7 +578,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutItemContextFlyoutRestore/Text".GetLocalizedResource(),
+					Text = "Restore".GetLocalizedResource(),
 					Glyph = "\xE777",
 					Command = commandsViewModel.RestoreItemCommand,
 					ShowInRecycleBin = true,
@@ -635,15 +635,15 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutItemContextFlyoutOpenFileLocation/Text".GetLocalizedResource(),
+					Text = "OpenFileLocation".GetLocalizedResource(),
 					Glyph = "\uE8DA",
 					Command = commandsViewModel.OpenFileLocationCommand,
 					ShowItem = itemsSelected && selectedItems.All(i => i.IsShortcut),
 					ShowInSearchPage = true,
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutItemContextFlyoutOpenInNewTab/Text".GetLocalizedResource(),
+					Text = "OpenInNewTab".GetLocalizedResource(),
 					Glyph = "\uF113",
 					GlyphFontFamilyName = "CustomGlyph",
 					Command = commandsViewModel.OpenDirectoryInNewTabCommand,
@@ -654,7 +654,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutItemContextFlyoutOpenInNewWindow/Text".GetLocalizedResource(),
+					Text = "OpenInNewWindow".GetLocalizedResource(),
 					Glyph = "\uE737",
 					Command = commandsViewModel.OpenInNewWindowItemCommand,
 					ShowItem = itemsSelected && selectedItems.Count < 5 && areAllItemsFolders && userSettingsService.PreferencesSettingsService.ShowOpenInNewWindow,
@@ -687,7 +687,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 					{
 						new ContextMenuFlyoutItemViewModel()
 						{
-							Text = "BaseLayoutItemContextFlyoutSetAsDesktopBackground/Text".GetLocalizedResource(),
+							Text = "SetAsBackground".GetLocalizedResource(),
 							Glyph = "\uE91B",
 							Command = commandsViewModel.SetAsDesktopBackgroundItemCommand,
 							ShowInSearchPage = true,
@@ -739,7 +739,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutContextFlyoutRunAsAdmin/Text".GetLocalizedResource(),
+					Text = "RunAsAdministrator".GetLocalizedResource(),
 					Glyph = "\uE7EF",
 					Command = commandsViewModel.RunAsAdminCommand,
 					ShowInSearchPage = true,
@@ -823,7 +823,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutContextFlyoutPaste/Text".GetLocalizedResource(),
+					Text = "Paste".GetLocalizedResource(),
 					//Glyph = "\uF16D",
 					IsPrimary = true,
 					ColoredIcon = new ColoredIconModel()
@@ -872,7 +872,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutItemContextFlyoutRename/Text".GetLocalizedResource(),
+					Text = "Rename".GetLocalizedResource(),
 					IsPrimary = true,
 					ColoredIcon = new ColoredIconModel()
 					{
@@ -928,7 +928,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutItemContextFlyoutProperties/Text".GetLocalizedResource(),
+					Text = "Properties".GetLocalizedResource(),
 					IsPrimary = true,
 					ColoredIcon = new ColoredIconModel()
 					{
@@ -961,7 +961,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutContextFlyoutUnpinFromFavorites/Text".GetLocalizedResource(),
+					Text = "UnpinFromFavorites".GetLocalizedResource(),
 					Glyph = "\uE77A",
 					Command = commandsViewModel.SidebarUnpinItemCommand,
 					ShowItem = userSettingsService.PreferencesSettingsService.ShowFavoritesSection && selectedItems.All(x => x.PrimaryItemAttribute == StorageItemTypes.Folder && !x.IsArchive && x.IsPinned),
@@ -998,7 +998,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 					{
 						new ContextMenuFlyoutItemViewModel
 						{
-							Text = "BaseLayoutItemContextFlyoutExtractFilesOption".GetLocalizedResource(),
+							Text = "ExtractFiles".GetLocalizedResource(),
 							Glyph = "\xF11A",
 							GlyphFontFamilyName = "CustomGlyph",
 							Command = commandsViewModel.DecompressArchiveCommand,
@@ -1007,7 +1007,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 						},
 						new ContextMenuFlyoutItemViewModel
 						{
-							Text = "BaseLayoutItemContextFlyoutExtractHereOption".GetLocalizedResource(),
+							Text = "ExtractHere".GetLocalizedResource(),
 							Glyph = "\xF11A",
 							GlyphFontFamilyName = "CustomGlyph",
 							Command = commandsViewModel.DecompressArchiveHereCommand,
@@ -1115,7 +1115,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetNewItemItems(BaseLayoutCom
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutContextFlyoutNewFile/Text".GetLocalizedResource(),
+					Text = "File".GetLocalizedResource(),
 					Glyph = "\uE7C3",
 					Command = commandsViewModel.CreateNewFileCommand,
 					CommandParameter = null,