diff --git a/Files/Interacts/Interaction.cs b/Files/Interacts/Interaction.cs index c30d6d68ca67..87b3c5215323 100644 --- a/Files/Interacts/Interaction.cs +++ b/Files/Interacts/Interaction.cs @@ -113,7 +113,7 @@ await CoreWindow.GetForCurrentThread().Dispatcher.RunAsync(CoreDispatcherPriorit instanceTabsView.AddNewTab(typeof(ModernShellPage), listedItem.ItemPath); }); } - } + } public void OpenPathInNewTab(string path) { @@ -703,15 +703,15 @@ public async Task RenameFileItem(ListedItem item, string oldName, string n catch (Exception) { - var dialog = new ContentDialog() + var ItemAlreadyExistsDialog = new ContentDialog() { - Title = "Item already exists", - Content = "An item with this name already exists in this folder.", - PrimaryButtonText = "Generate new name", - SecondaryButtonText = "Replace existing item" + Title = ResourceController.GetTranslation("ItemAlreadyExistsDialogTitle"), + Content = ResourceController.GetTranslation("ItemAlreadyExistsDialogContent"), + PrimaryButtonText = ResourceController.GetTranslation("ItemAlreadyExistsDialogPrimaryButtonText"), + SecondaryButtonText = ResourceController.GetTranslation("ItemAlreadyExistsDialogSecondaryButtonText") }; - ContentDialogResult result = await dialog.ShowAsync(); + ContentDialogResult result = await ItemAlreadyExistsDialog.ShowAsync(); if (result == ContentDialogResult.Primary) { diff --git a/Files/MultilingualResources/Files.de-DE.xlf b/Files/MultilingualResources/Files.de-DE.xlf index 0516b2ee544f..6233d22d1c8e 100644 --- a/Files/MultilingualResources/Files.de-DE.xlf +++ b/Files/MultilingualResources/Files.de-DE.xlf @@ -618,6 +618,22 @@ View sample profiles View sample profiles + + An item with this name already exists in this directory. + An item with this name already exists in this directory. + + + Generate new name + Generate new name + + + Item already exists + Item already exists + + + Replace existing item + Replace existing item + diff --git a/Files/MultilingualResources/Files.es-ES.xlf b/Files/MultilingualResources/Files.es-ES.xlf index 9de65ccc0968..a3a77dde179b 100644 --- a/Files/MultilingualResources/Files.es-ES.xlf +++ b/Files/MultilingualResources/Files.es-ES.xlf @@ -614,7 +614,23 @@ View sample profiles Ver perfiles personalizados + + An item with this name already exists in this directory. + An item with this name already exists in this directory. + + + Generate new name + Generate new name + + + Item already exists + Item already exists + + + Replace existing item + Replace existing item + - + \ No newline at end of file diff --git a/Files/MultilingualResources/Files.fr-FR.xlf b/Files/MultilingualResources/Files.fr-FR.xlf index 44efbd49f23a..c60fc20cc48a 100644 --- a/Files/MultilingualResources/Files.fr-FR.xlf +++ b/Files/MultilingualResources/Files.fr-FR.xlf @@ -616,6 +616,22 @@ View sample profiles View sample profiles + + An item with this name already exists in this directory. + An item with this name already exists in this directory. + + + Generate new name + Generate new name + + + Item already exists + Item already exists + + + Replace existing item + Replace existing item + diff --git a/Files/MultilingualResources/Files.it-IT.xlf b/Files/MultilingualResources/Files.it-IT.xlf index c8f8ce18e754..b1e9cc480d45 100644 --- a/Files/MultilingualResources/Files.it-IT.xlf +++ b/Files/MultilingualResources/Files.it-IT.xlf @@ -615,6 +615,22 @@ View sample profiles View sample profiles + + An item with this name already exists in this directory. + An item with this name already exists in this directory. + + + Generate new name + Generate new name + + + Item already exists + Item already exists + + + Replace existing item + Replace existing item + diff --git a/Files/MultilingualResources/Files.nl-NL.xlf b/Files/MultilingualResources/Files.nl-NL.xlf index eea0bc305a2c..3617a035794f 100644 --- a/Files/MultilingualResources/Files.nl-NL.xlf +++ b/Files/MultilingualResources/Files.nl-NL.xlf @@ -616,6 +616,22 @@ View sample profiles View sample profiles + + An item with this name already exists in this directory. + An item with this name already exists in this directory. + + + Generate new name + Generate new name + + + Item already exists + Item already exists + + + Replace existing item + Replace existing item + diff --git a/Files/MultilingualResources/Files.pl-PL.xlf b/Files/MultilingualResources/Files.pl-PL.xlf index fd5f1e60a3b7..5461e2f4f2fb 100644 --- a/Files/MultilingualResources/Files.pl-PL.xlf +++ b/Files/MultilingualResources/Files.pl-PL.xlf @@ -616,6 +616,22 @@ View sample profiles View sample profiles + + An item with this name already exists in this directory. + An item with this name already exists in this directory. + + + Generate new name + Generate new name + + + Item already exists + Item already exists + + + Replace existing item + Replace existing item + diff --git a/Files/MultilingualResources/Files.ru-RU.xlf b/Files/MultilingualResources/Files.ru-RU.xlf index d9ca3e11a450..174ad6f2fcf7 100644 --- a/Files/MultilingualResources/Files.ru-RU.xlf +++ b/Files/MultilingualResources/Files.ru-RU.xlf @@ -614,6 +614,22 @@ View sample profiles View sample profiles + + An item with this name already exists in this directory. + An item with this name already exists in this directory. + + + Generate new name + Generate new name + + + Item already exists + Item already exists + + + Replace existing item + Replace existing item + diff --git a/Files/MultilingualResources/Files.tr-TR.xlf b/Files/MultilingualResources/Files.tr-TR.xlf index 3ce47e3c4a9a..b9f9f883fde6 100644 --- a/Files/MultilingualResources/Files.tr-TR.xlf +++ b/Files/MultilingualResources/Files.tr-TR.xlf @@ -616,6 +616,22 @@ View sample profiles View sample profiles + + An item with this name already exists in this directory. + An item with this name already exists in this directory. + + + Generate new name + Generate new name + + + Item already exists + Item already exists + + + Replace existing item + Replace existing item + diff --git a/Files/MultilingualResources/Files.uk-UA.xlf b/Files/MultilingualResources/Files.uk-UA.xlf index 242a4c69a523..add497bc5e49 100644 --- a/Files/MultilingualResources/Files.uk-UA.xlf +++ b/Files/MultilingualResources/Files.uk-UA.xlf @@ -614,6 +614,22 @@ View sample profiles View sample profiles + + An item with this name already exists in this directory. + An item with this name already exists in this directory. + + + Generate new name + Generate new name + + + Item already exists + Item already exists + + + Replace existing item + Replace existing item + diff --git a/Files/MultilingualResources/Files.zh-Hans.xlf b/Files/MultilingualResources/Files.zh-Hans.xlf index 82d1e0851392..616426b51243 100644 --- a/Files/MultilingualResources/Files.zh-Hans.xlf +++ b/Files/MultilingualResources/Files.zh-Hans.xlf @@ -616,6 +616,22 @@ View sample profiles View sample profiles + + An item with this name already exists in this directory. + An item with this name already exists in this directory. + + + Generate new name + Generate new name + + + Item already exists + Item already exists + + + Replace existing item + Replace existing item + diff --git a/Files/Strings/en-US/Resources.resw b/Files/Strings/en-US/Resources.resw index f2f467f5707e..1419db78049e 100644 --- a/Files/Strings/en-US/Resources.resw +++ b/Files/Strings/en-US/Resources.resw @@ -341,7 +341,7 @@ Search - + WARNING: EXPERIMENTAL FEATURES AHEAD! @@ -573,4 +573,16 @@ View sample profiles + + An item with this name already exists in this directory. + + + Generate new name + + + Replace existing item + + + Item already exists + \ No newline at end of file diff --git a/Files/Views/InstanceTabsView.xaml.cs b/Files/Views/InstanceTabsView.xaml.cs index e9a866518d94..a3f47f80e750 100644 --- a/Files/Views/InstanceTabsView.xaml.cs +++ b/Files/Views/InstanceTabsView.xaml.cs @@ -428,7 +428,7 @@ public void TabStrip_SelectionChanged(object sender, SelectionChangedEventArgs e } else { - if ((tabView.SelectedItem as TabViewItem).Header.ToString() == "New tab") + if ((tabView.SelectedItem as TabViewItem).Header.ToString() == ResourceController.GetTranslation("NewTab")) { App.InteractionViewModel.IsPageTypeNotHome = false; }