https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5aecdd0840b61fa39d108c...
commit 5aecdd0840b61fa39d108c9e24ed74b4fbe4df74 Author: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org AuthorDate: Sun Sep 15 21:12:36 2024 +0200 Commit: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org CommitDate: Wed Sep 18 12:31:50 2024 +0200
[RAPPS] Don't display the "Selected" apps count in APPWIZ mode (#6655)
The count makes sense only in normal mode, where we can select many apps for bulk-install.
Split the IDS_APPS_COUNT string into it and IDS_APPS_SELECT_COUNT, and append the number of selected apps only when we aren't in APPWIZ mode. --- base/applications/rapps/gui.cpp | 10 +++++++++- base/applications/rapps/include/resource.h | 2 +- base/applications/rapps/lang/bg-BG.rc | 3 ++- base/applications/rapps/lang/cs-CZ.rc | 3 ++- base/applications/rapps/lang/de-DE.rc | 3 ++- base/applications/rapps/lang/en-US.rc | 3 ++- base/applications/rapps/lang/es-ES.rc | 3 ++- base/applications/rapps/lang/et-EE.rc | 3 ++- base/applications/rapps/lang/fr-FR.rc | 5 +++-- base/applications/rapps/lang/he-IL.rc | 3 ++- base/applications/rapps/lang/hu-HU.rc | 3 ++- base/applications/rapps/lang/id-ID.rc | 3 ++- base/applications/rapps/lang/it-IT.rc | 3 ++- base/applications/rapps/lang/ja-JP.rc | 3 ++- base/applications/rapps/lang/no-NO.rc | 3 ++- base/applications/rapps/lang/pl-PL.rc | 3 ++- base/applications/rapps/lang/pt-BR.rc | 3 ++- base/applications/rapps/lang/pt-PT.rc | 3 ++- base/applications/rapps/lang/ro-RO.rc | 3 ++- base/applications/rapps/lang/ru-RU.rc | 3 ++- base/applications/rapps/lang/sk-SK.rc | 3 ++- base/applications/rapps/lang/sq-AL.rc | 3 ++- base/applications/rapps/lang/sv-SE.rc | 3 ++- base/applications/rapps/lang/tr-TR.rc | 3 ++- base/applications/rapps/lang/uk-UA.rc | 3 ++- base/applications/rapps/lang/zh-CN.rc | 3 ++- base/applications/rapps/lang/zh-HK.rc | 3 ++- base/applications/rapps/lang/zh-TW.rc | 3 ++- 28 files changed, 63 insertions(+), 29 deletions(-)
diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 1b7050583bd..3ce58a00553 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -608,8 +608,16 @@ CMainWindow::UpdateStatusBarText() if (m_StatusBar) { CStringW szBuffer; + szBuffer.Format(IDS_APPS_COUNT, m_ApplicationView->GetItemCount()); + + // Append the number of selected apps if not in APPWIZ-mode. + if (!m_bAppwizMode) + { + CStringW szBuffer2; + szBuffer2.Format(IDS_APPS_SELECT_COUNT, m_Selected.GetCount()); + szBuffer += szBuffer2; + }
- szBuffer.Format(IDS_APPS_COUNT, m_ApplicationView->GetItemCount(), m_Selected.GetCount()); m_StatusBar->SetText(szBuffer); } } diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index b18b1a8f13a..d40efdbf22f 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -97,7 +97,7 @@ /* Strings */ #define IDS_SEARCH_TEXT 110 #define IDS_APPS_COUNT 111 -// 112 - Reserved +#define IDS_APPS_SELECT_COUNT 112 #define IDS_INSTALLED 113 #define IDS_AVAILABLEFORINST 114 #define IDS_UPDATES 115 diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index 64188ba9a0c..4e81b1fb12a 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Търсене…" - IDS_APPS_COUNT "Брой приложения: %d; Selected: %d" + IDS_APPS_COUNT "Брой приложения: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "Сложено" IDS_AVAILABLEFORINST "Налично за слагане" IDS_UPDATES "Обновления" diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index a2052037e88..1828881d347 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -181,7 +181,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Hledat…" - IDS_APPS_COUNT "Počet aplikací: %d; Vybráno: %d" + IDS_APPS_COUNT "Počet aplikací: %d" + IDS_APPS_SELECT_COUNT "; Vybráno: %d" IDS_INSTALLED "Nainstalováno" IDS_AVAILABLEFORINST "Lze instalovat" IDS_UPDATES "Aktualizace" diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index ecdb14d10bf..debb91aa730 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -183,7 +183,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Suche…" - IDS_APPS_COUNT "Anzahl der Anwendungen: %d, ausgewählt: %d" + IDS_APPS_COUNT "Anzahl der Anwendungen: %d" + IDS_APPS_SELECT_COUNT "; ausgewählt: %d" IDS_INSTALLED "Installiert" IDS_AVAILABLEFORINST "Zur Installation verfügbar" IDS_UPDATES "Aktualisierungen" diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 3771af9f8c3..2d6c4c47073 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -183,7 +183,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Search…" - IDS_APPS_COUNT "Applications count: %d; Selected: %d" + IDS_APPS_COUNT "Applications count: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "Installed" IDS_AVAILABLEFORINST "Available for installation" IDS_UPDATES "Updates" diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index 45155731f41..5607ab12582 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -182,7 +182,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Buscar…" - IDS_APPS_COUNT "Nº de aplicaciones: %d; Selecionadas: %d" + IDS_APPS_COUNT "Nº de aplicaciones: %d" + IDS_APPS_SELECT_COUNT "; Selecionadas: %d" IDS_INSTALLED "Instaladas" IDS_AVAILABLEFORINST "Disponible para su instalación" IDS_UPDATES "Actualizaciones" diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc index b5b13e3f2e8..41afa63d9e9 100644 --- a/base/applications/rapps/lang/et-EE.rc +++ b/base/applications/rapps/lang/et-EE.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Otsi…" - IDS_APPS_COUNT "Rakenduste arv: %d; Valitud: %d" + IDS_APPS_COUNT "Rakenduste arv: %d" + IDS_APPS_SELECT_COUNT "; Valitud: %d" IDS_INSTALLED "Installitud" IDS_AVAILABLEFORINST "Installimiseks saadaval" IDS_UPDATES "Uuendused" diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index 0689bc8a2e8..d7f1d27d3ac 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -183,7 +183,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Chercher…" - IDS_APPS_COUNT "Nombre d'applications : %d ; Sélectionnées : %d" + IDS_APPS_COUNT "Nombre d'applications : %d" + IDS_APPS_SELECT_COUNT " ; Sélectionnées : %d" IDS_INSTALLED "Installé" IDS_AVAILABLEFORINST "Disponible pour installation" IDS_UPDATES "Mises à jour" @@ -262,5 +263,5 @@ END
STRINGTABLE BEGIN - IDS_INSTGEN_CONFIRMUNINST "Are you sure you want to uninstall %s?" + IDS_INSTGEN_CONFIRMUNINST "Êtes-vous sûr de vouloir désinstaller %s ?" END diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index 7484f2851dd..db9ce84b5e9 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -185,7 +185,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "חיפוש…" - IDS_APPS_COUNT "ספירת יישומים: %d; Selected: %d" + IDS_APPS_COUNT "ספירת יישומים: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "מותקן" IDS_AVAILABLEFORINST "זמין להתקנה" IDS_UPDATES "עדכונים" diff --git a/base/applications/rapps/lang/hu-HU.rc b/base/applications/rapps/lang/hu-HU.rc index c363849ba5c..639cf42a0ad 100644 --- a/base/applications/rapps/lang/hu-HU.rc +++ b/base/applications/rapps/lang/hu-HU.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Keresés…" - IDS_APPS_COUNT "Alkalmazások száma: %d; Kijelölve: %d" + IDS_APPS_COUNT "Alkalmazások száma: %d" + IDS_APPS_SELECT_COUNT "; Kijelölve: %d" IDS_INSTALLED "Telepített" IDS_AVAILABLEFORINST "Telepíthető alkalmazások" IDS_UPDATES "Frissítések" diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc index 40c76f29bc5..f6835f3d3a2 100644 --- a/base/applications/rapps/lang/id-ID.rc +++ b/base/applications/rapps/lang/id-ID.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Cari…" - IDS_APPS_COUNT "Jumlah aplikasi: %d; Terpilih: %d" + IDS_APPS_COUNT "Jumlah aplikasi: %d" + IDS_APPS_SELECT_COUNT "; Terpilih: %d" IDS_INSTALLED "Terpasang" IDS_AVAILABLEFORINST "Tersedia untuk pemasangan" IDS_UPDATES "Pembaruan" diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 3a070dddeb6..5c48de6b6e1 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -182,7 +182,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Cerca…" - IDS_APPS_COUNT "Numero applicazioni: %d; Selezionate: %d" + IDS_APPS_COUNT "Numero applicazioni: %d" + IDS_APPS_SELECT_COUNT "; Selezionate: %d" IDS_INSTALLED "Installato" IDS_AVAILABLEFORINST "Disponibile per l'installazione" IDS_UPDATES "Aggiornamenti" diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 9f27fe1e83f..9464fb4b159 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -182,7 +182,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "検索..." - IDS_APPS_COUNT "アプリ数: %d; Selected: %d" + IDS_APPS_COUNT "アプリ数: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "インストール済み" IDS_AVAILABLEFORINST "インストール可能" IDS_UPDATES "更新" diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index cd0c697303e..2a9ef665c69 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Søk…" - IDS_APPS_COUNT "Program oppsummering: %d; Selected: %d" + IDS_APPS_COUNT "Program oppsummering: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "Installert" IDS_AVAILABLEFORINST "Tilgjengelig for installasjon" IDS_UPDATES "Oppdateringer" diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index a94ca836fa6..335dc0d42e1 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -182,7 +182,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Szukaj…" - IDS_APPS_COUNT "Liczba aplikacji: %d; Wybranych: %d" + IDS_APPS_COUNT "Liczba aplikacji: %d" + IDS_APPS_SELECT_COUNT "; Wybranych: %d" IDS_INSTALLED "Zainstalowane" IDS_AVAILABLEFORINST "Dostępne" IDS_UPDATES "Uaktualnienia" diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index 5faeecb25ac..6e4a4b5d3f5 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Procurar…" - IDS_APPS_COUNT "Número de aplicativos: %d; Selected: %d" + IDS_APPS_COUNT "Número de aplicativos: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "Instalado" IDS_AVAILABLEFORINST "Disponível para instalação" IDS_UPDATES "Atualizações" diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index 838404bd603..570a6b32d71 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Procurar…" - IDS_APPS_COUNT "Número de aplicações: %d; Seleccionadas: %d" + IDS_APPS_COUNT "Número de aplicações: %d" + IDS_APPS_SELECT_COUNT "; Seleccionadas: %d" IDS_INSTALLED "Instalado" IDS_AVAILABLEFORINST "Disponível para instalação" IDS_UPDATES "Actualizações" diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index e3b82afc6ac..db22084ea2e 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -182,7 +182,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Căutare…" - IDS_APPS_COUNT "Numărul de programe: %d; Selectate: %d" + IDS_APPS_COUNT "Numărul de programe: %d" + IDS_APPS_SELECT_COUNT "; Selectate: %d" IDS_INSTALLED "Instalate" IDS_AVAILABLEFORINST "Disponibile pentru instalare" IDS_UPDATES "Actualizări" diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index ab531a57c47..4a5eae46484 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -185,7 +185,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Поиск…" - IDS_APPS_COUNT "Количество приложений: %d; Выбрано: %d" + IDS_APPS_COUNT "Количество приложений: %d" + IDS_APPS_SELECT_COUNT "; Выбрано: %d" IDS_INSTALLED "Установленные" IDS_AVAILABLEFORINST "Доступно для установки" IDS_UPDATES "Обновления" diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index bd85218ce8f..b6bcd5f8888 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Hľadať…" - IDS_APPS_COUNT "Počet programov: %d; Selected: %d" + IDS_APPS_COUNT "Počet programov: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "Nainštalované" IDS_AVAILABLEFORINST "Dostupné pre nainštalovanie" IDS_UPDATES "Aktualizácie" diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 4ffb5c7b8d1..0a12626f575 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Kerko…" - IDS_APPS_COUNT "Numrimi Aplicacioneve: %d; Selected: %d" + IDS_APPS_COUNT "Numrimi Aplicacioneve: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "Instaluar" IDS_AVAILABLEFORINST "Te vlefshem per instalim" IDS_UPDATES "Updates" diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index ced598e23f7..8c0ac57527b 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -180,7 +180,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Sök…" - IDS_APPS_COUNT "Programantal: %d; Selected: %d" + IDS_APPS_COUNT "Programantal: %d" + IDS_APPS_SELECT_COUNT "; Selected: %d" IDS_INSTALLED "Installerat" IDS_AVAILABLEFORINST "Tillgängliga for installation" IDS_UPDATES "Uppdateringar" diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index ddd0b4d9775..636fd683b09 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -182,7 +182,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Ara…" - IDS_APPS_COUNT "Uygulama Sayısı: %d; Seçili: %d" + IDS_APPS_COUNT "Uygulama Sayısı: %d" + IDS_APPS_SELECT_COUNT "; Seçili: %d" IDS_INSTALLED "Kurulanlar" IDS_AVAILABLEFORINST "Kurulabilir Uygulamalar" IDS_UPDATES "Güncelleştirmeler" diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index d43a7e746e9..9da6dc8d859 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -183,7 +183,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Пошук…" - IDS_APPS_COUNT "Kількість додатків: %d; Обрано: %d" + IDS_APPS_COUNT "Kількість додатків: %d" + IDS_APPS_SELECT_COUNT "; Обрано: %d" IDS_INSTALLED "Встановлені" IDS_AVAILABLEFORINST "Доступні для встановлення" IDS_UPDATES "Оновлення" diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index e2c09b22533..5926483f471 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -184,7 +184,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "搜索…" - IDS_APPS_COUNT "程序数量：%d；已选：%d" + IDS_APPS_COUNT "程序数量：%d" + IDS_APPS_SELECT_COUNT "；已选：%d" IDS_INSTALLED "已安装" IDS_AVAILABLEFORINST "可安装" IDS_UPDATES "更新" diff --git a/base/applications/rapps/lang/zh-HK.rc b/base/applications/rapps/lang/zh-HK.rc index 44e44955f06..6ef6abbfab9 100644 --- a/base/applications/rapps/lang/zh-HK.rc +++ b/base/applications/rapps/lang/zh-HK.rc @@ -181,7 +181,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "搜尋..." - IDS_APPS_COUNT "程式數量：%d； 已選：%d" + IDS_APPS_COUNT "程式數量：%d" + IDS_APPS_SELECT_COUNT "； 已選：%d" IDS_INSTALLED "已安裝" IDS_AVAILABLEFORINST "可安裝" IDS_UPDATES "更新" diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 8a4f7277802..94aec57090d 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -181,7 +181,8 @@ END STRINGTABLE BEGIN IDS_SEARCH_TEXT "搜尋..." - IDS_APPS_COUNT "程式數量：%d； 已選：%d" + IDS_APPS_COUNT "程式數量：%d" + IDS_APPS_SELECT_COUNT "； 已選：%d" IDS_INSTALLED "已安裝" IDS_AVAILABLEFORINST "可安裝" IDS_UPDATES "更新"
-
Hermès Bélusca-Maïto