From 64390850c43247a58f6d3e3f5ba9f91884ebb350 Mon Sep 17 00:00:00 2001 From: Yair Aichenbaum <39923744+yaichenbaum@users.noreply.github.com> Date: Wed, 2 Sep 2020 22:23:56 -0400 Subject: [PATCH 1/4] Updated the confirm delete dialog to include the number of selected items. --- Files/BaseLayout.cs | 9 +++++++-- Files/Dialogs/ConfirmDeleteDialog.xaml | 5 +---- Files/Dialogs/ConfirmDeleteDialog.xaml.cs | 14 +++++++++++++- Files/MultilingualResources/Files.de-DE.xlf | 17 ++++++++++++----- Files/MultilingualResources/Files.es-ES.xlf | 16 ++++++++++++---- Files/MultilingualResources/Files.fr-FR.xlf | 16 ++++++++++++---- Files/MultilingualResources/Files.he-IL.xlf | 16 ++++++++++++---- Files/MultilingualResources/Files.hi-IN.xlf | 16 ++++++++++++---- Files/MultilingualResources/Files.it-IT.xlf | 16 ++++++++++++---- Files/MultilingualResources/Files.ja-JP.xlf | 16 ++++++++++++---- Files/MultilingualResources/Files.nl-NL.xlf | 16 ++++++++++++---- Files/MultilingualResources/Files.or-IN.xlf | 16 ++++++++++++---- Files/MultilingualResources/Files.pl-PL.xlf | 16 ++++++++++++---- Files/MultilingualResources/Files.pt-BR.xlf | 16 ++++++++++++---- Files/MultilingualResources/Files.ru-RU.xlf | 16 ++++++++++++---- Files/MultilingualResources/Files.ta.xlf | 16 ++++++++++++---- Files/MultilingualResources/Files.tr-TR.xlf | 16 ++++++++++++---- Files/MultilingualResources/Files.uk-UA.xlf | 16 ++++++++++++---- Files/MultilingualResources/Files.zh-Hans.xlf | 16 ++++++++++++---- Files/Strings/de-DE/Resources.resw | 3 --- Files/Strings/en-US/Resources.resw | 14 ++++++++++---- Files/Strings/es-ES/Resources.resw | 3 --- Files/Strings/fr-FR/Resources.resw | 3 --- Files/Strings/he-IL/Resources.resw | 3 --- Files/Strings/hi-IN/Resources.resw | 3 --- Files/Strings/it-IT/Resources.resw | 3 --- Files/Strings/ja-JP/Resources.resw | 3 --- Files/Strings/nl-NL/Resources.resw | 3 --- Files/Strings/or-IN/Resources.resw | 3 --- Files/Strings/pl-PL/Resources.resw | 3 --- Files/Strings/pt-BR/Resources.resw | 3 --- Files/Strings/ru-RU/Resources.resw | 3 --- Files/Strings/ta/Resources.resw | 3 --- Files/Strings/tr-TR/Resources.resw | 3 --- Files/Strings/uk-UA/Resources.resw | 3 --- Files/Strings/zh-Hans/Resources.resw | 3 --- Files/UserControls/StatusBarControl.xaml | 2 +- .../SelectedItemsPropertiesViewModel.cs | 10 +++++++++- 38 files changed, 233 insertions(+), 126 deletions(-) diff --git a/Files/BaseLayout.cs b/Files/BaseLayout.cs index f355611868c8..949a773e0403 100644 --- a/Files/BaseLayout.cs +++ b/Files/BaseLayout.cs @@ -85,14 +85,19 @@ internal set SelectedItem = _SelectedItems.First(); SelectedItemsPropertiesViewModel.IsItemSelected = true; + if (SelectedItems.Count >= 1) + { + SelectedItemsPropertiesViewModel.SelectedItemsCount = SelectedItems.Count.ToString(); + } + if (SelectedItems.Count == 1) { - SelectedItemsPropertiesViewModel.SelectedItemsCount = SelectedItems.Count.ToString() + " " + ResourceController.GetTranslation("ItemSelected/Text"); + SelectedItemsPropertiesViewModel.ItemsSelectedCount = SelectedItems.Count.ToString() + " " + ResourceController.GetTranslation("ItemSelected/Text"); SelectedItemsPropertiesViewModel.ItemSize = SelectedItem.FileSize; } else { - SelectedItemsPropertiesViewModel.SelectedItemsCount = SelectedItems.Count.ToString() + " " + ResourceController.GetTranslation("ItemsSelected/Text"); + SelectedItemsPropertiesViewModel.ItemsSelectedCount = SelectedItems.Count.ToString() + " " + ResourceController.GetTranslation("ItemsSelected/Text"); if (SelectedItems.All(x => x.PrimaryItemAttribute == StorageItemTypes.File)) { diff --git a/Files/Dialogs/ConfirmDeleteDialog.xaml b/Files/Dialogs/ConfirmDeleteDialog.xaml index 341819a18484..a687c6efc10b 100644 --- a/Files/Dialogs/ConfirmDeleteDialog.xaml +++ b/Files/Dialogs/ConfirmDeleteDialog.xaml @@ -22,10 +22,7 @@ - + App.CurrentInstance.ContentPage.SelectedItemsPropertiesViewModel; public MyResult Result { get; set; } public enum MyResult @@ -27,6 +30,15 @@ public ConfirmDeleteDialog(bool deleteFromRecycleBin, StorageDeleteOption delete // If deleting from recycle bin disable "permanently delete" option this.chkPermanentlyDelete.IsEnabled = !deleteFromRecycleBin; + + if (SelectedItemsPropertiesViewModel.SelectedItemsCount == "1") + { + Description = ResourceController.GetTranslation("ConfirmDeleteDialogDeleteOneItem/Text"); + } + else + { + Description = ResourceController.GetTranslation("ConfirmDeleteDialogDeleteMultipleItemsPart1/Text") + SelectedItemsPropertiesViewModel.SelectedItemsCount + ResourceController.GetTranslation("ConfirmDeleteDialogDeleteMultipleItemsPart2/Text"); + } } private void btnDelete_Click(object sender, RoutedEventArgs e) diff --git a/Files/MultilingualResources/Files.de-DE.xlf b/Files/MultilingualResources/Files.de-DE.xlf index d4a9d83db56e..949f31d601cb 100644 --- a/Files/MultilingualResources/Files.de-DE.xlf +++ b/Files/MultilingualResources/Files.de-DE.xlf @@ -183,11 +183,6 @@ Delete Löschen - - Are you sure you want to delete the selected item(s)? - Sind Sie sicher, dass Sie die ausgewählten Dateien löschen möchten? - - Permanently delete Endgültig löschen @@ -1193,6 +1188,18 @@ Show all context menu items Alle im Kontextmenü verfügbaren Elemente anzeigen + + Are you sure you want to delete these + Are you sure you want to delete these + + + items? + items? + + + Are you sure you want do delete this item? + Are you sure you want do delete this item? + diff --git a/Files/MultilingualResources/Files.es-ES.xlf b/Files/MultilingualResources/Files.es-ES.xlf index 62b6c5b37a5a..0d2a9f21776d 100644 --- a/Files/MultilingualResources/Files.es-ES.xlf +++ b/Files/MultilingualResources/Files.es-ES.xlf @@ -183,10 +183,6 @@ Delete Eliminar - - Are you sure you want to delete the selected item(s)? - ¿Está seguro que desea eliminar el archivo seleccionado? - Permanently delete Eliminar permanentemente @@ -1186,6 +1182,18 @@ Show all context menu items Mostrar todos los elementos del menú contextual + + Are you sure you want to delete these + Are you sure you want to delete these + + + items? + items? + + + Are you sure you want do delete this item? + Are you sure you want do delete this item? + diff --git a/Files/MultilingualResources/Files.fr-FR.xlf b/Files/MultilingualResources/Files.fr-FR.xlf index 0ca770c6eeac..0534fa654108 100644 --- a/Files/MultilingualResources/Files.fr-FR.xlf +++ b/Files/MultilingualResources/Files.fr-FR.xlf @@ -189,10 +189,6 @@ Delete Supprimer - - Are you sure you want to delete the selected item(s)? - Voulez-vous vraiment supprimer le(s) élément(s) sélectionné(s) ? - Permanently delete Supprimer de façon définitive @@ -1185,6 +1181,18 @@ Show all context menu items Show all context menu items + + Are you sure you want to delete these + Are you sure you want to delete these + + + items? + items? + + + Are you sure you want do delete this item? + Are you sure you want do delete this item? + diff --git a/Files/MultilingualResources/Files.he-IL.xlf b/Files/MultilingualResources/Files.he-IL.xlf index 42a88157be1e..2eba4e389535 100644 --- a/Files/MultilingualResources/Files.he-IL.xlf +++ b/Files/MultilingualResources/Files.he-IL.xlf @@ -18,10 +18,6 @@ Delete מחק - - Are you sure you want to delete the selected item(s)? - האם אתה בטוח שאתה רוצה למחוק את הפריט/ים המסומנ/ים? - Permanently delete ‏‏מחק לצמיתות @@ -1181,6 +1177,18 @@ Show all context menu items Show all context menu items + + Are you sure you want to delete these + Are you sure you want to delete these + + + items? + items? + + + Are you sure you want do delete this item? + Are you sure you want do delete this item? + diff --git a/Files/MultilingualResources/Files.hi-IN.xlf b/Files/MultilingualResources/Files.hi-IN.xlf index 1ed4877d49fb..7fb24634a43b 100644 --- a/Files/MultilingualResources/Files.hi-IN.xlf +++ b/Files/MultilingualResources/Files.hi-IN.xlf @@ -18,10 +18,6 @@ Delete हटाएँ - - Are you sure you want to delete the selected item(s)? - क्या आप सुनिश्चित हैं कि आप चयनित वस्तु(ओं) को हटाना चाहते हैं? - Permanently delete स्थायी रूप से हटाएं @@ -1187,6 +1183,18 @@ Show all context menu items Show all context menu items + + Are you sure you want to delete these + Are you sure you want to delete these + + + items? + items? + + + Are you sure you want do delete this item? + Are you sure you want do delete this item? + diff --git a/Files/MultilingualResources/Files.it-IT.xlf b/Files/MultilingualResources/Files.it-IT.xlf index 92514c853a0d..89f69a97c440 100644 --- a/Files/MultilingualResources/Files.it-IT.xlf +++ b/Files/MultilingualResources/Files.it-IT.xlf @@ -18,10 +18,6 @@ Delete Elimina - - Are you sure you want to delete the selected item(s)? - Sei sicuro di voler eliminare gli elementi selezionati? - Permanently delete Elimina definitivamente @@ -1187,6 +1183,18 @@ Show all context menu items Mostra tutti gli elementi nel menu contestuale + + Are you sure you want to delete these + Are you sure you want to delete these + + + items? + items? + + + Are you sure you want do delete this item? + Are you sure you want do delete this item? + diff --git a/Files/MultilingualResources/Files.ja-JP.xlf b/Files/MultilingualResources/Files.ja-JP.xlf index 9db91ae635f3..c291ab6a0d09 100644 --- a/Files/MultilingualResources/Files.ja-JP.xlf +++ b/Files/MultilingualResources/Files.ja-JP.xlf @@ -18,10 +18,6 @@ Delete 削除 - - Are you sure you want to delete the selected item(s)? - 選択したアイテムを削除してもよろしいですか？ - Permanently delete 完全に削除 @@ -1189,6 +1185,18 @@ Show all context menu items Show all context menu items + + Are you sure you want to delete these + Are you sure you want to delete these + + + items? + items? + + + Are you sure you want do delete this item? + Are you sure you want do delete this item? + diff --git a/Files/MultilingualResources/Files.nl-NL.xlf b/Files/MultilingualResources/Files.nl-NL.xlf index b4324f3d32bb..92133cc2f084 100644 --- a/Files/MultilingualResources/Files.nl-NL.xlf +++ b/Files/MultilingualResources/Files.nl-NL.xlf @@ -183,10 +183,6 @@ Delete Verwijderen - - Are you sure you want to delete the selected item(s)? - Weet u zeker dat u de geselecteerde items wilt verwijderen? - Permanently delete Permanent verwijderen @@ -1187,6 +1183,18 @@ Show all context menu items Show all context menu items + + Are you sure you want to delete these + Are you sure you want to delete these + + + items? + items? + + + Are you sure you want do delete this item? + Are you sure you want do delete this item? + diff --git a/Files/MultilingualResources/Files.or-IN.xlf b/Files/MultilingualResources/Files.or-IN.xlf index 4b4d790db575..f7737b065073 100644 --- a/Files/MultilingualResources/Files.or-IN.xlf +++ b/Files/MultilingualResources/Files.or-IN.xlf @@ -18,10 +18,6 @@ Delete ବିଲୋପ କର - - Are you sure you want to delete the selected item(s)? - ଆପଣ ନିଶ୍ଚିତ କି ଆପଣ ମନୋନୀତ ଆଇଟମ୍(ଗୁଡିକ) ବିଲୋପ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି? - Permanently delete ସ୍ଥାୟୀ ଭାବରେ ବିଲୋପ କର @@ -1187,6 +1183,18 @@ Show all context menu items Show all context menu items + + Are you sure you want to delete these + Are you sure you want to delete these + + + items? + items? + + + Are you sure you want do delete this item? + Are you sure you want do delete this item? + diff --git a/Files/MultilingualResources/Files.pl-PL.xlf b/Files/MultilingualResources/Files.pl-PL.xlf index 4e92b9d3835e..35648504bafb 100644 --- a/Files/MultilingualResources/Files.pl-PL.xlf +++ b/Files/MultilingualResources/Files.pl-PL.xlf @@ -184,10 +184,6 @@ Delete Usuń - - Are you sure you want to delete the selected item(s)? - Czy na pewno chcesz usunąć wybrane elementy? - Permanently delete Usuń trwale @@ -1188,6 +1184,18 @@ Show all context menu items Show all context menu items + + Are you sure you want to delete these + Are you sure you want to delete these + + + items? + items? + + + Are you sure you want do delete this item? + Are you sure you want do delete this item? + diff --git a/Files/MultilingualResources/Files.pt-BR.xlf b/Files/MultilingualResources/Files.pt-BR.xlf index bb4751049d58..9e015d8f50c7 100644 --- a/Files/MultilingualResources/Files.pt-BR.xlf +++ b/Files/MultilingualResources/Files.pt-BR.xlf @@ -18,10 +18,6 @@ Delete Excluir - - Are you sure you want to delete the selected item(s)? - Tem certeza de que deseja excluir o(s) item(ns) selecionado(s)? - Permanently delete Excluir permanentemente @@ -1188,6 +1184,18 @@ Show all context menu items Mostrar todos os itens do menu de contexto + + Are you sure you want to delete these + Are you sure you want to delete these + + + items? + items? + + + Are you sure you want do delete this item? + Are you sure you want do delete this item? + diff --git a/Files/MultilingualResources/Files.ru-RU.xlf b/Files/MultilingualResources/Files.ru-RU.xlf index 79f879c94be9..a2710a9ac5b7 100644 --- a/Files/MultilingualResources/Files.ru-RU.xlf +++ b/Files/MultilingualResources/Files.ru-RU.xlf @@ -183,10 +183,6 @@ Delete Удалить - - Are you sure you want to delete the selected item(s)? - Вы уверены, что хотите удалить выбранный элемент(ы)? - Permanently delete Удалить безвозвратно @@ -1185,6 +1181,18 @@ Show all context menu items Show all context menu items + + Are you sure you want to delete these + Are you sure you want to delete these + + + items? + items? + + + Are you sure you want do delete this item? + Are you sure you want do delete this item? + diff --git a/Files/MultilingualResources/Files.ta.xlf b/Files/MultilingualResources/Files.ta.xlf index 37b8a1a2a1cf..5ce3358a66aa 100644 --- a/Files/MultilingualResources/Files.ta.xlf +++ b/Files/MultilingualResources/Files.ta.xlf @@ -18,10 +18,6 @@ Delete நீக்கு - - Are you sure you want to delete the selected item(s)? - தேர்ந்தெடுக்கப்பட்ட உருப்படி(கள்) ஐ நீங்கள் நிச்சயம் நீக்க விரும்புகிறீர்களா? - Permanently delete நிரந்தரமாக நீக்கு @@ -1189,6 +1185,18 @@ Show all context menu items Show all context menu items + + Are you sure you want to delete these + Are you sure you want to delete these + + + items? + items? + + + Are you sure you want do delete this item? + Are you sure you want do delete this item? + diff --git a/Files/MultilingualResources/Files.tr-TR.xlf b/Files/MultilingualResources/Files.tr-TR.xlf index 2637ff864250..9aa534f1d493 100644 --- a/Files/MultilingualResources/Files.tr-TR.xlf +++ b/Files/MultilingualResources/Files.tr-TR.xlf @@ -187,10 +187,6 @@ Delete Sil - - Are you sure you want to delete the selected item(s)? - Seçilen öğeyi silmek istediğinizden emin misiniz? - Permanently delete Kalıcı Olarak Sil @@ -1183,6 +1179,18 @@ Show all context menu items Show all context menu items + + Are you sure you want to delete these + Are you sure you want to delete these + + + items? + items? + + + Are you sure you want do delete this item? + Are you sure you want do delete this item? + diff --git a/Files/MultilingualResources/Files.uk-UA.xlf b/Files/MultilingualResources/Files.uk-UA.xlf index 74d81571a1db..2fc500c5ce3f 100644 --- a/Files/MultilingualResources/Files.uk-UA.xlf +++ b/Files/MultilingualResources/Files.uk-UA.xlf @@ -18,10 +18,6 @@ Delete Видалити - - Are you sure you want to delete the selected item(s)? - Ви впевнені, що хочете видалити обрані елементи? - Permanently delete Остаточно видалити @@ -1184,6 +1180,18 @@ Show all context menu items Show all context menu items + + Are you sure you want to delete these + Are you sure you want to delete these + + + items? + items? + + + Are you sure you want do delete this item? + Are you sure you want do delete this item? + diff --git a/Files/MultilingualResources/Files.zh-Hans.xlf b/Files/MultilingualResources/Files.zh-Hans.xlf index 761ec2f56228..f824c6aba741 100644 --- a/Files/MultilingualResources/Files.zh-Hans.xlf +++ b/Files/MultilingualResources/Files.zh-Hans.xlf @@ -184,10 +184,6 @@ Delete 删除 - - Are you sure you want to delete the selected item(s)? - 确实要删除所选项吗？ - Permanently delete 永久删除 @@ -1187,6 +1183,18 @@ Show all context menu items Show all context menu items + + Are you sure you want to delete these + Are you sure you want to delete these + + + items? + items? + + + Are you sure you want do delete this item? + Are you sure you want do delete this item? + diff --git a/Files/Strings/de-DE/Resources.resw b/Files/Strings/de-DE/Resources.resw index afd51ac88b19..51e86c550d7f 100644 --- a/Files/Strings/de-DE/Resources.resw +++ b/Files/Strings/de-DE/Resources.resw @@ -144,9 +144,6 @@ Löschen - - Sind Sie sicher, dass Sie die ausgewählten Dateien löschen möchten? - Endgültig löschen diff --git a/Files/Strings/en-US/Resources.resw b/Files/Strings/en-US/Resources.resw index dcbbd5804e06..13686bafdd0c 100644 --- a/Files/Strings/en-US/Resources.resw +++ b/Files/Strings/en-US/Resources.resw @@ -126,9 +126,6 @@ Delete - - Are you sure you want to delete the selected item(s)? - Permanently delete @@ -996,4 +993,13 @@ Show all context menu items - + + Are you sure you want to delete these + + + items? + + + Are you sure you want to delete this item? + + \ No newline at end of file diff --git a/Files/Strings/es-ES/Resources.resw b/Files/Strings/es-ES/Resources.resw index 598ff5c28c2a..839faadc5595 100644 --- a/Files/Strings/es-ES/Resources.resw +++ b/Files/Strings/es-ES/Resources.resw @@ -144,9 +144,6 @@ Eliminar - - ¿Está seguro que desea eliminar el archivo seleccionado? - Eliminar permanentemente diff --git a/Files/Strings/fr-FR/Resources.resw b/Files/Strings/fr-FR/Resources.resw index 2af6d0cfc345..c5a0c01a0fec 100644 --- a/Files/Strings/fr-FR/Resources.resw +++ b/Files/Strings/fr-FR/Resources.resw @@ -144,9 +144,6 @@ Supprimer - - Voulez-vous vraiment supprimer le(s) élément(s) sélectionné(s) ? - Supprimer de façon définitive diff --git a/Files/Strings/he-IL/Resources.resw b/Files/Strings/he-IL/Resources.resw index b2e7f7a6c12c..37a330a3599d 100644 --- a/Files/Strings/he-IL/Resources.resw +++ b/Files/Strings/he-IL/Resources.resw @@ -21,9 +21,6 @@ מחק - - האם אתה בטוח שאתה רוצה למחוק את הפריט/ים המסומנ/ים? - ‏‏מחק לצמיתות diff --git a/Files/Strings/hi-IN/Resources.resw b/Files/Strings/hi-IN/Resources.resw index d2d03b978daa..4b5799ad5a19 100644 --- a/Files/Strings/hi-IN/Resources.resw +++ b/Files/Strings/hi-IN/Resources.resw @@ -21,9 +21,6 @@ हटाएँ - - क्या आप सुनिश्चित हैं कि आप चयनित वस्तु(ओं) को हटाना चाहते हैं? - स्थायी रूप से हटाएं diff --git a/Files/Strings/it-IT/Resources.resw b/Files/Strings/it-IT/Resources.resw index ecdbd07d6dac..1a890f160cf6 100644 --- a/Files/Strings/it-IT/Resources.resw +++ b/Files/Strings/it-IT/Resources.resw @@ -21,9 +21,6 @@ Elimina - - Sei sicuro di voler eliminare gli elementi selezionati? - Elimina definitivamente diff --git a/Files/Strings/ja-JP/Resources.resw b/Files/Strings/ja-JP/Resources.resw index 7cae43bddfe9..d7f357a08377 100644 --- a/Files/Strings/ja-JP/Resources.resw +++ b/Files/Strings/ja-JP/Resources.resw @@ -21,9 +21,6 @@ 削除 - - 選択したアイテムを削除してもよろしいですか？ - 完全に削除 diff --git a/Files/Strings/nl-NL/Resources.resw b/Files/Strings/nl-NL/Resources.resw index 7a9fe27193d6..a159985e0904 100644 --- a/Files/Strings/nl-NL/Resources.resw +++ b/Files/Strings/nl-NL/Resources.resw @@ -144,9 +144,6 @@ Verwijderen - - Weet u zeker dat u de geselecteerde items wilt verwijderen? - Permanent verwijderen diff --git a/Files/Strings/or-IN/Resources.resw b/Files/Strings/or-IN/Resources.resw index d59e7e287b69..78ad5f50ee17 100644 --- a/Files/Strings/or-IN/Resources.resw +++ b/Files/Strings/or-IN/Resources.resw @@ -21,9 +21,6 @@ ବିଲୋପ କର - - ଆପଣ ନିଶ୍ଚିତ କି ଆପଣ ମନୋନୀତ ଆଇଟମ୍(ଗୁଡିକ) ବିଲୋପ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି? - ସ୍ଥାୟୀ ଭାବରେ ବିଲୋପ କର diff --git a/Files/Strings/pl-PL/Resources.resw b/Files/Strings/pl-PL/Resources.resw index 598d67731650..d2d3d1632256 100644 --- a/Files/Strings/pl-PL/Resources.resw +++ b/Files/Strings/pl-PL/Resources.resw @@ -144,9 +144,6 @@ Usuń - - Czy na pewno chcesz usunąć wybrane elementy? - Usuń trwale diff --git a/Files/Strings/pt-BR/Resources.resw b/Files/Strings/pt-BR/Resources.resw index 54da1bc0357b..5b2443f0772c 100644 --- a/Files/Strings/pt-BR/Resources.resw +++ b/Files/Strings/pt-BR/Resources.resw @@ -21,9 +21,6 @@ Excluir - - Tem certeza de que deseja excluir o(s) item(ns) selecionado(s)? - Excluir permanentemente diff --git a/Files/Strings/ru-RU/Resources.resw b/Files/Strings/ru-RU/Resources.resw index 6a6242314e14..67e569780c6f 100644 --- a/Files/Strings/ru-RU/Resources.resw +++ b/Files/Strings/ru-RU/Resources.resw @@ -144,9 +144,6 @@ Удалить - - Вы уверены, что хотите удалить выбранный элемент(ы)? - Удалить безвозвратно diff --git a/Files/Strings/ta/Resources.resw b/Files/Strings/ta/Resources.resw index c51370722b10..5fb0cdf7f88a 100644 --- a/Files/Strings/ta/Resources.resw +++ b/Files/Strings/ta/Resources.resw @@ -21,9 +21,6 @@ நீக்கு - - தேர்ந்தெடுக்கப்பட்ட உருப்படி(கள்) ஐ நீங்கள் நிச்சயம் நீக்க விரும்புகிறீர்களா? - நிரந்தரமாக நீக்கு diff --git a/Files/Strings/tr-TR/Resources.resw b/Files/Strings/tr-TR/Resources.resw index 5a2e75fef346..e86f7507c972 100644 --- a/Files/Strings/tr-TR/Resources.resw +++ b/Files/Strings/tr-TR/Resources.resw @@ -144,9 +144,6 @@ Sil - - Seçilen öğeyi silmek istediğinizden emin misiniz? - Kalıcı Olarak Sil diff --git a/Files/Strings/uk-UA/Resources.resw b/Files/Strings/uk-UA/Resources.resw index 2e8d60dc06ad..69147f08078d 100644 --- a/Files/Strings/uk-UA/Resources.resw +++ b/Files/Strings/uk-UA/Resources.resw @@ -21,9 +21,6 @@ Видалити - - Ви впевнені, що хочете видалити обрані елементи? - Остаточно видалити diff --git a/Files/Strings/zh-Hans/Resources.resw b/Files/Strings/zh-Hans/Resources.resw index ed5fe96200b2..a5599c27a118 100644 --- a/Files/Strings/zh-Hans/Resources.resw +++ b/Files/Strings/zh-Hans/Resources.resw @@ -144,9 +144,6 @@ 删除 - - 确实要删除所选项吗？ - 永久删除 diff --git a/Files/UserControls/StatusBarControl.xaml b/Files/UserControls/StatusBarControl.xaml index 93a3348cb777..2ee07caa06bd 100644 --- a/Files/UserControls/StatusBarControl.xaml +++ b/Files/UserControls/StatusBarControl.xaml @@ -28,7 +28,7 @@ Orientation="Horizontal" Spacing="12"> - + diff --git a/Files/View Models/SelectedItemsPropertiesViewModel.cs b/Files/View Models/SelectedItemsPropertiesViewModel.cs index ff3edd4a1a1c..5451e870ed21 100644 --- a/Files/View Models/SelectedItemsPropertiesViewModel.cs +++ b/Files/View Models/SelectedItemsPropertiesViewModel.cs @@ -483,6 +483,14 @@ public Visibility ItemAttributesVisibility set => SetProperty(ref _ItemAttributesVisibility, value); } + private string _ItemsSelectedCount; + + public string ItemsSelectedCount + { + get => _ItemsSelectedCount; + set => SetProperty(ref _ItemsSelectedCount, value); + } + private string _SelectedItemsCount; public string SelectedItemsCount @@ -527,7 +535,7 @@ public async void CheckFileExtension() //check if the selected item is an image file string ItemExtension = await CoreApplication.MainView.ExecuteOnUIThreadAsync(() => App.CurrentInstance.ContentPage.SelectedItem.FileExtension); - if (!string.IsNullOrEmpty(ItemExtension) && SelectedItemsCount == "1 " + ResourceController.GetTranslation("ItemSelected/Text")) + if (!string.IsNullOrEmpty(ItemExtension) && ItemsSelectedCount == "1 " + ResourceController.GetTranslation("ItemSelected/Text")) { if (ItemExtension.Equals(".png", StringComparison.OrdinalIgnoreCase) || ItemExtension.Equals(".jpg", StringComparison.OrdinalIgnoreCase) From 396aa6ff202a155dac08acbdc0a7a967eaaba771 Mon Sep 17 00:00:00 2001 From: Yair Aichenbaum <39923744+yaichenbaum@users.noreply.github.com> Date: Wed, 2 Sep 2020 22:26:42 -0400 Subject: [PATCH 2/4] Updated strings --- Files/MultilingualResources/Files.de-DE.xlf | 4 ++-- Files/MultilingualResources/Files.es-ES.xlf | 4 ++-- Files/MultilingualResources/Files.fr-FR.xlf | 4 ++-- Files/MultilingualResources/Files.he-IL.xlf | 4 ++-- Files/MultilingualResources/Files.hi-IN.xlf | 4 ++-- Files/MultilingualResources/Files.it-IT.xlf | 4 ++-- Files/MultilingualResources/Files.ja-JP.xlf | 4 ++-- Files/MultilingualResources/Files.nl-NL.xlf | 4 ++-- Files/MultilingualResources/Files.or-IN.xlf | 4 ++-- Files/MultilingualResources/Files.pl-PL.xlf | 4 ++-- Files/MultilingualResources/Files.pt-BR.xlf | 4 ++-- Files/MultilingualResources/Files.ru-RU.xlf | 4 ++-- Files/MultilingualResources/Files.ta.xlf | 4 ++-- Files/MultilingualResources/Files.tr-TR.xlf | 4 ++-- Files/MultilingualResources/Files.uk-UA.xlf | 4 ++-- Files/MultilingualResources/Files.zh-Hans.xlf | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Files/MultilingualResources/Files.de-DE.xlf b/Files/MultilingualResources/Files.de-DE.xlf index 949f31d601cb..7065d8d299da 100644 --- a/Files/MultilingualResources/Files.de-DE.xlf +++ b/Files/MultilingualResources/Files.de-DE.xlf @@ -1197,8 +1197,8 @@ items? - Are you sure you want do delete this item? - Are you sure you want do delete this item? + Are you sure you want to delete this item? + Are you sure you want to delete this item? diff --git a/Files/MultilingualResources/Files.es-ES.xlf b/Files/MultilingualResources/Files.es-ES.xlf index 0d2a9f21776d..0f8d1a90bdae 100644 --- a/Files/MultilingualResources/Files.es-ES.xlf +++ b/Files/MultilingualResources/Files.es-ES.xlf @@ -1191,8 +1191,8 @@ items? - Are you sure you want do delete this item? - Are you sure you want do delete this item? + Are you sure you want to delete this item? + Are you sure you want to delete this item? diff --git a/Files/MultilingualResources/Files.fr-FR.xlf b/Files/MultilingualResources/Files.fr-FR.xlf index 0534fa654108..370d612f9773 100644 --- a/Files/MultilingualResources/Files.fr-FR.xlf +++ b/Files/MultilingualResources/Files.fr-FR.xlf @@ -1190,8 +1190,8 @@ items? - Are you sure you want do delete this item? - Are you sure you want do delete this item? + Are you sure you want to delete this item? + Are you sure you want to delete this item? diff --git a/Files/MultilingualResources/Files.he-IL.xlf b/Files/MultilingualResources/Files.he-IL.xlf index 2eba4e389535..bf0ba0ee2820 100644 --- a/Files/MultilingualResources/Files.he-IL.xlf +++ b/Files/MultilingualResources/Files.he-IL.xlf @@ -1186,8 +1186,8 @@ items? - Are you sure you want do delete this item? - Are you sure you want do delete this item? + Are you sure you want to delete this item? + Are you sure you want to delete this item? diff --git a/Files/MultilingualResources/Files.hi-IN.xlf b/Files/MultilingualResources/Files.hi-IN.xlf index 7fb24634a43b..93f576d06f23 100644 --- a/Files/MultilingualResources/Files.hi-IN.xlf +++ b/Files/MultilingualResources/Files.hi-IN.xlf @@ -1192,8 +1192,8 @@ items? - Are you sure you want do delete this item? - Are you sure you want do delete this item? + Are you sure you want to delete this item? + Are you sure you want to delete this item? diff --git a/Files/MultilingualResources/Files.it-IT.xlf b/Files/MultilingualResources/Files.it-IT.xlf index 89f69a97c440..3d31962ab865 100644 --- a/Files/MultilingualResources/Files.it-IT.xlf +++ b/Files/MultilingualResources/Files.it-IT.xlf @@ -1192,8 +1192,8 @@ items? - Are you sure you want do delete this item? - Are you sure you want do delete this item? + Are you sure you want to delete this item? + Are you sure you want to delete this item? diff --git a/Files/MultilingualResources/Files.ja-JP.xlf b/Files/MultilingualResources/Files.ja-JP.xlf index c291ab6a0d09..90be9b32ba5a 100644 --- a/Files/MultilingualResources/Files.ja-JP.xlf +++ b/Files/MultilingualResources/Files.ja-JP.xlf @@ -1194,8 +1194,8 @@ items? - Are you sure you want do delete this item? - Are you sure you want do delete this item? + Are you sure you want to delete this item? + Are you sure you want to delete this item? diff --git a/Files/MultilingualResources/Files.nl-NL.xlf b/Files/MultilingualResources/Files.nl-NL.xlf index 92133cc2f084..50f0148ea5ce 100644 --- a/Files/MultilingualResources/Files.nl-NL.xlf +++ b/Files/MultilingualResources/Files.nl-NL.xlf @@ -1192,8 +1192,8 @@ items? - Are you sure you want do delete this item? - Are you sure you want do delete this item? + Are you sure you want to delete this item? + Are you sure you want to delete this item? diff --git a/Files/MultilingualResources/Files.or-IN.xlf b/Files/MultilingualResources/Files.or-IN.xlf index f7737b065073..cb37a2cfc755 100644 --- a/Files/MultilingualResources/Files.or-IN.xlf +++ b/Files/MultilingualResources/Files.or-IN.xlf @@ -1192,8 +1192,8 @@ items? - Are you sure you want do delete this item? - Are you sure you want do delete this item? + Are you sure you want to delete this item? + Are you sure you want to delete this item? diff --git a/Files/MultilingualResources/Files.pl-PL.xlf b/Files/MultilingualResources/Files.pl-PL.xlf index 35648504bafb..46c30486087f 100644 --- a/Files/MultilingualResources/Files.pl-PL.xlf +++ b/Files/MultilingualResources/Files.pl-PL.xlf @@ -1193,8 +1193,8 @@ items? - Are you sure you want do delete this item? - Are you sure you want do delete this item? + Are you sure you want to delete this item? + Are you sure you want to delete this item? diff --git a/Files/MultilingualResources/Files.pt-BR.xlf b/Files/MultilingualResources/Files.pt-BR.xlf index 9e015d8f50c7..3aca12787e15 100644 --- a/Files/MultilingualResources/Files.pt-BR.xlf +++ b/Files/MultilingualResources/Files.pt-BR.xlf @@ -1193,8 +1193,8 @@ items? - Are you sure you want do delete this item? - Are you sure you want do delete this item? + Are you sure you want to delete this item? + Are you sure you want to delete this item? diff --git a/Files/MultilingualResources/Files.ru-RU.xlf b/Files/MultilingualResources/Files.ru-RU.xlf index a2710a9ac5b7..642454a3cfa8 100644 --- a/Files/MultilingualResources/Files.ru-RU.xlf +++ b/Files/MultilingualResources/Files.ru-RU.xlf @@ -1190,8 +1190,8 @@ items? - Are you sure you want do delete this item? - Are you sure you want do delete this item? + Are you sure you want to delete this item? + Are you sure you want to delete this item? diff --git a/Files/MultilingualResources/Files.ta.xlf b/Files/MultilingualResources/Files.ta.xlf index 5ce3358a66aa..ea7bc157e0e3 100644 --- a/Files/MultilingualResources/Files.ta.xlf +++ b/Files/MultilingualResources/Files.ta.xlf @@ -1194,8 +1194,8 @@ items? - Are you sure you want do delete this item? - Are you sure you want do delete this item? + Are you sure you want to delete this item? + Are you sure you want to delete this item? diff --git a/Files/MultilingualResources/Files.tr-TR.xlf b/Files/MultilingualResources/Files.tr-TR.xlf index 9aa534f1d493..16afb9dde404 100644 --- a/Files/MultilingualResources/Files.tr-TR.xlf +++ b/Files/MultilingualResources/Files.tr-TR.xlf @@ -1188,8 +1188,8 @@ items? - Are you sure you want do delete this item? - Are you sure you want do delete this item? + Are you sure you want to delete this item? + Are you sure you want to delete this item? diff --git a/Files/MultilingualResources/Files.uk-UA.xlf b/Files/MultilingualResources/Files.uk-UA.xlf index 2fc500c5ce3f..acad2ac0ec90 100644 --- a/Files/MultilingualResources/Files.uk-UA.xlf +++ b/Files/MultilingualResources/Files.uk-UA.xlf @@ -1189,8 +1189,8 @@ items? - Are you sure you want do delete this item? - Are you sure you want do delete this item? + Are you sure you want to delete this item? + Are you sure you want to delete this item? diff --git a/Files/MultilingualResources/Files.zh-Hans.xlf b/Files/MultilingualResources/Files.zh-Hans.xlf index f824c6aba741..5114017b3027 100644 --- a/Files/MultilingualResources/Files.zh-Hans.xlf +++ b/Files/MultilingualResources/Files.zh-Hans.xlf @@ -1192,8 +1192,8 @@ items? - Are you sure you want do delete this item? - Are you sure you want do delete this item? + Are you sure you want to delete this item? + Are you sure you want to delete this item? From 12add184c5278a51bde949c3c651747ffb14748d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vinicius=20=E2=9A=A1?= Date: Thu, 3 Sep 2020 15:25:08 -0300 Subject: [PATCH 3/4] Translation update [pt-BR] (#1866) --- Files/MultilingualResources/Files.pt-BR.xlf | 28 ++++++++------------- Files/Strings/pt-BR/Resources.resw | 16 ++++++------ 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/Files/MultilingualResources/Files.pt-BR.xlf b/Files/MultilingualResources/Files.pt-BR.xlf index 3aca12787e15..4e5c6218cd39 100644 --- a/Files/MultilingualResources/Files.pt-BR.xlf +++ b/Files/MultilingualResources/Files.pt-BR.xlf @@ -221,8 +221,7 @@ Third Party Licenses: - Licenças de Terceiros - Please verify the translation’s accuracy as the source string was updated after it was translated. + Licenças de Terceiros: About @@ -266,8 +265,7 @@ Double click to rename files - Clique duas vezes para renomear arquivos - Please verify the translation’s accuracy as the source string was updated after it was translated. + Clique duas vezes para renomear arquivos Experimental @@ -503,8 +501,7 @@ Welcome to Files! - Bem vindo ao Files UWP - Please verify the translation’s accuracy as the source string was updated after it was translated. + Bem vindo ao Files! Grant Permission @@ -512,8 +509,7 @@ To get started, you'll need to grant us permission to display your files. This will open a Settings page where you can grant us this permission. You'll need to reopen the app once you've completed this step. - Para começar, você precisa nos conceder permissão para exibir seus arquivos. Isso abrirá uma página de configurações onde você pode nos conceder essa permissão. Você precisará reabrir o aplicativo depois de concluído. - Please verify the translation’s accuracy as the source string was updated after it was translated. + Para começar, você precisa nos conceder permissão para exibir seus arquivos. Isso abrirá uma página de configurações onde você pode nos conceder essa permissão. Você precisará reabrir o aplicativo depois de concluído. File folder @@ -525,12 +521,11 @@ Enter an item name - Digite o nome do arquivo + Insira o nome do arquivo Enter an item name - Digite o nome do arquivo sem uma extensão - Please verify the translation’s accuracy as the source string was updated after it was translated. + Insira o nome do arquivo Set Name @@ -962,8 +957,7 @@ To see changes, a restart is required - Reinicialização necessária - Please verify the translation’s accuracy as the source string was updated after it was translated. + Para ver as mudanças, é necessário reiniciar Status @@ -1116,8 +1110,7 @@ Find out what's new - Descubra o que há de novo no Files UWP - Please verify the translation’s accuracy as the source string was updated after it was translated. + Descubra o que há de novo Show multitasking flyout in the navigation toolbar @@ -1137,7 +1130,7 @@ Open log location - Abrir local do log + Abrir local de registro Files ran into a problem that the developers didn't prepare for yet. @@ -1157,8 +1150,7 @@ There's nothing to share right now... - Não há nada para compartilhar agora - Please verify the translation’s accuracy as the source string was updated after it was translated. + Não há nada para compartilhar agora... The items you've selected will be shared diff --git a/Files/Strings/pt-BR/Resources.resw b/Files/Strings/pt-BR/Resources.resw index 5b2443f0772c..ef82341f06e8 100644 --- a/Files/Strings/pt-BR/Resources.resw +++ b/Files/Strings/pt-BR/Resources.resw @@ -172,7 +172,7 @@ Envie aos desenvolvedores um relatório de problemas com mais informações - Licenças de Terceiros + Licenças de Terceiros: Sobre @@ -382,7 +382,7 @@ QuickLook - Bem vindo ao Files UWP + Bem vindo ao Files! Conceder Permissão @@ -397,10 +397,10 @@ Arquivo - Digite o nome do arquivo + Insira o nome do arquivo - Digite o nome do arquivo sem uma extensão + Insira o nome do arquivo Definir Nome @@ -724,7 +724,7 @@ Idioma - Reinicialização necessária + Para ver as mudanças, é necessário reiniciar Status @@ -838,7 +838,7 @@ Notas de Atualização - Descubra o que há de novo no Files UWP + Descubra o que há de novo Mostrar menu multitarefa na barra de navegação @@ -853,7 +853,7 @@ Desconhecido - Abrir local do log + Abrir local de registro O Files encontrou um problema para o qual os desenvolvedores ainda não se prepararam. @@ -868,7 +868,7 @@ Versão: - Não há nada para compartilhar agora + Não há nada para compartilhar agora... Os itens selecionados serão compartilhados From 20ec1ef0b40f2e65c8930195c1d592e0d18e1837 Mon Sep 17 00:00:00 2001 From: Vladyslav Date: Fri, 4 Sep 2020 02:05:02 +0300 Subject: [PATCH 4/4] Update strings --- Files/BaseLayout.cs | 6 +++--- Files/Dialogs/ConfirmDeleteDialog.xaml.cs | 4 ++-- Files/MultilingualResources/Files.de-DE.xlf | 12 ++++-------- Files/MultilingualResources/Files.es-ES.xlf | 12 ++++-------- Files/MultilingualResources/Files.fr-FR.xlf | 12 ++++-------- Files/MultilingualResources/Files.he-IL.xlf | 12 ++++-------- Files/MultilingualResources/Files.hi-IN.xlf | 12 ++++-------- Files/MultilingualResources/Files.it-IT.xlf | 12 ++++-------- Files/MultilingualResources/Files.ja-JP.xlf | 12 ++++-------- Files/MultilingualResources/Files.nl-NL.xlf | 12 ++++-------- Files/MultilingualResources/Files.or-IN.xlf | 12 ++++-------- Files/MultilingualResources/Files.pl-PL.xlf | 12 ++++-------- Files/MultilingualResources/Files.pt-BR.xlf | 12 ++++-------- Files/MultilingualResources/Files.ru-RU.xlf | 12 ++++-------- Files/MultilingualResources/Files.ta.xlf | 12 ++++-------- Files/MultilingualResources/Files.tr-TR.xlf | 12 ++++-------- Files/MultilingualResources/Files.uk-UA.xlf | 12 ++++-------- Files/MultilingualResources/Files.zh-Hans.xlf | 12 ++++-------- Files/Strings/en-US/Resources.resw | 7 ++----- Files/UserControls/StatusBarControl.xaml | 2 +- .../SelectedItemsPropertiesViewModel.cs | 14 +++++++------- 21 files changed, 79 insertions(+), 146 deletions(-) diff --git a/Files/BaseLayout.cs b/Files/BaseLayout.cs index 949a773e0403..bcc1ab72f03f 100644 --- a/Files/BaseLayout.cs +++ b/Files/BaseLayout.cs @@ -87,17 +87,17 @@ internal set if (SelectedItems.Count >= 1) { - SelectedItemsPropertiesViewModel.SelectedItemsCount = SelectedItems.Count.ToString(); + SelectedItemsPropertiesViewModel.SelectedItemsCount = SelectedItems.Count; } if (SelectedItems.Count == 1) { - SelectedItemsPropertiesViewModel.ItemsSelectedCount = SelectedItems.Count.ToString() + " " + ResourceController.GetTranslation("ItemSelected/Text"); + SelectedItemsPropertiesViewModel.SelectedItemsCountString = SelectedItems.Count.ToString() + " " + ResourceController.GetTranslation("ItemSelected/Text"); SelectedItemsPropertiesViewModel.ItemSize = SelectedItem.FileSize; } else { - SelectedItemsPropertiesViewModel.ItemsSelectedCount = SelectedItems.Count.ToString() + " " + ResourceController.GetTranslation("ItemsSelected/Text"); + SelectedItemsPropertiesViewModel.SelectedItemsCountString = SelectedItems.Count.ToString() + " " + ResourceController.GetTranslation("ItemsSelected/Text"); if (SelectedItems.All(x => x.PrimaryItemAttribute == StorageItemTypes.File)) { diff --git a/Files/Dialogs/ConfirmDeleteDialog.xaml.cs b/Files/Dialogs/ConfirmDeleteDialog.xaml.cs index 84e62c3cf723..11962b43a622 100644 --- a/Files/Dialogs/ConfirmDeleteDialog.xaml.cs +++ b/Files/Dialogs/ConfirmDeleteDialog.xaml.cs @@ -31,13 +31,13 @@ public ConfirmDeleteDialog(bool deleteFromRecycleBin, StorageDeleteOption delete // If deleting from recycle bin disable "permanently delete" option this.chkPermanentlyDelete.IsEnabled = !deleteFromRecycleBin; - if (SelectedItemsPropertiesViewModel.SelectedItemsCount == "1") + if (SelectedItemsPropertiesViewModel.SelectedItemsCount == 1) { Description = ResourceController.GetTranslation("ConfirmDeleteDialogDeleteOneItem/Text"); } else { - Description = ResourceController.GetTranslation("ConfirmDeleteDialogDeleteMultipleItemsPart1/Text") + SelectedItemsPropertiesViewModel.SelectedItemsCount + ResourceController.GetTranslation("ConfirmDeleteDialogDeleteMultipleItemsPart2/Text"); + Description = string.Format(ResourceController.GetTranslation("ConfirmDeleteDialogDeleteMultipleItems/Text"), SelectedItemsPropertiesViewModel.SelectedItemsCount); } } diff --git a/Files/MultilingualResources/Files.de-DE.xlf b/Files/MultilingualResources/Files.de-DE.xlf index 7065d8d299da..695b25024f94 100644 --- a/Files/MultilingualResources/Files.de-DE.xlf +++ b/Files/MultilingualResources/Files.de-DE.xlf @@ -1188,18 +1188,14 @@ Show all context menu items Alle im Kontextmenü verfügbaren Elemente anzeigen - - Are you sure you want to delete these - Are you sure you want to delete these - - - items? - items? - Are you sure you want to delete this item? Are you sure you want to delete this item? + + Are you sure you want to delete these {0} items? + Are you sure you want to delete these {0} items? + diff --git a/Files/MultilingualResources/Files.es-ES.xlf b/Files/MultilingualResources/Files.es-ES.xlf index 0f8d1a90bdae..e833175820cd 100644 --- a/Files/MultilingualResources/Files.es-ES.xlf +++ b/Files/MultilingualResources/Files.es-ES.xlf @@ -1182,18 +1182,14 @@ Show all context menu items Mostrar todos los elementos del menú contextual - - Are you sure you want to delete these - Are you sure you want to delete these - - - items? - items? - Are you sure you want to delete this item? Are you sure you want to delete this item? + + Are you sure you want to delete these {0} items? + Are you sure you want to delete these {0} items? + diff --git a/Files/MultilingualResources/Files.fr-FR.xlf b/Files/MultilingualResources/Files.fr-FR.xlf index 370d612f9773..0b5717e668c9 100644 --- a/Files/MultilingualResources/Files.fr-FR.xlf +++ b/Files/MultilingualResources/Files.fr-FR.xlf @@ -1181,18 +1181,14 @@ Show all context menu items Show all context menu items - - Are you sure you want to delete these - Are you sure you want to delete these - - - items? - items? - Are you sure you want to delete this item? Are you sure you want to delete this item? + + Are you sure you want to delete these {0} items? + Are you sure you want to delete these {0} items? + diff --git a/Files/MultilingualResources/Files.he-IL.xlf b/Files/MultilingualResources/Files.he-IL.xlf index bf0ba0ee2820..5ab221bf6e04 100644 --- a/Files/MultilingualResources/Files.he-IL.xlf +++ b/Files/MultilingualResources/Files.he-IL.xlf @@ -1177,18 +1177,14 @@ Show all context menu items Show all context menu items - - Are you sure you want to delete these - Are you sure you want to delete these - - - items? - items? - Are you sure you want to delete this item? Are you sure you want to delete this item? + + Are you sure you want to delete these {0} items? + Are you sure you want to delete these {0} items? + diff --git a/Files/MultilingualResources/Files.hi-IN.xlf b/Files/MultilingualResources/Files.hi-IN.xlf index 93f576d06f23..e1c21a8df929 100644 --- a/Files/MultilingualResources/Files.hi-IN.xlf +++ b/Files/MultilingualResources/Files.hi-IN.xlf @@ -1183,18 +1183,14 @@ Show all context menu items Show all context menu items - - Are you sure you want to delete these - Are you sure you want to delete these - - - items? - items? - Are you sure you want to delete this item? Are you sure you want to delete this item? + + Are you sure you want to delete these {0} items? + Are you sure you want to delete these {0} items? + diff --git a/Files/MultilingualResources/Files.it-IT.xlf b/Files/MultilingualResources/Files.it-IT.xlf index 3d31962ab865..355115af14be 100644 --- a/Files/MultilingualResources/Files.it-IT.xlf +++ b/Files/MultilingualResources/Files.it-IT.xlf @@ -1183,18 +1183,14 @@ Show all context menu items Mostra tutti gli elementi nel menu contestuale - - Are you sure you want to delete these - Are you sure you want to delete these - - - items? - items? - Are you sure you want to delete this item? Are you sure you want to delete this item? + + Are you sure you want to delete these {0} items? + Are you sure you want to delete these {0} items? + diff --git a/Files/MultilingualResources/Files.ja-JP.xlf b/Files/MultilingualResources/Files.ja-JP.xlf index 90be9b32ba5a..1fbe68a1a076 100644 --- a/Files/MultilingualResources/Files.ja-JP.xlf +++ b/Files/MultilingualResources/Files.ja-JP.xlf @@ -1185,18 +1185,14 @@ Show all context menu items Show all context menu items - - Are you sure you want to delete these - Are you sure you want to delete these - - - items? - items? - Are you sure you want to delete this item? Are you sure you want to delete this item? + + Are you sure you want to delete these {0} items? + Are you sure you want to delete these {0} items? + diff --git a/Files/MultilingualResources/Files.nl-NL.xlf b/Files/MultilingualResources/Files.nl-NL.xlf index 50f0148ea5ce..4276d398ead2 100644 --- a/Files/MultilingualResources/Files.nl-NL.xlf +++ b/Files/MultilingualResources/Files.nl-NL.xlf @@ -1183,18 +1183,14 @@ Show all context menu items Show all context menu items - - Are you sure you want to delete these - Are you sure you want to delete these - - - items? - items? - Are you sure you want to delete this item? Are you sure you want to delete this item? + + Are you sure you want to delete these {0} items? + Are you sure you want to delete these {0} items? + diff --git a/Files/MultilingualResources/Files.or-IN.xlf b/Files/MultilingualResources/Files.or-IN.xlf index cb37a2cfc755..8159d5042ace 100644 --- a/Files/MultilingualResources/Files.or-IN.xlf +++ b/Files/MultilingualResources/Files.or-IN.xlf @@ -1183,18 +1183,14 @@ Show all context menu items Show all context menu items - - Are you sure you want to delete these - Are you sure you want to delete these - - - items? - items? - Are you sure you want to delete this item? Are you sure you want to delete this item? + + Are you sure you want to delete these {0} items? + Are you sure you want to delete these {0} items? + diff --git a/Files/MultilingualResources/Files.pl-PL.xlf b/Files/MultilingualResources/Files.pl-PL.xlf index 46c30486087f..07d131380ba8 100644 --- a/Files/MultilingualResources/Files.pl-PL.xlf +++ b/Files/MultilingualResources/Files.pl-PL.xlf @@ -1184,18 +1184,14 @@ Show all context menu items Show all context menu items - - Are you sure you want to delete these - Are you sure you want to delete these - - - items? - items? - Are you sure you want to delete this item? Are you sure you want to delete this item? + + Are you sure you want to delete these {0} items? + Are you sure you want to delete these {0} items? + diff --git a/Files/MultilingualResources/Files.pt-BR.xlf b/Files/MultilingualResources/Files.pt-BR.xlf index 4e5c6218cd39..421fc49cef61 100644 --- a/Files/MultilingualResources/Files.pt-BR.xlf +++ b/Files/MultilingualResources/Files.pt-BR.xlf @@ -1176,18 +1176,14 @@ Show all context menu items Mostrar todos os itens do menu de contexto - - Are you sure you want to delete these - Are you sure you want to delete these - - - items? - items? - Are you sure you want to delete this item? Are you sure you want to delete this item? + + Are you sure you want to delete these {0} items? + Are you sure you want to delete these {0} items? + diff --git a/Files/MultilingualResources/Files.ru-RU.xlf b/Files/MultilingualResources/Files.ru-RU.xlf index 642454a3cfa8..c84573b5d334 100644 --- a/Files/MultilingualResources/Files.ru-RU.xlf +++ b/Files/MultilingualResources/Files.ru-RU.xlf @@ -1181,18 +1181,14 @@ Show all context menu items Show all context menu items - - Are you sure you want to delete these - Are you sure you want to delete these - - - items? - items? - Are you sure you want to delete this item? Are you sure you want to delete this item? + + Are you sure you want to delete these {0} items? + Are you sure you want to delete these {0} items? + diff --git a/Files/MultilingualResources/Files.ta.xlf b/Files/MultilingualResources/Files.ta.xlf index ea7bc157e0e3..59e0355e9a3b 100644 --- a/Files/MultilingualResources/Files.ta.xlf +++ b/Files/MultilingualResources/Files.ta.xlf @@ -1185,18 +1185,14 @@ Show all context menu items Show all context menu items - - Are you sure you want to delete these - Are you sure you want to delete these - - - items? - items? - Are you sure you want to delete this item? Are you sure you want to delete this item? + + Are you sure you want to delete these {0} items? + Are you sure you want to delete these {0} items? + diff --git a/Files/MultilingualResources/Files.tr-TR.xlf b/Files/MultilingualResources/Files.tr-TR.xlf index 16afb9dde404..7fb43073808f 100644 --- a/Files/MultilingualResources/Files.tr-TR.xlf +++ b/Files/MultilingualResources/Files.tr-TR.xlf @@ -1179,18 +1179,14 @@ Show all context menu items Show all context menu items - - Are you sure you want to delete these - Are you sure you want to delete these - - - items? - items? - Are you sure you want to delete this item? Are you sure you want to delete this item? + + Are you sure you want to delete these {0} items? + Are you sure you want to delete these {0} items? + diff --git a/Files/MultilingualResources/Files.uk-UA.xlf b/Files/MultilingualResources/Files.uk-UA.xlf index acad2ac0ec90..00ab3b981ece 100644 --- a/Files/MultilingualResources/Files.uk-UA.xlf +++ b/Files/MultilingualResources/Files.uk-UA.xlf @@ -1180,18 +1180,14 @@ Show all context menu items Show all context menu items - - Are you sure you want to delete these - Are you sure you want to delete these - - - items? - items? - Are you sure you want to delete this item? Are you sure you want to delete this item? + + Are you sure you want to delete these {0} items? + Are you sure you want to delete these {0} items? + diff --git a/Files/MultilingualResources/Files.zh-Hans.xlf b/Files/MultilingualResources/Files.zh-Hans.xlf index 5114017b3027..265b6a117d82 100644 --- a/Files/MultilingualResources/Files.zh-Hans.xlf +++ b/Files/MultilingualResources/Files.zh-Hans.xlf @@ -1183,18 +1183,14 @@ Show all context menu items Show all context menu items - - Are you sure you want to delete these - Are you sure you want to delete these - - - items? - items? - Are you sure you want to delete this item? Are you sure you want to delete this item? + + Are you sure you want to delete these {0} items? + Are you sure you want to delete these {0} items? + diff --git a/Files/Strings/en-US/Resources.resw b/Files/Strings/en-US/Resources.resw index 13686bafdd0c..00a034f5237e 100644 --- a/Files/Strings/en-US/Resources.resw +++ b/Files/Strings/en-US/Resources.resw @@ -993,11 +993,8 @@ Show all context menu items - - Are you sure you want to delete these - - - items? + + Are you sure you want to delete these {0} items? Are you sure you want to delete this item? diff --git a/Files/UserControls/StatusBarControl.xaml b/Files/UserControls/StatusBarControl.xaml index 2ee07caa06bd..c392250a8909 100644 --- a/Files/UserControls/StatusBarControl.xaml +++ b/Files/UserControls/StatusBarControl.xaml @@ -28,7 +28,7 @@ Orientation="Horizontal" Spacing="12"> - + diff --git a/Files/View Models/SelectedItemsPropertiesViewModel.cs b/Files/View Models/SelectedItemsPropertiesViewModel.cs index 5451e870ed21..1f4085b5d3ba 100644 --- a/Files/View Models/SelectedItemsPropertiesViewModel.cs +++ b/Files/View Models/SelectedItemsPropertiesViewModel.cs @@ -483,17 +483,17 @@ public Visibility ItemAttributesVisibility set => SetProperty(ref _ItemAttributesVisibility, value); } - private string _ItemsSelectedCount; + private string _SelectedItemsCountString; - public string ItemsSelectedCount + public string SelectedItemsCountString { - get => _ItemsSelectedCount; - set => SetProperty(ref _ItemsSelectedCount, value); + get => _SelectedItemsCountString; + set => SetProperty(ref _SelectedItemsCountString, value); } - private string _SelectedItemsCount; + private int _SelectedItemsCount; - public string SelectedItemsCount + public int SelectedItemsCount { get => _SelectedItemsCount; set => SetProperty(ref _SelectedItemsCount, value); @@ -535,7 +535,7 @@ public async void CheckFileExtension() //check if the selected item is an image file string ItemExtension = await CoreApplication.MainView.ExecuteOnUIThreadAsync(() => App.CurrentInstance.ContentPage.SelectedItem.FileExtension); - if (!string.IsNullOrEmpty(ItemExtension) && ItemsSelectedCount == "1 " + ResourceController.GetTranslation("ItemSelected/Text")) + if (!string.IsNullOrEmpty(ItemExtension) && SelectedItemsCount == 1) { if (ItemExtension.Equals(".png", StringComparison.OrdinalIgnoreCase) || ItemExtension.Equals(".jpg", StringComparison.OrdinalIgnoreCase)