[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.
This commit is contained in:
Hermès Bélusca-Maïto 2024-09-15 21:12:36 +02:00
parent f23394986a
commit 5aecdd0840
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
28 changed files with 63 additions and 29 deletions

View file

@ -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);
}
}

View file

@ -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

View file

@ -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 "Обновления"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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

View file

@ -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 "עדכונים"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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 "更新"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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 "Обновления"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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 "Оновлення"

View file

@ -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 "更新"

View file

@ -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 "更新"

View file

@ -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 "更新"