diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw index 15749f17e487..4c9ebf1059ba 100644 --- a/src/Files.App/Strings/en-US/Resources.resw +++ b/src/Files.App/Strings/en-US/Resources.resw @@ -455,8 +455,8 @@ {0, number} {0, plural, one {file} other {files}}, {1, number} {1, plural, one {folder} other {folders}} - - from {0, number} {0, plural, one {location} other {locations}} + + {0, number} {0, plural, one {file} other {files}}, {1, number} {1, plural, one {folder} other {folders}} from {2, number} {2, plural, one {location} other {locations}} Run as another user @@ -1239,7 +1239,7 @@ {0, plural, one {There is one conflicting file name} other {There are # conflicting file names}} - {0, plural, one {, and one outgoing item} other {, and # outgoing items}} + {0, plural, one {There is one conflicting file name} other {There are # conflicting file names}}, and {1, plural, one {one outgoing item} other {# outgoing items}} Conflicting {0, plural, one {file name} other {file names}} diff --git a/src/Files.App/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogViewModel.cs b/src/Files.App/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogViewModel.cs index 5c33e7f8c6a5..c211b0a93b50 100644 --- a/src/Files.App/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogViewModel.cs +++ b/src/Files.App/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogViewModel.cs @@ -151,14 +151,10 @@ public static FileSystemDialogViewModel GetDialogViewModel(FileSystemDialogMode { titleText = "ConflictingItemsDialogTitle".GetLocalizedFormatResource(totalCount); - var descriptionLocalized = new StringBuilder(); - descriptionLocalized.Append("ConflictingItemsDialogSubtitleConflicts".GetLocalizedFormatResource(conflictingItems.Count)); + descriptionText = nonConflictingItems.Count > 0 + ? "ConflictingItemsDialogSubtitleConflictsNonConflicts".GetLocalizedFormatResource(conflictingItems.Count, nonConflictingItems.Count) + : "ConflictingItemsDialogSubtitleConflicts".GetLocalizedFormatResource(conflictingItems.Count); - if (nonConflictingItems.Count > 0) - descriptionLocalized.Append("ConflictingItemsDialogSubtitleConflictsNonConflicts".GetLocalizedFormatResource(nonConflictingItems.Count)); - - descriptionLocalized.Append('.'); - descriptionText = descriptionLocalized.ToString(); primaryButtonText = "ConflictingItemsDialogPrimaryButtonText".ToLocalized(); secondaryButtonText = "Cancel".ToLocalized(); } diff --git a/src/Files.App/ViewModels/Properties/Items/BaseProperties.cs b/src/Files.App/ViewModels/Properties/Items/BaseProperties.cs index 9c385812df57..3af11e5162eb 100644 --- a/src/Files.App/ViewModels/Properties/Items/BaseProperties.cs +++ b/src/Files.App/ViewModels/Properties/Items/BaseProperties.cs @@ -3,7 +3,6 @@ using Microsoft.UI.Dispatching; using System.IO; -using System.Text; using Windows.Storage.FileProperties; using static Files.App.Helpers.Win32Helper; using FileAttributes = System.IO.FileAttributes; @@ -122,16 +121,9 @@ await Dispatcher.EnqueueOrInvokeAsync(() => public void SetItemsCountString() { - var resourceText = new StringBuilder(); - resourceText.Append("PropertiesFilesAndFoldersCountString".GetLocalizedFormatResource(ViewModel.FilesCount, ViewModel.FoldersCount)); - - if (ViewModel.LocationsCount > 0) - { - resourceText.Append(' '); - resourceText.Append("PropertiesLocationsCountString".GetLocalizedFormatResource(ViewModel.LocationsCount)); - } - - ViewModel.FilesAndFoldersCountString = resourceText.ToString(); + ViewModel.FilesAndFoldersCountString = ViewModel.LocationsCount > 0 + ? "PropertiesFilesAndFoldersAndLocationsCount".GetLocalizedFormatResource(ViewModel.FilesCount, ViewModel.FoldersCount, ViewModel.LocationsCount) + : "PropertiesFilesAndFoldersCountString".GetLocalizedFormatResource(ViewModel.FilesCount, ViewModel.FoldersCount); } } }