Skip to content

Commit 845882b

Browse files
yaira2yaira2
authored
Removed duplicate strings (#7299)
1 parent 75f7383 commit 845882b

File tree

105 files changed

+5920
-14778
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+5920
-14778
lines changed

‎src/Files/Dialogs/AddItemDialog.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public async void AddItemsToList()
2727

2828
AddItemsList.Add(new AddListItem
2929
{
30-
Header = "AddDialogListFolderHeader".GetLocalized(),
30+
Header = "Folder".GetLocalized(),
3131
SubHeader = "AddDialogListFolderSubHeader".GetLocalized(),
3232
Glyph = "\xE838",
3333
IsItemEnabled = true,

‎src/Files/Dialogs/DecompressArchiveDialog.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,11 @@
3737
Text="{x:Bind ViewModel.DestinationFolderPath, Mode=OneWay}" />
3838

3939
<Button
40-
x:Uid="DecompressArchiveDialogBrowseFolder"
4140
Grid.Column="1"
4241
VerticalAlignment="Center"
4342
Background="Transparent"
4443
Command="{x:Bind ViewModel.SelectDestinationCommand}"
45-
Content="Browse" />
44+
Content="{helpers:ResourceString Name=Browse}" />
4645

4746
<CheckBox
4847
x:Uid="DecompressArchiveDialogOpenDestinationWhenComplete"

‎src/Files/Dialogs/ElevateConfirmDialog.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
x:Name="ConfirmElevationDialog"
99
x:Uid="ElevateConfirmDialog"
1010
Title="This action requires adminstrator rights"
11-
CloseButtonText="No"
11+
CloseButtonText="{local2:ResourceString Name=No}"
1212
Content="Would you like to continue as administrator?"
1313
CornerRadius="{StaticResource OverlayCornerRadius}"
1414
DefaultButton="None"

‎src/Files/Dialogs/FilesystemOperationDialog.xaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,9 @@
4545
Tag="1"
4646
Text="Replace existing" />
4747
<MenuFlyoutItem
48-
x:Uid="ConflictingItemsDialogOptionSkip"
4948
Click="MenuFlyoutItem_Click"
5049
Tag="2"
51-
Text="Skip" />
50+
Text="{helpers:ResourceString Name=Skip}" />
5251
<MenuFlyoutSeparator x:Name="ApplyToAllSeparator" />
5352
<MenuFlyoutItem
5453
x:Name="ApplyToAllOption"
@@ -215,9 +214,8 @@
215214
Command="{Binding ReplaceExistingCommand}"
216215
Text="Replace" />
217216
<MenuFlyoutItem
218-
x:Uid="ConflictingItemsDialogItemOptionSkip"
219217
Command="{Binding SkipCommand}"
220-
Text="Skip" />
218+
Text="{helpers:ResourceString Name=Skip}" />
221219
</MenuFlyout>
222220
</muxc:SplitButton.Flyout>
223221
</muxc:SplitButton>

‎src/Files/Filesystem/FilesystemOperations/FilesystemOperations.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ await DialogDisplayHelper.ShowDialogAsync(
210210
{
211211
Title = "ErrorDialogThisActionCannotBeDone".GetLocalized(),
212212
Content = $"{"ErrorDialogTheDestinationFolder".GetLocalized()} ({destinationName}) {"ErrorDialogIsASubfolder".GetLocalized()} (sourceName)",
213-
//PrimaryButtonText = "ErrorDialogSkip".GetLocalized(),
213+
//PrimaryButtonText = "Skip".GetLocalized(),
214214
CloseButtonText = "Cancel".GetLocalized()
215215
};
216216

@@ -426,7 +426,7 @@ await DialogDisplayHelper.ShowDialogAsync(
426426
{
427427
Title = "ErrorDialogThisActionCannotBeDone".GetLocalized(),
428428
Content = "ErrorDialogTheDestinationFolder".GetLocalized() + " (" + destinationName + ") " + "ErrorDialogIsASubfolder".GetLocalized() + " (" + sourceName + ")",
429-
//PrimaryButtonText = "ErrorDialogSkip".GetLocalized(),
429+
//PrimaryButtonText = "Skip".GetLocalized(),
430430
CloseButtonText = "Cancel".GetLocalized()
431431
};
432432

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ public async Task<ReturnResult> RenameAsync(IStorageItemWithPath source, string
884884
not when file name has changed */
885885
if (Path.GetExtension(source.Path) != Path.GetExtension(newName))
886886
{
887-
var yesSelected = await DialogDisplayHelper.ShowDialogAsync("RenameFileDialogTitle".GetLocalized(), "RenameFileDialog/Text".GetLocalized(), "ButtonYes/Content".GetLocalized(), "ButtonNo/Content".GetLocalized());
887+
var yesSelected = await DialogDisplayHelper.ShowDialogAsync("RenameFileDialogTitle".GetLocalized(), "RenameFileDialog/Text".GetLocalized(), "Yes".GetLocalized(), "No".GetLocalized());
888888
if (yesSelected)
889889
{
890890
history = await filesystemOperations.RenameAsync(source, newName, collision, errorCode, cancellationToken);

‎src/Files/Filesystem/ListedItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ public override string ToString()
403403
}
404404
else
405405
{
406-
suffix = PrimaryItemAttribute == StorageItemTypes.File ? "FileItemAutomation".GetLocalized() : "FolderItemAutomation".GetLocalized();
406+
suffix = PrimaryItemAttribute == StorageItemTypes.File ? "Folder".GetLocalized() : "FolderItemAutomation".GetLocalized();
407407
}
408408

409409
return $"{ItemName}, {suffix}";

‎src/Files/Filesystem/Permissions/FileSystemAccessRuleForUI.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public FileSystemRights FileSystemRights
109109
_ => "\xF140"
110110
};
111111

112-
public string IsInheritedForUI => IsInherited ? "Yes".GetLocalized() : "SecurityAdvancedInheritedNoLabel".GetLocalized();
112+
public string IsInheritedForUI => IsInherited ? "Yes".GetLocalized() : "No".GetLocalized();
113113

114114
public string FileSystemRightsForUI => string.Join(", ", GetPermissionStrings());
115115

@@ -332,7 +332,7 @@ private List<GrantedPermission> GetGrantedPermissions()
332332
gpl.Add(new GrantedPermission(this)
333333
{
334334
Permission = FileSystemRights.Write,
335-
Name = "SecurityWriteLabel/Text".GetLocalized(),
335+
Name = "Write".GetLocalized(),
336336
IsEditable = !IsInherited
337337
});
338338
gpl.Add(new SpecialPermission(this)
@@ -392,7 +392,7 @@ private IList<string> GetPermissionStrings()
392392
var ret = new List<string>();
393393
if (FileSystemRights == 0)
394394
{
395-
ret.Add("SecurityNoneLabel/Text".GetLocalized());
395+
ret.Add("None".GetLocalized());
396396
}
397397
if (GrantsFullControl)
398398
{
@@ -412,7 +412,7 @@ private IList<string> GetPermissionStrings()
412412
}
413413
if (!GrantsFullControl && !GrantsModify && GrantsWrite)
414414
{
415-
ret.Add("SecurityWriteLabel/Text".GetLocalized());
415+
ret.Add("Write".GetLocalized());
416416
}
417417
if (GrantsSpecial)
418418
{

‎src/Files/Helpers/AcrylicTheme.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public AcrylicTheme()
3131
FallbackColor = (Color)App.Current.Resources["SolidBackgroundFillColorBase"];
3232
}
3333

34-
public void SetDefaultTheme()
34+
public void SetDefault()
3535
{
3636
if (Application.Current.RequestedTheme == ApplicationTheme.Light)
3737
{

‎src/Files/Helpers/ContextFlyoutItemHelper.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
112112
// Details view
113113
new ContextMenuFlyoutItemViewModel()
114114
{
115-
Text = "BaseLayoutContextFlyoutDetails/Text".GetLocalized(),
115+
Text = "Details".GetLocalized(),
116116
Glyph = "\uE179",
117117
ShowInRecycleBin = true,
118118
ShowInSearchPage = true,
@@ -182,7 +182,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
182182
// Column view
183183
new ContextMenuFlyoutItemViewModel()
184184
{
185-
Text = "BaseLayoutContextFlyoutColumn/Text".GetLocalized(),
185+
Text = "Columns".GetLocalized(),
186186
Glyph = "\uF115",
187187
GlyphFontFamilyName = "CustomGlyph",
188188
ShowInRecycleBin = true,
@@ -234,7 +234,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
234234
},
235235
new ContextMenuFlyoutItemViewModel()
236236
{
237-
Text = "BaseLayoutContextFlyoutSortByDateCreated/Text".GetLocalized(),
237+
Text = "DateCreated".GetLocalized(),
238238
IsChecked = itemViewModel.IsSortedByDateCreated,
239239
Command = new RelayCommand(() => itemViewModel.IsSortedByDateCreated = true),
240240
ShowInRecycleBin = true,
@@ -256,7 +256,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
256256
},
257257
new ContextMenuFlyoutItemViewModel()
258258
{
259-
Text = "BaseLayoutContextFlyoutSortBySize/Text".GetLocalized(),
259+
Text = "Size".GetLocalized(),
260260
IsChecked = itemViewModel.IsSortedBySize,
261261
Command = new RelayCommand(() => itemViewModel.IsSortedBySize = true),
262262
ShowInRecycleBin = true,
@@ -294,7 +294,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
294294
},
295295
new ContextMenuFlyoutItemViewModel()
296296
{
297-
Text = "BaseLayoutContextFlyoutSortByDateDeleted/Text".GetLocalized(),
297+
Text = "DateDeleted".GetLocalized(),
298298
IsChecked = itemViewModel.IsSortedByDateDeleted,
299299
Command = new RelayCommand(() => itemViewModel.IsSortedByDateDeleted = true),
300300
ShowInRecycleBin = true,
@@ -311,7 +311,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
311311
},
312312
new ContextMenuFlyoutItemViewModel()
313313
{
314-
Text = "BaseLayoutContextFlyoutSortByAscending/Text".GetLocalized(),
314+
Text = "Ascending".GetLocalized(),
315315
IsChecked = itemViewModel.IsSortedAscending,
316316
Command = new RelayCommand(() => itemViewModel.IsSortedAscending = true),
317317
ShowInRecycleBin = true,
@@ -345,7 +345,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
345345
{
346346
new ContextMenuFlyoutItemViewModel()
347347
{
348-
Text = "NavToolbarGroupByOptionNone/Text".GetLocalized(),
348+
Text = "None".GetLocalized(),
349349
IsChecked = currentInstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.None,
350350
ShowInRecycleBin = true,
351351
ShowInSearchPage = true,
@@ -381,7 +381,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
381381
},
382382
new ContextMenuFlyoutItemViewModel()
383383
{
384-
Text = "BaseLayoutContextFlyoutSortByDateCreated/Text".GetLocalized(),
384+
Text = "DateCreated".GetLocalized(),
385385
IsChecked = currentInstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.DateCreated,
386386
ShowInRecycleBin = true,
387387
ShowInSearchPage = true,
@@ -405,7 +405,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
405405
},
406406
new ContextMenuFlyoutItemViewModel()
407407
{
408-
Text = "BaseLayoutContextFlyoutSortBySize/Text".GetLocalized(),
408+
Text = "Size".GetLocalized(),
409409
IsChecked = currentInstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.Size,
410410
ShowInRecycleBin = true,
411411
ShowInSearchPage = true,
@@ -447,7 +447,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
447447
},
448448
new ContextMenuFlyoutItemViewModel()
449449
{
450-
Text = "BaseLayoutContextFlyoutSortByDateDeleted/Text".GetLocalized(),
450+
Text = "DateDeleted".GetLocalized(),
451451
IsChecked = currentInstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.DateDeleted,
452452
ShowInRecycleBin = true,
453453
Command = currentInstanceViewModel.FolderSettings.ChangeGroupOptionCommand,
@@ -503,7 +503,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
503503
},
504504
new ContextMenuFlyoutItemViewModel()
505505
{
506-
Text = "BaseLayoutContextFlyoutOpenInTerminal/Text".GetLocalized(),
506+
Text = "OpenInTerminal".GetLocalized(),
507507
Glyph = "\uE756",
508508
Command = commandsViewModel.OpenDirectoryInDefaultTerminalCommand,
509509
},
@@ -766,7 +766,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(BaseLayo
766766
},
767767
new ContextMenuFlyoutItemViewModel()
768768
{
769-
Text = "BaseLayoutItemContextFlyoutCopy/Text".GetLocalized(),
769+
Text = "Copy".GetLocalized(),
770770
//Glyph = "\uF8C8",
771771
ColoredIcon = new ColoredIconModel()
772772
{
@@ -1023,7 +1023,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetNewItemItems(BaseLayoutCom
10231023
{
10241024
new ContextMenuFlyoutItemViewModel()
10251025
{
1026-
Text = "BaseLayoutContextFlyoutNewFolder/Text".GetLocalized(),
1026+
Text = "Folder".GetLocalized(),
10271027
Glyph = "\uE8B7",
10281028
Command = commandsViewModel.CreateNewFolderCommand,
10291029
ShowInFtpPage = true,

‎src/Files/Helpers/ExternalResourcesHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class ExternalResourcesHelper
1616
{
1717
new AppTheme
1818
{
19-
Name = "DefaultTheme".GetLocalized(),
19+
Name = "Default".GetLocalized(),
2020
},
2121
};
2222

‎src/Files/Helpers/ItemListDisplayHelpers/GroupingHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public static (Action<GroupedCollection<ListedItem>>, Action<GroupedCollection<L
9393
{
9494
ListedItem first = x.First();
9595
x.Model.ShowCountTextBelow = true;
96-
x.Model.Text = first.FileTagUI?.TagName ?? "NavToolbarGroupByOptionNone/Text".GetLocalized();
96+
x.Model.Text = first.FileTagUI?.TagName ?? "None".GetLocalized();
9797
//x.Model.Icon = first?.FileTagUI?.Color;
9898
}, null),
9999

‎src/Files/Helpers/ThemeHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private static void ApplyTheme()
8888
switch (rootTheme)
8989
{
9090
case ElementTheme.Default:
91-
App.AppSettings.AcrylicTheme.SetDefaultTheme();
91+
App.AppSettings.AcrylicTheme.SetDefault();
9292
titleBar.ButtonHoverBackgroundColor = (Color)Application.Current.Resources["SystemBaseLowColor"];
9393
titleBar.ButtonForegroundColor = (Color)Application.Current.Resources["SystemBaseHighColor"];
9494
break;

0 commit comments

Comments
 (0)