From 4e598589410e30707b6a69000ed4ebed857237b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Mon, 16 Sep 2024 18:26:09 +0200 Subject: [PATCH] [RAPPS] Change the "Welcome" text with a suitable explanatory one in APPWIZ-mode (#6655) - Delete CAppRichEdit::SetWelcomeText() and move its implementation inside CAppInfoDisplay::SetWelcomeText(). - Make CAppInfoDisplay::SetWelcomeText() select a suitable text, depending on normal mode or APPWIZ mode. - IDS_WELCOME_TITLE: Remove the double \n\n from the resources, and add them programmatically instead. --- base/applications/rapps/appview.cpp | 52 ++++++++++++++-------- base/applications/rapps/include/appview.h | 6 +-- base/applications/rapps/include/resource.h | 3 ++ base/applications/rapps/lang/bg-BG.rc | 4 ++ base/applications/rapps/lang/cs-CZ.rc | 6 ++- base/applications/rapps/lang/de-DE.rc | 6 ++- base/applications/rapps/lang/en-US.rc | 6 ++- base/applications/rapps/lang/es-ES.rc | 6 ++- base/applications/rapps/lang/et-EE.rc | 6 ++- base/applications/rapps/lang/fr-FR.rc | 6 ++- base/applications/rapps/lang/he-IL.rc | 6 ++- base/applications/rapps/lang/hu-HU.rc | 6 ++- base/applications/rapps/lang/id-ID.rc | 6 ++- base/applications/rapps/lang/it-IT.rc | 6 ++- base/applications/rapps/lang/ja-JP.rc | 6 ++- base/applications/rapps/lang/no-NO.rc | 6 ++- base/applications/rapps/lang/pl-PL.rc | 6 ++- base/applications/rapps/lang/pt-BR.rc | 6 ++- base/applications/rapps/lang/pt-PT.rc | 6 ++- base/applications/rapps/lang/ro-RO.rc | 6 ++- base/applications/rapps/lang/ru-RU.rc | 6 ++- base/applications/rapps/lang/sk-SK.rc | 6 ++- base/applications/rapps/lang/sq-AL.rc | 6 ++- base/applications/rapps/lang/sv-SE.rc | 6 ++- base/applications/rapps/lang/tr-TR.rc | 6 ++- base/applications/rapps/lang/uk-UA.rc | 6 ++- base/applications/rapps/lang/zh-CN.rc | 6 ++- base/applications/rapps/lang/zh-HK.rc | 6 ++- base/applications/rapps/lang/zh-TW.rc | 6 ++- 29 files changed, 167 insertions(+), 48 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index e101416c94d21..c0f18107c1ed9 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -313,21 +313,6 @@ CAppRichEdit::InsertTextWithString(UINT StringID, const CStringW &Text, DWORD Te LoadAndInsertText(StringID, Text, TextFlags); } } - -VOID -CAppRichEdit::SetWelcomeText() -{ - CStringW szText; - - szText.LoadStringW(IDS_WELCOME_TITLE); - SetText(szText, CFE_BOLD); - - szText.LoadStringW(IDS_WELCOME_TEXT); - InsertText(szText, 0); - - szText.LoadStringW(IDS_WELCOME_URL); - InsertText(szText, CFM_LINK); -} // **** CAppRichEdit **** int @@ -985,12 +970,41 @@ CAppInfoDisplay::ShowAppInfo(CAppInfo *Info) Info->ShowAppInfo(RichEdit); } -VOID -CAppInfoDisplay::SetWelcomeText() +void +CAppInfoDisplay::SetWelcomeText(bool bAppwiz) { + CStringW szText; + ScrnshotPrev->DisplayEmpty(); ResizeChildren(); - RichEdit->SetWelcomeText(); + + // Display the standard banner in normal mode, or + // the specific "Add/Remove Programs" in APPWIZ-mode. + if (!bAppwiz) + { + szText.LoadStringW(IDS_WELCOME_TITLE); + RichEdit->SetText(szText, CFE_BOLD); + RichEdit->InsertText(L"\n\n", 0); + + szText.LoadStringW(IDS_WELCOME_TEXT); + RichEdit->InsertText(szText, 0); + + szText.LoadStringW(IDS_WELCOME_URL); + RichEdit->InsertText(szText, CFM_LINK); + } + else + { + szText.LoadStringW(IDS_APPWIZ_TITLE); + RichEdit->SetText(szText, CFE_BOLD); + RichEdit->InsertText(L"\n\n", 0); + + szText.LoadStringW(IDS_APPWIZ_TEXT1); + RichEdit->InsertText(szText, 0); + RichEdit->InsertText(L"\n", 0); + + szText.LoadStringW(IDS_APPWIZ_TEXT2); + RichEdit->InsertText(szText, 0); + } } VOID @@ -2006,7 +2020,7 @@ CApplicationView::SetDisplayAppType(APPLICATION_VIEW_TYPE AppType) return FALSE; } ApplicationViewType = AppType; - m_AppsInfo->SetWelcomeText(); + m_AppsInfo->SetWelcomeText(m_MainWindow->m_bAppwizMode); HMENU hMenu = ::GetMenu(m_hWnd); switch (AppType) diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index c53a6e819541a..d457d45c79941 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -89,8 +89,6 @@ class CAppRichEdit : public CUiWindow LoadAndInsertText(UINT uStringID, DWORD StringFlags); VOID InsertTextWithString(UINT StringID, const CStringW &Text, DWORD TextFlags); - VOID - SetWelcomeText(); }; int @@ -178,8 +176,8 @@ class CAppInfoDisplay : public CUiWindow> VOID ShowAppInfo(CAppInfo *Info); - VOID - SetWelcomeText(); + void + SetWelcomeText(bool bAppwiz); VOID OnCommand(WPARAM wParam, LPARAM lParam); diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index d40efdbf22f0e..790a9ae87e1a6 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -93,6 +93,9 @@ #define IDS_WELCOME_TITLE 102 #define IDS_WELCOME_TEXT 103 #define IDS_WELCOME_URL 104 +#define IDS_APPWIZ_TITLE 105 +#define IDS_APPWIZ_TEXT1 106 +#define IDS_APPWIZ_TEXT2 107 /* Strings */ #define IDS_SEARCH_TEXT 110 diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index 4e81b1fb12acd..c69ad32e4b5d0 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -175,6 +175,10 @@ BEGIN IDS_WELCOME_TITLE "Управителят на приложенията на РеактОС ви приветства" IDS_WELCOME_TEXT "Изберете раздел от лявата страна, след което изберете приложение за слагане или премахване.\nСтраницата на РеактОС: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index 1828881d347a5..41d01040fb109 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -173,9 +173,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Správce aplikací" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Vítejte v ReactOS Správci aplikací!\n\n" + IDS_WELCOME_TITLE "Vítejte v ReactOS Správci aplikací!" IDS_WELCOME_TEXT "Na levé straně zvolte kategorii, pak vpravo zvolte aplikaci, která bude nainstalována nebo odinstalována.\nWebová stránka ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index debb91aa7302c..3fedb68171fac 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -175,9 +175,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS-Anwendungsmanager" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Willkommen im ReactOS-Anwendungsmanager!\n\n" + IDS_WELCOME_TITLE "Willkommen im ReactOS-Anwendungsmanager!" IDS_WELCOME_TEXT "Wählen Sie links eine Kategorie und dann eine Anwendung um sie zu installieren oder zu deinstallieren.\nReactOS-Webseite: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 2d6c4c47073f0..968360d3b130d 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -175,9 +175,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Applications Manager" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Welcome to ReactOS Applications Manager!\n\n" + IDS_WELCOME_TITLE "Welcome to ReactOS Applications Manager!" IDS_WELCOME_TEXT "Choose a category on the left, then choose an application to install or uninstall.\nReactOS Web Site: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index 5607ab12582c4..60e047b0f2ccb 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -174,9 +174,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Administrador de aplicaciones de ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Bienvenido al Administrador de aplicaciones de ReactOS.\n\n" + IDS_WELCOME_TITLE "Bienvenido al Administrador de aplicaciones de ReactOS." IDS_WELCOME_TEXT "Seleccione una categoría a la izquierda, para más tarde seleccionar la aplicación a instalar o desinstalar.\nWeb de ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc index 41afa63d9e94a..6af7f201d002a 100644 --- a/base/applications/rapps/lang/et-EE.rc +++ b/base/applications/rapps/lang/et-EE.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS'i Rakenduste Haldur" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Tere tulemast ReactOS'i Rakenduste Haldurisse!\n\n" + IDS_WELCOME_TITLE "Tere tulemast ReactOS'i Rakenduste Haldurisse!" IDS_WELCOME_TEXT "Vali vasakult teema, siis vali paremalt rakendusi mida soovid installida või desinstallida.\nReactOS'i veebileht: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index d7f1d27d3ac0a..0a7baf2bb7604 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -175,9 +175,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Gestionnaire d'applications ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Bienvenue dans ReactOS Applications Manager !\n\n" + IDS_WELCOME_TITLE "Bienvenue dans ReactOS Applications Manager !" IDS_WELCOME_TEXT "Choisissez une catégorie à gauche, ensuite choisissez une application à installer ou désinstaller.\nSite internet de ReactOS : " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Ajout/Suppression de programmes" // "Ajouter/Supprimer des Programmes" + IDS_APPWIZ_TEXT1 "Choisissez ""Applications"" ou ""Mises à jour"" pour voir la liste des programmes ou des mises à jour installés sur votre système." + IDS_APPWIZ_TEXT2 "Pour supprimer un programme, ou modifier ses composants installés, sélectionnez-le dans la liste et cliquez sur ""Désinstaller"" ou ""Modifier""." END STRINGTABLE diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index db9ce84b5e9f4..0090533fe187e 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -177,9 +177,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "מנהל היישומים של ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "ברוכים הבאים למנהל היישומים של ReactOS!\n\n" + IDS_WELCOME_TITLE "ברוכים הבאים למנהל היישומים של ReactOS!" IDS_WELCOME_TEXT "בחר קטגוריה בצד שמאל, לאחר מכן בחר יישום להתקנה או להסרה.\nהאתר של ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/hu-HU.rc b/base/applications/rapps/lang/hu-HU.rc index 639cf42a0ad46..5fa6c502db50d 100644 --- a/base/applications/rapps/lang/hu-HU.rc +++ b/base/applications/rapps/lang/hu-HU.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Alkalmazáskezelő" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Üdvözöljük a ReactOS Alkalmazáskezelőben!\n\n" + IDS_WELCOME_TITLE "Üdvözöljük a ReactOS Alkalmazáskezelőben!" IDS_WELCOME_TEXT "Bal oldalon válasszon kategóriát, majd válasszon egy telepíteni vagy eltávolítani kívánt alkalmazást.\nReactOS weboldal: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc index f6835f3d3a272..92942ec2325ea 100644 --- a/base/applications/rapps/lang/id-ID.rc +++ b/base/applications/rapps/lang/id-ID.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Manajer Aplikasi ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Selamat datang di Manajer Aplikasi ReactOS!\n\n" + IDS_WELCOME_TITLE "Selamat datang di Manajer Aplikasi ReactOS!" IDS_WELCOME_TEXT "pilih kategori di sisi kiri, kemudian pilih aplikasi untuk dipasang atau dibongkar.\nSitus Web ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 5c48de6b6e1f6..a80578d2dcc60 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -174,9 +174,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Gestione applicazioni" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Benvenuto!\n\n" + IDS_WELCOME_TITLE "Benvenuto!" IDS_WELCOME_TEXT "Scegliere una categoria a sinistra, poi scegliere una applicazione da installare o disinstallare.\nReactOS Web Site: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 9464fb4b15918..c17ffd03f8dff 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -174,9 +174,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS アプリ マネージャ" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "ReactOS アプリ マネージャへようこそ!\n\n" + IDS_WELCOME_TITLE "ReactOS アプリ マネージャへようこそ!" IDS_WELCOME_TEXT "左側からカテゴリを選択し、インストールまたはアンインストールするアプリを選んでください。\nReactOS ウェブ サイト: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index 2a9ef665c6990..bb2393102e67a 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS programbehandler" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Velkommen til ReactOS programbehandler!\n\n" + IDS_WELCOME_TITLE "Velkommen til ReactOS programbehandler!" IDS_WELCOME_TEXT "Velg en kategori til venstre, og velg et program for installere eller avinstallere programvaren.\nReactOS internettside: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index 335dc0d42e1c8..d4ff8f18ad4d7 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -174,9 +174,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Menedżer aplikacji ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Witamy w Menedżerze aplikacji ReactOS!\n\n" + IDS_WELCOME_TITLE "Witamy w Menedżerze aplikacji ReactOS!" IDS_WELCOME_TEXT "Z listy po lewej wybierz kategorię, a następnie aplikację, by ją zainstalować lub odinstalować.\nStrona projektu ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index 6e4a4b5d3f585..02be0fcd5f019 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Central de Aplicativos ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Bem-vindo(a) a Central de Aplicativos ReactOS!\n\n" + IDS_WELCOME_TITLE "Bem-vindo(a) a Central de Aplicativos ReactOS!" IDS_WELCOME_TEXT "Escolha uma categoria à esquerda, então escolha um aplicativo para instalar ou desinstalar.\nWeb Site ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index 570a6b32d71ec..aea5ccc349124 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Central de aplicações ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Bem-vindo(a) à Central de aplicações ReactOS!\n\n" + IDS_WELCOME_TITLE "Bem-vindo(a) à Central de aplicações ReactOS!" IDS_WELCOME_TEXT "Escolha uma categoria à esquerda, de seguida escolha uma aplicação para instalar ou desinstalar.\nWeb Site ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index db22084ea2e5a..48d63040990cf 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -174,9 +174,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Managerul de aplicații ReactOS" IDS_APP_AUTHORS "Marcă înregistrată 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Bun venit la Managerul de aplicații ReactOS!\n\n" + IDS_WELCOME_TITLE "Bun venit la Managerul de aplicații ReactOS!" IDS_WELCOME_TEXT "Alegeți o categorie din stânga, apoi alegeți o aplicație pentru a o instala sau dezinstala.\nArdesa web ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 4a5eae4648499..bf4919daf42ed 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -177,9 +177,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Менеджер приложений ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Добро пожаловать в ""Менеджер приложений ReactOS""!\n\n" + IDS_WELCOME_TITLE "Добро пожаловать в ""Менеджер приложений ReactOS""!" IDS_WELCOME_TEXT "Выберите категорию слева и приложение для установки или удаления.\nСайт ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index b6bcd5f8888ee..79d38ea468aad 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Manažér aplikácií systému ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Víta Vás Manažér aplikácií systému ReactOS!\n\n" + IDS_WELCOME_TITLE "Víta Vás Manažér aplikácií systému ReactOS!" IDS_WELCOME_TEXT "Vyberte si kategóriu na ľavej strane, potom vyberte aplikáciu, ktorú chcete nainštalovať alebo odinštalovať.\nWebstránka projektu ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 0a12626f5759e..9d40291659b39 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Applications Manager" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Mire Se Erdhe ne ReactOS Applications Manager!\n\n" + IDS_WELCOME_TITLE "Mire Se Erdhe ne ReactOS Applications Manager!" IDS_WELCOME_TEXT "Zgjidh nje kategori ne te majte, pastaj zgjidh nje aplicacion per ta instaluar ose uninstall.\nReactOS Web Site: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index 8c0ac57527b0e..92e142cf9bcfa 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -172,9 +172,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS programhanterare" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Välkommen till ReactOS programhanterare!\n\n" + IDS_WELCOME_TITLE "Välkommen till ReactOS programhanterare!" IDS_WELCOME_TEXT "Välj en kategori till vänster, och sedan ett program för att installera eller avinstallera.\nReactOS Web sida: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index 636fd683b09da..e6fbdc062b2cf 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -174,9 +174,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Uygulama Yöneticisi" IDS_APP_AUTHORS "Telif Hakkı: 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "ReactOS Uygulama Yöneticisi'ne hoş geldiniz.\n\n" + IDS_WELCOME_TITLE "ReactOS Uygulama Yöneticisi'ne hoş geldiniz." IDS_WELCOME_TEXT "Solda bir kategori seçiniz, ardından kurmak ya da kaldırmak için bir uygulama seçiniz.\nReactOS'un İnternet sitesi: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index 9da6dc8d85940..9836138bcca25 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -175,9 +175,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "Менеджер додатків ReactOS" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "Ласкаво просимо в Менеджер додатків ReactOS!\n\n" + IDS_WELCOME_TITLE "Ласкаво просимо в Менеджер додатків ReactOS!" IDS_WELCOME_TEXT "Виберіть категорію зліва, а потім виберіть програми для встановлення чи видалення.\nСторінка ReactOS: " IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index 5926483f471db..b2ba23b085379 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -176,9 +176,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS 程序管理器" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "欢迎使用 ReactOS 程序管理器！\n\n" + IDS_WELCOME_TITLE "欢迎使用 ReactOS 程序管理器！" IDS_WELCOME_TEXT "从左栏选择一个类别，然后选择要安装或卸载的程序。\nReactOS 网站：" IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-HK.rc b/base/applications/rapps/lang/zh-HK.rc index 6ef6abbfab9cf..a1959f2d6054b 100644 --- a/base/applications/rapps/lang/zh-HK.rc +++ b/base/applications/rapps/lang/zh-HK.rc @@ -173,9 +173,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS 程式管理員" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！\n\n" + IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！" IDS_WELCOME_TEXT "從左側欄目選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站︰" IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 94aec57090d60..2c8badd29152d 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -173,9 +173,13 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS 程式管理員" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" - IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！\n\n" + IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！" IDS_WELCOME_TEXT "從左側欄目選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站︰" IDS_WELCOME_URL "https://reactos.org" + + IDS_APPWIZ_TITLE "Add/Remove Programs" + IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." + IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." END STRINGTABLE