From 2c2a9bbeb624615f84eec2592acbca24e88b5759 Mon Sep 17 00:00:00 2001 From: jpb Date: Tue, 1 Aug 2023 20:53:00 +0100 Subject: [PATCH 01/74] Windivs 2k3 SP2 development begins! --- sdk/include/reactos/version.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index b5ae3276a28..d2be2ee7b04 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -9,12 +9,12 @@ endif() set(KERNEL_VERSION_MAJOR "5") set(KERNEL_VERSION_MINOR "2") set(KERNEL_VERSION_PATCH_LEVEL "3790") -set(KERNEL_VERSION_PATCH_NUMBER "55") +set(KERNEL_VERSION_PATCH_NUMBER "75") set(COPYRIGHT_YEAR "2023") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds # or "RC1", "RC2", "" for releases. -set(KERNEL_VERSION_BUILD_TYPE "wins2k3-sp1") +set(KERNEL_VERSION_BUILD_TYPE "wins2k3-sp2") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}.${KERNEL_VERSION_PATCH_LEVEL}.${KERNEL_VERSION_PATCH_NUMBER}-${WINARCH}") if(NOT KERNEL_VERSION_BUILD_TYPE STREQUAL "") From f7fefd1d275fd79a68f357ce6c3676dc5e89bd51 Mon Sep 17 00:00:00 2001 From: jpb Date: Wed, 2 Aug 2023 06:30:38 +0100 Subject: [PATCH 02/74] Update branding --- base/setup/usetup/lang/bg-BG.h | 58 +++++++++--------- base/setup/usetup/lang/bn-BD.h | 58 +++++++++--------- base/setup/usetup/lang/cs-CZ.h | 58 +++++++++--------- base/setup/usetup/lang/da-DK.h | 58 +++++++++--------- base/setup/usetup/lang/de-DE.h | 58 +++++++++--------- base/setup/usetup/lang/el-GR.h | 4 +- base/setup/usetup/lang/en-US.h | 58 +++++++++--------- base/setup/usetup/lang/es-ES.h | 58 +++++++++--------- base/setup/usetup/lang/et-EE.h | 58 +++++++++--------- base/setup/usetup/lang/eu-ES.h | 58 +++++++++--------- base/setup/usetup/lang/fr-FR.h | 58 +++++++++--------- base/setup/usetup/lang/he-IL.h | 58 +++++++++--------- base/setup/usetup/lang/hr-HR.h | 58 +++++++++--------- base/setup/usetup/lang/hu-HU.h | 56 ++++++++--------- base/setup/usetup/lang/id-ID.h | 58 +++++++++--------- base/setup/usetup/lang/it-IT.h | 58 +++++++++--------- base/setup/usetup/lang/ja-JP.h | 58 +++++++++--------- base/setup/usetup/lang/lt-LT.h | 58 +++++++++--------- base/setup/usetup/lang/ms-MY.h | 58 +++++++++--------- base/setup/usetup/lang/nl-NL.h | 58 +++++++++--------- base/setup/usetup/lang/pl-PL.h | 58 +++++++++--------- base/setup/usetup/lang/pt-BR.h | 58 +++++++++--------- base/setup/usetup/lang/pt-PT.h | 58 +++++++++--------- base/setup/usetup/lang/ro-RO.h | 50 +++++++-------- base/setup/usetup/lang/ru-RU.h | 2 +- base/setup/usetup/lang/sk-SK.h | 58 +++++++++--------- base/setup/usetup/lang/sq-AL.h | 58 +++++++++--------- base/setup/usetup/lang/sv-SE.h | 58 +++++++++--------- base/setup/usetup/lang/tr-TR.h | 58 +++++++++--------- base/setup/usetup/lang/uk-UA.h | 58 +++++++++--------- .../shell32/res/bitmaps/reactosserver.bmp | Bin 89334 -> 89334 bytes .../res/bitmaps/reactosworkstation.bmp | Bin 89334 -> 118998 bytes ntoskrnl/inbv/resources/copyright.bmp | Bin 2614 -> 2614 bytes ntoskrnl/inbv/resources/logo.bmp | Bin 21622 -> 21622 bytes ntoskrnl/inbv/resources/progress.bmp | Bin 1198 -> 1198 bytes 35 files changed, 810 insertions(+), 810 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 30055880532..0590f0c0516 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -8,7 +8,7 @@ static MUI_ENTRY bgBGSetupInitPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY bgBGLanguagePageEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY bgBGWelcomePageEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -192,7 +192,7 @@ static MUI_ENTRY bgBGIntroPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -279,7 +279,7 @@ static MUI_ENTRY bgBGLicensePageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -422,7 +422,7 @@ static MUI_ENTRY bgBGDevicePageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -529,7 +529,7 @@ static MUI_ENTRY bgBGRepairPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -602,7 +602,7 @@ static MUI_ENTRY bgBGUpgradePageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -682,7 +682,7 @@ static MUI_ENTRY bgBGComputerPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -741,7 +741,7 @@ static MUI_ENTRY bgBGFlushPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -786,7 +786,7 @@ static MUI_ENTRY bgBGQuitPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -838,7 +838,7 @@ static MUI_ENTRY bgBGDisplayPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -897,7 +897,7 @@ static MUI_ENTRY bgBGSuccessPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -949,7 +949,7 @@ static MUI_ENTRY bgBGBootPageEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1002,7 +1002,7 @@ static MUI_ENTRY bgBGSelectPartitionEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1083,7 +1083,7 @@ static MUI_ENTRY bgBGChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \210\255\341\342\240\253\240\346\250\357 ", + " Windivs 2k3 Service Pack 2 \210\255\341\342\240\253\240\346\250\357 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1205,7 +1205,7 @@ static MUI_ENTRY bgBGConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1313,7 +1313,7 @@ static MUI_ENTRY bgBGFormatPartitionEntries[] = { 4, 3, - " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\250\340\240\255\245 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1350,7 +1350,7 @@ static MUI_ENTRY bgBGCheckFSEntries[] = { { 4, - 3, " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + 3, " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1381,7 +1381,7 @@ static MUI_ENTRY bgBGInstallDirectoryEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1440,7 +1440,7 @@ static MUI_ENTRY bgBGFileCopyEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1486,7 +1486,7 @@ static MUI_ENTRY bgBGBootLoaderEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1545,7 +1545,7 @@ static MUI_ENTRY bgBGBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \210\255\341\342\240\253\240\346\250\357 ", + " Windivs 2k3 Service Pack 2 \210\255\341\342\240\253\240\346\250\357 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1569,7 +1569,7 @@ static MUI_ENTRY bgBGKeyboardSettingsEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1628,7 +1628,7 @@ static MUI_ENTRY bgBGLayoutSettingsEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1688,7 +1688,7 @@ static MUI_ENTRY bgBGPrepareCopyEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1720,7 +1720,7 @@ static MUI_ENTRY bgBGSelectFSEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1768,7 +1768,7 @@ static MUI_ENTRY bgBGDeletePartitionEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1820,7 +1820,7 @@ static MUI_ENTRY bgBGRegistryEntries[] = { 4, 3, - " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 1 .", + " \210\255\341\342\240\253\240\346\250\357 \255\240 Windivs 2k3 Service Pack 2 .", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 00345c5d257..878a710ab4b 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -5,7 +5,7 @@ static MUI_ENTRY bnBDSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -43,7 +43,7 @@ static MUI_ENTRY bnBDLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -95,7 +95,7 @@ static MUI_ENTRY bnBDWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -183,7 +183,7 @@ static MUI_ENTRY bnBDIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -270,7 +270,7 @@ static MUI_ENTRY bnBDLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -413,7 +413,7 @@ static MUI_ENTRY bnBDDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -520,7 +520,7 @@ static MUI_ENTRY bnBDRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -593,7 +593,7 @@ static MUI_ENTRY bnBDUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -673,7 +673,7 @@ static MUI_ENTRY bnBDComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -732,7 +732,7 @@ static MUI_ENTRY bnBDFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -777,7 +777,7 @@ static MUI_ENTRY bnBDQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -829,7 +829,7 @@ static MUI_ENTRY bnBDDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -888,7 +888,7 @@ static MUI_ENTRY bnBDSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -940,7 +940,7 @@ static MUI_ENTRY bnBDBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -993,7 +993,7 @@ static MUI_ENTRY bnBDBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1017,7 +1017,7 @@ static MUI_ENTRY bnBDSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1097,7 +1097,7 @@ static MUI_ENTRY bnBDChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1219,7 +1219,7 @@ static MUI_ENTRY bnBDConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1327,7 +1327,7 @@ static MUI_ENTRY bnBDFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1365,7 +1365,7 @@ static MUI_ENTRY bnBDCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1396,7 +1396,7 @@ static MUI_ENTRY bnBDInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1455,7 +1455,7 @@ static MUI_ENTRY bnBDFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1500,7 +1500,7 @@ static MUI_ENTRY bnBDBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1559,7 +1559,7 @@ static MUI_ENTRY bnBDKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1618,7 +1618,7 @@ static MUI_ENTRY bnBDLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1678,7 +1678,7 @@ static MUI_ENTRY bnBDPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1710,7 +1710,7 @@ static MUI_ENTRY bnBDSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1758,7 +1758,7 @@ static MUI_ENTRY bnBDDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1810,7 +1810,7 @@ static MUI_ENTRY bnBDRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 492b334247c..d5efbe455a8 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -14,7 +14,7 @@ static MUI_ENTRY csCZSetupInitPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -52,7 +52,7 @@ static MUI_ENTRY csCZLanguagePageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -104,7 +104,7 @@ static MUI_ENTRY csCZWelcomePageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -191,7 +191,7 @@ static MUI_ENTRY csCZIntroPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -278,7 +278,7 @@ static MUI_ENTRY csCZLicensePageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -421,7 +421,7 @@ static MUI_ENTRY csCZDevicePageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -528,7 +528,7 @@ static MUI_ENTRY csCZRepairPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -601,7 +601,7 @@ static MUI_ENTRY csCZUpgradePageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -681,7 +681,7 @@ static MUI_ENTRY csCZComputerPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -740,7 +740,7 @@ static MUI_ENTRY csCZFlushPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -785,7 +785,7 @@ static MUI_ENTRY csCZQuitPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -837,7 +837,7 @@ static MUI_ENTRY csCZDisplayPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -896,7 +896,7 @@ static MUI_ENTRY csCZSuccessPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -948,7 +948,7 @@ static MUI_ENTRY csCZBootPageEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1001,7 +1001,7 @@ static MUI_ENTRY csCZSelectPartitionEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1081,7 +1081,7 @@ static MUI_ENTRY csCZChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1203,7 +1203,7 @@ static MUI_ENTRY csCZConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1311,7 +1311,7 @@ static MUI_ENTRY csCZFormatPartitionEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1349,7 +1349,7 @@ static MUI_ENTRY csCZCheckFSEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1380,7 +1380,7 @@ static MUI_ENTRY csCZInstallDirectoryEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1439,7 +1439,7 @@ static MUI_ENTRY csCZFileCopyEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1484,7 +1484,7 @@ static MUI_ENTRY csCZBootLoaderEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1543,7 +1543,7 @@ static MUI_ENTRY csCZBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1567,7 +1567,7 @@ static MUI_ENTRY csCZKeyboardSettingsEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1626,7 +1626,7 @@ static MUI_ENTRY csCZLayoutSettingsEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1686,7 +1686,7 @@ static MUI_ENTRY csCZPrepareCopyEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1718,7 +1718,7 @@ static MUI_ENTRY csCZSelectFSEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1766,7 +1766,7 @@ static MUI_ENTRY csCZDeletePartitionEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1818,7 +1818,7 @@ static MUI_ENTRY csCZRegistryEntries[] = { 4, 3, - " Instalace Windivs 2k3 Service Pack 1 ", + " Instalace Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 235ad977094..bdcd788f736 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -8,7 +8,7 @@ static MUI_ENTRY daDKSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY daDKLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY daDKWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -185,7 +185,7 @@ static MUI_ENTRY daDKIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -272,7 +272,7 @@ static MUI_ENTRY daDKLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -415,7 +415,7 @@ static MUI_ENTRY daDKDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -522,7 +522,7 @@ static MUI_ENTRY daDKRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -602,7 +602,7 @@ static MUI_ENTRY daDKUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -682,7 +682,7 @@ static MUI_ENTRY daDKComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -741,7 +741,7 @@ static MUI_ENTRY daDKFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -786,7 +786,7 @@ static MUI_ENTRY daDKQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -838,7 +838,7 @@ static MUI_ENTRY daDKDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -897,7 +897,7 @@ static MUI_ENTRY daDKSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -949,7 +949,7 @@ static MUI_ENTRY daDKBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1002,7 +1002,7 @@ static MUI_ENTRY daDKSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1082,7 +1082,7 @@ static MUI_ENTRY daDKChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1204,7 +1204,7 @@ static MUI_ENTRY daDKConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1305,7 +1305,7 @@ static MUI_ENTRY daDKFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1343,7 +1343,7 @@ static MUI_ENTRY daDKCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1374,7 +1374,7 @@ static MUI_ENTRY daDKInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1433,7 +1433,7 @@ static MUI_ENTRY daDKFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1478,7 +1478,7 @@ static MUI_ENTRY daDKBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1537,7 +1537,7 @@ static MUI_ENTRY daDKBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1561,7 +1561,7 @@ static MUI_ENTRY daDKKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1620,7 +1620,7 @@ static MUI_ENTRY daDKLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1680,7 +1680,7 @@ static MUI_ENTRY daDKPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1712,7 +1712,7 @@ static MUI_ENTRY daDKSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1760,7 +1760,7 @@ static MUI_ENTRY daDKDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1812,7 +1812,7 @@ static MUI_ENTRY daDKRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 installationen ", + " Windivs 2k3 Service Pack 2 installationen ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index c0198d2c454..37a5d99652b 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -8,7 +8,7 @@ static MUI_ENTRY deDESetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY deDELanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY deDEWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -185,7 +185,7 @@ static MUI_ENTRY deDEIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -272,7 +272,7 @@ static MUI_ENTRY deDELicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -415,7 +415,7 @@ static MUI_ENTRY deDEDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -522,7 +522,7 @@ static MUI_ENTRY deDERepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -602,7 +602,7 @@ static MUI_ENTRY deDEUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -682,7 +682,7 @@ static MUI_ENTRY deDEComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -741,7 +741,7 @@ static MUI_ENTRY deDEFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -786,7 +786,7 @@ static MUI_ENTRY deDEQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -831,7 +831,7 @@ static MUI_ENTRY deDEDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -890,7 +890,7 @@ static MUI_ENTRY deDESuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -935,7 +935,7 @@ static MUI_ENTRY deDEBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -988,7 +988,7 @@ static MUI_ENTRY deDESelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1068,7 +1068,7 @@ static MUI_ENTRY deDEChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1190,7 +1190,7 @@ static MUI_ENTRY deDEConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1298,7 +1298,7 @@ static MUI_ENTRY deDEFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1343,7 +1343,7 @@ static MUI_ENTRY deDECheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1374,7 +1374,7 @@ static MUI_ENTRY deDEInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1433,7 +1433,7 @@ static MUI_ENTRY deDEFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1478,7 +1478,7 @@ static MUI_ENTRY deDEBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1537,7 +1537,7 @@ static MUI_ENTRY deDEBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1561,7 +1561,7 @@ static MUI_ENTRY deDEKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1620,7 +1620,7 @@ static MUI_ENTRY deDELayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1680,7 +1680,7 @@ static MUI_ENTRY deDEPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1712,7 +1712,7 @@ static MUI_ENTRY deDESelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1760,7 +1760,7 @@ static MUI_ENTRY deDEDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1812,7 +1812,7 @@ static MUI_ENTRY deDERegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 1fa9350ed77..f342bb3892c 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1090,7 +1090,7 @@ static MUI_ENTRY elGRChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1552,7 +1552,7 @@ static MUI_ENTRY elGRBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 68e6c71fdc8..00684f410cf 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -5,7 +5,7 @@ static MUI_ENTRY enUSSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -43,7 +43,7 @@ static MUI_ENTRY enUSLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -95,7 +95,7 @@ static MUI_ENTRY enUSWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -183,7 +183,7 @@ static MUI_ENTRY enUSIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -270,7 +270,7 @@ static MUI_ENTRY enUSLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -413,7 +413,7 @@ static MUI_ENTRY enUSDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -520,7 +520,7 @@ static MUI_ENTRY enUSRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -593,7 +593,7 @@ static MUI_ENTRY enUSUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -673,7 +673,7 @@ static MUI_ENTRY enUSComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -732,7 +732,7 @@ static MUI_ENTRY enUSFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -777,7 +777,7 @@ static MUI_ENTRY enUSQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -829,7 +829,7 @@ static MUI_ENTRY enUSDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -888,7 +888,7 @@ static MUI_ENTRY enUSSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -940,7 +940,7 @@ static MUI_ENTRY enUSBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -993,7 +993,7 @@ static MUI_ENTRY enUSSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1073,7 +1073,7 @@ static MUI_ENTRY enUSChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1195,7 +1195,7 @@ static MUI_ENTRY enUSConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1303,7 +1303,7 @@ static MUI_ENTRY enUSFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1341,7 +1341,7 @@ static MUI_ENTRY enUSCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1372,7 +1372,7 @@ static MUI_ENTRY enUSInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1431,7 +1431,7 @@ static MUI_ENTRY enUSFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1476,7 +1476,7 @@ static MUI_ENTRY enUSBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1535,7 +1535,7 @@ static MUI_ENTRY enUSBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1559,7 +1559,7 @@ static MUI_ENTRY enUSKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1618,7 +1618,7 @@ static MUI_ENTRY enUSLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1678,7 +1678,7 @@ static MUI_ENTRY enUSPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1710,7 +1710,7 @@ static MUI_ENTRY enUSSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1758,7 +1758,7 @@ static MUI_ENTRY enUSDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1810,7 +1810,7 @@ static MUI_ENTRY enUSRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 4a4de26de9f..d3c8ccc591f 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -10,7 +10,7 @@ static MUI_ENTRY esESSetupInitPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -48,7 +48,7 @@ static MUI_ENTRY esESLanguagePageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -100,7 +100,7 @@ static MUI_ENTRY esESWelcomePageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -188,7 +188,7 @@ static MUI_ENTRY esESIntroPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -275,7 +275,7 @@ static MUI_ENTRY esESLicensePageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -418,7 +418,7 @@ static MUI_ENTRY esESDevicePageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -525,7 +525,7 @@ static MUI_ENTRY esESRepairPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -598,7 +598,7 @@ static MUI_ENTRY esESUpgradePageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -678,7 +678,7 @@ static MUI_ENTRY esESComputerPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -737,7 +737,7 @@ static MUI_ENTRY esESFlushPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -782,7 +782,7 @@ static MUI_ENTRY esESQuitPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -834,7 +834,7 @@ static MUI_ENTRY esESDisplayPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -893,7 +893,7 @@ static MUI_ENTRY esESSuccessPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -945,7 +945,7 @@ static MUI_ENTRY esESBootPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -998,7 +998,7 @@ static MUI_ENTRY esESSelectPartitionEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1079,7 +1079,7 @@ static MUI_ENTRY esESChangeSystemPartition[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1201,7 +1201,7 @@ static MUI_ENTRY esESConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1309,7 +1309,7 @@ static MUI_ENTRY esESFormatPartitionEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1347,7 +1347,7 @@ static MUI_ENTRY esESCheckFSEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1378,7 +1378,7 @@ static MUI_ENTRY esESInstallDirectoryEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1437,7 +1437,7 @@ static MUI_ENTRY esESFileCopyEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1482,7 +1482,7 @@ static MUI_ENTRY esESBootLoaderEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1541,7 +1541,7 @@ static MUI_ENTRY etESBootLoaderInstallPageEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1565,7 +1565,7 @@ static MUI_ENTRY esESKeyboardSettingsEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1624,7 +1624,7 @@ static MUI_ENTRY esESLayoutSettingsEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1684,7 +1684,7 @@ static MUI_ENTRY esESPrepareCopyEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1716,7 +1716,7 @@ static MUI_ENTRY esESSelectFSEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1764,7 +1764,7 @@ static MUI_ENTRY esESDeletePartitionEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1816,7 +1816,7 @@ static MUI_ENTRY esESRegistryEntries[] = { 4, 3, - " Instalaci\242n de Windivs 2k3 Service Pack 1 ", + " Instalaci\242n de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index 74cfef2850b..8d8b2ff2afd 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -8,7 +8,7 @@ static MUI_ENTRY etEESetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY etEELanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY etEEWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -185,7 +185,7 @@ static MUI_ENTRY etEEIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -272,7 +272,7 @@ static MUI_ENTRY etEELicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -415,7 +415,7 @@ static MUI_ENTRY etEEDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -522,7 +522,7 @@ static MUI_ENTRY etEERepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -595,7 +595,7 @@ static MUI_ENTRY etEEUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -675,7 +675,7 @@ static MUI_ENTRY etEEComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -734,7 +734,7 @@ static MUI_ENTRY etEEFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -779,7 +779,7 @@ static MUI_ENTRY etEEQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -831,7 +831,7 @@ static MUI_ENTRY etEEDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -890,7 +890,7 @@ static MUI_ENTRY etEESuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -942,7 +942,7 @@ static MUI_ENTRY etEEBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -995,7 +995,7 @@ static MUI_ENTRY etEESelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1076,7 +1076,7 @@ static MUI_ENTRY etEEChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1198,7 +1198,7 @@ static MUI_ENTRY etEEConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1306,7 +1306,7 @@ static MUI_ENTRY etEEFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1344,7 +1344,7 @@ static MUI_ENTRY etEECheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1375,7 +1375,7 @@ static MUI_ENTRY etEEInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1434,7 +1434,7 @@ static MUI_ENTRY etEEFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1479,7 +1479,7 @@ static MUI_ENTRY etEEBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1538,7 +1538,7 @@ static MUI_ENTRY etEEBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1562,7 +1562,7 @@ static MUI_ENTRY etEEKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1621,7 +1621,7 @@ static MUI_ENTRY etEELayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1681,7 +1681,7 @@ static MUI_ENTRY etEEPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1713,7 +1713,7 @@ static MUI_ENTRY etEESelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1761,7 +1761,7 @@ static MUI_ENTRY etEEDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1813,7 +1813,7 @@ static MUI_ENTRY etEERegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 paigaldus ", + " Windivs 2k3 Service Pack 2 paigaldus ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h index ce81e9c254a..b5006d449c0 100644 --- a/base/setup/usetup/lang/eu-ES.h +++ b/base/setup/usetup/lang/eu-ES.h @@ -6,7 +6,7 @@ static MUI_ENTRY euESSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -44,7 +44,7 @@ static MUI_ENTRY euESLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -96,7 +96,7 @@ static MUI_ENTRY euESWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -184,7 +184,7 @@ static MUI_ENTRY euESIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -271,7 +271,7 @@ static MUI_ENTRY euESLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -414,7 +414,7 @@ static MUI_ENTRY euESDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -521,7 +521,7 @@ static MUI_ENTRY euESRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -594,7 +594,7 @@ static MUI_ENTRY euESUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -674,7 +674,7 @@ static MUI_ENTRY euESComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -733,7 +733,7 @@ static MUI_ENTRY euESFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -778,7 +778,7 @@ static MUI_ENTRY euESQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -830,7 +830,7 @@ static MUI_ENTRY euESDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -889,7 +889,7 @@ static MUI_ENTRY euESSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -941,7 +941,7 @@ static MUI_ENTRY euESBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -994,7 +994,7 @@ static MUI_ENTRY euESSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1074,7 +1074,7 @@ static MUI_ENTRY euESChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1196,7 +1196,7 @@ static MUI_ENTRY euESConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1304,7 +1304,7 @@ static MUI_ENTRY euESFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1342,7 +1342,7 @@ static MUI_ENTRY euESCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1373,7 +1373,7 @@ static MUI_ENTRY euESInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1432,7 +1432,7 @@ static MUI_ENTRY euESFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1477,7 +1477,7 @@ static MUI_ENTRY euESBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1536,7 +1536,7 @@ static MUI_ENTRY euESBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1560,7 +1560,7 @@ static MUI_ENTRY euESKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1619,7 +1619,7 @@ static MUI_ENTRY euESLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1679,7 +1679,7 @@ static MUI_ENTRY euESPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1711,7 +1711,7 @@ static MUI_ENTRY euESSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1759,7 +1759,7 @@ static MUI_ENTRY euESDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1811,7 +1811,7 @@ static MUI_ENTRY euESRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Instalazioa ", + " Windivs 2k3 Service Pack 2 Instalazioa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 67af9facf62..623feb8ce8c 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -8,7 +8,7 @@ static MUI_ENTRY frFRSetupInitPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY frFRLanguagePageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY frFRWelcomePageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -185,7 +185,7 @@ static MUI_ENTRY frFRIntroPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -272,7 +272,7 @@ static MUI_ENTRY frFRLicensePageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -429,7 +429,7 @@ static MUI_ENTRY frFRDevicePageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -536,7 +536,7 @@ static MUI_ENTRY frFRRepairPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -616,7 +616,7 @@ static MUI_ENTRY frFRUpgradePageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -696,7 +696,7 @@ static MUI_ENTRY frFRComputerPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -755,7 +755,7 @@ static MUI_ENTRY frFRFlushPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -800,7 +800,7 @@ static MUI_ENTRY frFRQuitPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -852,7 +852,7 @@ static MUI_ENTRY frFRDisplayPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -911,7 +911,7 @@ static MUI_ENTRY frFRSuccessPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -963,7 +963,7 @@ static MUI_ENTRY frFRBootPageEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1016,7 +1016,7 @@ static MUI_ENTRY frFRSelectPartitionEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1096,7 +1096,7 @@ static MUI_ENTRY frFRChangeSystemPartition[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1218,7 +1218,7 @@ static MUI_ENTRY frFRConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1340,7 +1340,7 @@ static MUI_ENTRY frFRFormatPartitionEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1378,7 +1378,7 @@ static MUI_ENTRY frFRCheckFSEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1409,7 +1409,7 @@ static MUI_ENTRY frFRInstallDirectoryEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1468,7 +1468,7 @@ static MUI_ENTRY frFRFileCopyEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1513,7 +1513,7 @@ static MUI_ENTRY frFRBootLoaderEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1572,7 +1572,7 @@ static MUI_ENTRY frFRBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1596,7 +1596,7 @@ static MUI_ENTRY frFRKeyboardSettingsEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1655,7 +1655,7 @@ static MUI_ENTRY frFRLayoutSettingsEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1715,7 +1715,7 @@ static MUI_ENTRY frFRPrepareCopyEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1747,7 +1747,7 @@ static MUI_ENTRY frFRSelectFSEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1795,7 +1795,7 @@ static MUI_ENTRY frFRDeletePartitionEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1847,7 +1847,7 @@ static MUI_ENTRY frFRRegistryEntries[] = { 4, 3, - " Installation de Windivs 2k3 Service Pack 1 ", + " Installation de Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 2d92861355c..87f80381526 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -9,7 +9,7 @@ static MUI_ENTRY heILSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -47,7 +47,7 @@ static MUI_ENTRY heILLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -99,7 +99,7 @@ static MUI_ENTRY heILWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -215,7 +215,7 @@ static MUI_ENTRY heILIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -295,7 +295,7 @@ static MUI_ENTRY heILLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -438,7 +438,7 @@ static MUI_ENTRY heILDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -545,7 +545,7 @@ static MUI_ENTRY heILRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -618,7 +618,7 @@ static MUI_ENTRY heILUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -698,7 +698,7 @@ static MUI_ENTRY heILComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -757,7 +757,7 @@ static MUI_ENTRY heILFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -802,7 +802,7 @@ static MUI_ENTRY heILQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -854,7 +854,7 @@ static MUI_ENTRY heILDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -913,7 +913,7 @@ static MUI_ENTRY heILSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -965,7 +965,7 @@ static MUI_ENTRY heILBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1018,7 +1018,7 @@ static MUI_ENTRY heILSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1098,7 +1098,7 @@ static MUI_ENTRY heILChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1220,7 +1220,7 @@ static MUI_ENTRY heILConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1328,7 +1328,7 @@ static MUI_ENTRY heILFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1366,7 +1366,7 @@ static MUI_ENTRY heILCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1397,7 +1397,7 @@ static MUI_ENTRY heILInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1456,7 +1456,7 @@ static MUI_ENTRY heILFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1501,7 +1501,7 @@ static MUI_ENTRY heILBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1560,7 +1560,7 @@ static MUI_ENTRY heILBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1584,7 +1584,7 @@ static MUI_ENTRY heILKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1643,7 +1643,7 @@ static MUI_ENTRY heILLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1703,7 +1703,7 @@ static MUI_ENTRY heILPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1735,7 +1735,7 @@ static MUI_ENTRY heILSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1783,7 +1783,7 @@ static MUI_ENTRY heILDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1835,7 +1835,7 @@ static MUI_ENTRY heILRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \232\220\227\232\204 ", + " Windivs 2k3 Service Pack 2 \232\220\227\232\204 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/hr-HR.h b/base/setup/usetup/lang/hr-HR.h index 37363875436..b8994387f3e 100644 --- a/base/setup/usetup/lang/hr-HR.h +++ b/base/setup/usetup/lang/hr-HR.h @@ -8,7 +8,7 @@ static MUI_ENTRY hrHRSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY hrHRLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY hrHRWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -186,7 +186,7 @@ static MUI_ENTRY hrHRIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -280,7 +280,7 @@ static MUI_ENTRY hrHRLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -423,7 +423,7 @@ static MUI_ENTRY hrHRDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -530,7 +530,7 @@ static MUI_ENTRY hrHRRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -603,7 +603,7 @@ static MUI_ENTRY hrHRUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -683,7 +683,7 @@ static MUI_ENTRY hrHRComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -742,7 +742,7 @@ static MUI_ENTRY hrHRFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -787,7 +787,7 @@ static MUI_ENTRY hrHRQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -839,7 +839,7 @@ static MUI_ENTRY hrHRDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -898,7 +898,7 @@ static MUI_ENTRY hrHRSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -950,7 +950,7 @@ static MUI_ENTRY hrHRBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1003,7 +1003,7 @@ static MUI_ENTRY hrHRSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1083,7 +1083,7 @@ static MUI_ENTRY hrHRChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1205,7 +1205,7 @@ static MUI_ENTRY hrHRConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1313,7 +1313,7 @@ static MUI_ENTRY hrHRFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1358,7 +1358,7 @@ static MUI_ENTRY hrHRCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1389,7 +1389,7 @@ static MUI_ENTRY hrHRInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1448,7 +1448,7 @@ static MUI_ENTRY hrHRFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1493,7 +1493,7 @@ static MUI_ENTRY hrHRBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1559,7 +1559,7 @@ static MUI_ENTRY hrHRBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1583,7 +1583,7 @@ static MUI_ENTRY hrHRKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1642,7 +1642,7 @@ static MUI_ENTRY hrHRLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1702,7 +1702,7 @@ static MUI_ENTRY hrHRPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1734,7 +1734,7 @@ static MUI_ENTRY hrHRSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1782,7 +1782,7 @@ static MUI_ENTRY hrHRDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1834,7 +1834,7 @@ static MUI_ENTRY hrHRRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 instalacija ", + " Windivs 2k3 Service Pack 2 instalacija ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index 3d2548f24b2..55639b01e21 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -8,7 +8,7 @@ static MUI_ENTRY huHUSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY huHULanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213", + " Windivs 2k3 Service Pack 2 telep\241t\213", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY huHUWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -185,7 +185,7 @@ static MUI_ENTRY huHUIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -272,7 +272,7 @@ static MUI_ENTRY huHULicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -422,7 +422,7 @@ static MUI_ENTRY huHUDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -523,7 +523,7 @@ static MUI_ENTRY huHURepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -596,7 +596,7 @@ static MUI_ENTRY huHUUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -676,7 +676,7 @@ static MUI_ENTRY huHUComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -735,7 +735,7 @@ static MUI_ENTRY huHUFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -787,7 +787,7 @@ static MUI_ENTRY huHUQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -839,7 +839,7 @@ static MUI_ENTRY huHUDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -897,7 +897,7 @@ static MUI_ENTRY huHUSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -949,7 +949,7 @@ static MUI_ENTRY huHUBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1002,7 +1002,7 @@ static MUI_ENTRY huHUSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1082,7 +1082,7 @@ static MUI_ENTRY huHUConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1197,7 +1197,7 @@ static MUI_ENTRY huHUFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1235,7 +1235,7 @@ static MUI_ENTRY huHUCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1266,7 +1266,7 @@ static MUI_ENTRY huHUInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1325,7 +1325,7 @@ static MUI_ENTRY huHUFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1370,7 +1370,7 @@ static MUI_ENTRY huHUBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1429,7 +1429,7 @@ static MUI_ENTRY huHUBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1453,7 +1453,7 @@ static MUI_ENTRY huHUKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1512,7 +1512,7 @@ static MUI_ENTRY huHULayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1572,7 +1572,7 @@ static MUI_ENTRY huHUPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1604,7 +1604,7 @@ static MUI_ENTRY huHUSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1653,7 +1653,7 @@ static MUI_ENTRY huHUDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1705,7 +1705,7 @@ static MUI_ENTRY huHURegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 telep\241t\213 ", + " Windivs 2k3 Service Pack 2 telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h index d7a408e085d..ae4f9dbd3b1 100644 --- a/base/setup/usetup/lang/id-ID.h +++ b/base/setup/usetup/lang/id-ID.h @@ -5,7 +5,7 @@ static MUI_ENTRY idIDSetupInitPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -43,7 +43,7 @@ static MUI_ENTRY idIDLanguagePageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -95,7 +95,7 @@ static MUI_ENTRY idIDWelcomePageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -183,7 +183,7 @@ static MUI_ENTRY idIDIntroPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -270,7 +270,7 @@ static MUI_ENTRY idIDLicensePageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -413,7 +413,7 @@ static MUI_ENTRY idIDDevicePageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -520,7 +520,7 @@ static MUI_ENTRY idIDRepairPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -593,7 +593,7 @@ static MUI_ENTRY idIDUpgradePageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -673,7 +673,7 @@ static MUI_ENTRY idIDComputerPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -732,7 +732,7 @@ static MUI_ENTRY idIDFlushPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -777,7 +777,7 @@ static MUI_ENTRY idIDQuitPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -829,7 +829,7 @@ static MUI_ENTRY idIDDisplayPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -888,7 +888,7 @@ static MUI_ENTRY idIDSuccessPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -940,7 +940,7 @@ static MUI_ENTRY idIDBootPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -993,7 +993,7 @@ static MUI_ENTRY idIDSelectPartitionEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1073,7 +1073,7 @@ static MUI_ENTRY idIDChangeSystemPartition[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1195,7 +1195,7 @@ static MUI_ENTRY idIDConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1303,7 +1303,7 @@ static MUI_ENTRY idIDFormatPartitionEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1341,7 +1341,7 @@ static MUI_ENTRY idIDCheckFSEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1372,7 +1372,7 @@ static MUI_ENTRY idIDInstallDirectoryEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1431,7 +1431,7 @@ static MUI_ENTRY idIDFileCopyEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1476,7 +1476,7 @@ static MUI_ENTRY idIDBootLoaderEntries[] = { 4, 3, - "Penyetelan Windivs 2k3 Service Pack 1 ", + "Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1535,7 +1535,7 @@ static MUI_ENTRY idIDBootLoaderInstallPageEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1559,7 +1559,7 @@ static MUI_ENTRY idIDKeyboardSettingsEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1618,7 +1618,7 @@ static MUI_ENTRY idIDLayoutSettingsEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1678,7 +1678,7 @@ static MUI_ENTRY idIDPrepareCopyEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1710,7 +1710,7 @@ static MUI_ENTRY idIDSelectFSEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1758,7 +1758,7 @@ static MUI_ENTRY idIDDeletePartitionEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1810,7 +1810,7 @@ static MUI_ENTRY idIDRegistryEntries[] = { 4, 3, - " Penyetelan Windivs 2k3 Service Pack 1 ", + " Penyetelan Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index e3ce2311578..15f49114be6 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -5,7 +5,7 @@ static MUI_ENTRY itITSetupInitPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -43,7 +43,7 @@ static MUI_ENTRY itITLanguagePageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -95,7 +95,7 @@ static MUI_ENTRY itITWelcomePageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -182,7 +182,7 @@ static MUI_ENTRY itITIntroPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -269,7 +269,7 @@ static MUI_ENTRY itITLicensePageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -412,7 +412,7 @@ static MUI_ENTRY itITDevicePageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -519,7 +519,7 @@ static MUI_ENTRY itITRepairPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -592,7 +592,7 @@ static MUI_ENTRY itITUpgradePageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -672,7 +672,7 @@ static MUI_ENTRY itITComputerPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -731,7 +731,7 @@ static MUI_ENTRY itITFlushPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -776,7 +776,7 @@ static MUI_ENTRY itITQuitPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -828,7 +828,7 @@ static MUI_ENTRY itITDisplayPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -887,7 +887,7 @@ static MUI_ENTRY itITSuccessPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -939,7 +939,7 @@ static MUI_ENTRY itITBootPageEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -992,7 +992,7 @@ static MUI_ENTRY itITBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1016,7 +1016,7 @@ static MUI_ENTRY itITSelectPartitionEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1096,7 +1096,7 @@ static MUI_ENTRY itITChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1218,7 +1218,7 @@ static MUI_ENTRY itITConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1333,7 +1333,7 @@ static MUI_ENTRY itITFormatPartitionEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1371,7 +1371,7 @@ static MUI_ENTRY itITCheckFSEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1402,7 +1402,7 @@ static MUI_ENTRY itITInstallDirectoryEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1461,7 +1461,7 @@ static MUI_ENTRY itITFileCopyEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1506,7 +1506,7 @@ static MUI_ENTRY itITBootLoaderEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1565,7 +1565,7 @@ static MUI_ENTRY itITKeyboardSettingsEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1624,7 +1624,7 @@ static MUI_ENTRY itITLayoutSettingsEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1684,7 +1684,7 @@ static MUI_ENTRY itITPrepareCopyEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1716,7 +1716,7 @@ static MUI_ENTRY itITSelectFSEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1764,7 +1764,7 @@ static MUI_ENTRY itITDeletePartitionEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1816,7 +1816,7 @@ static MUI_ENTRY itITRegistryEntries[] = { 4, 3, - " Installazione di Windivs 2k3 Service Pack 1 ", + " Installazione di Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index da23497bd71..7c4cb5a1249 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -8,7 +8,7 @@ static MUI_ENTRY jaJPSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY jaJPLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY jaJPWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -185,7 +185,7 @@ static MUI_ENTRY jaJPIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -272,7 +272,7 @@ static MUI_ENTRY jaJPLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -415,7 +415,7 @@ static MUI_ENTRY jaJPDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -522,7 +522,7 @@ static MUI_ENTRY jaJPRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -595,7 +595,7 @@ static MUI_ENTRY jaJPUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -675,7 +675,7 @@ static MUI_ENTRY jaJPComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -734,7 +734,7 @@ static MUI_ENTRY jaJPFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -779,7 +779,7 @@ static MUI_ENTRY jaJPQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -831,7 +831,7 @@ static MUI_ENTRY jaJPDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -890,7 +890,7 @@ static MUI_ENTRY jaJPSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -942,7 +942,7 @@ static MUI_ENTRY jaJPBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -995,7 +995,7 @@ static MUI_ENTRY jaJPSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1076,7 +1076,7 @@ static MUI_ENTRY jaJPChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1198,7 +1198,7 @@ static MUI_ENTRY jaJPConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1306,7 +1306,7 @@ static MUI_ENTRY jaJPFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1344,7 +1344,7 @@ static MUI_ENTRY jaJPCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1375,7 +1375,7 @@ static MUI_ENTRY jaJPInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1434,7 +1434,7 @@ static MUI_ENTRY jaJPFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1479,7 +1479,7 @@ static MUI_ENTRY jaJPBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1538,7 +1538,7 @@ static MUI_ENTRY jaJPBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1562,7 +1562,7 @@ static MUI_ENTRY jaJPKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1621,7 +1621,7 @@ static MUI_ENTRY jaJPLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1681,7 +1681,7 @@ static MUI_ENTRY jaJPPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1713,7 +1713,7 @@ static MUI_ENTRY jaJPSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1761,7 +1761,7 @@ static MUI_ENTRY jaJPDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1813,7 +1813,7 @@ static MUI_ENTRY jaJPRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 \276\257\304\261\257\314\337 ", + " Windivs 2k3 Service Pack 2 \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 3336b2436a2..d2657172356 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -17,7 +17,7 @@ static MUI_ENTRY ltLTSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -55,7 +55,7 @@ static MUI_ENTRY ltLTLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -107,7 +107,7 @@ static MUI_ENTRY ltLTWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -194,7 +194,7 @@ static MUI_ENTRY ltLTIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -281,7 +281,7 @@ static MUI_ENTRY ltLTLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -424,7 +424,7 @@ static MUI_ENTRY ltLTDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -531,7 +531,7 @@ static MUI_ENTRY ltLTRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -604,7 +604,7 @@ static MUI_ENTRY ltLTUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -684,7 +684,7 @@ static MUI_ENTRY ltLTComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -743,7 +743,7 @@ static MUI_ENTRY ltLTFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -788,7 +788,7 @@ static MUI_ENTRY ltLTQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -840,7 +840,7 @@ static MUI_ENTRY ltLTDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -899,7 +899,7 @@ static MUI_ENTRY ltLTSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -951,7 +951,7 @@ static MUI_ENTRY ltLTBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1004,7 +1004,7 @@ static MUI_ENTRY ltLTSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1084,7 +1084,7 @@ static MUI_ENTRY ltLTChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1206,7 +1206,7 @@ static MUI_ENTRY ltLTConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1314,7 +1314,7 @@ static MUI_ENTRY ltLTFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1352,7 +1352,7 @@ static MUI_ENTRY ltLTCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1383,7 +1383,7 @@ static MUI_ENTRY ltLTInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1442,7 +1442,7 @@ static MUI_ENTRY ltLTFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1487,7 +1487,7 @@ static MUI_ENTRY ltLTBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1546,7 +1546,7 @@ static MUI_ENTRY ltLTBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1570,7 +1570,7 @@ static MUI_ENTRY ltLTKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1629,7 +1629,7 @@ static MUI_ENTRY ltLTLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1689,7 +1689,7 @@ static MUI_ENTRY ltLTPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1721,7 +1721,7 @@ static MUI_ENTRY ltLTSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1769,7 +1769,7 @@ static MUI_ENTRY ltLTDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1821,7 +1821,7 @@ static MUI_ENTRY ltLTRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 diegimo programa ", + " Windivs 2k3 Service Pack 2 diegimo programa ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 94babf77d3c..fe0bd4bd99e 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -5,7 +5,7 @@ static MUI_ENTRY msMYSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -43,7 +43,7 @@ static MUI_ENTRY msMYLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -95,7 +95,7 @@ static MUI_ENTRY msMYWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -182,7 +182,7 @@ static MUI_ENTRY msMYIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -269,7 +269,7 @@ static MUI_ENTRY msMYLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -412,7 +412,7 @@ static MUI_ENTRY msMYDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -519,7 +519,7 @@ static MUI_ENTRY msMYRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -592,7 +592,7 @@ static MUI_ENTRY msMYUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -672,7 +672,7 @@ static MUI_ENTRY msMYComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -731,7 +731,7 @@ static MUI_ENTRY msMYFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -776,7 +776,7 @@ static MUI_ENTRY msMYQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -828,7 +828,7 @@ static MUI_ENTRY msMYDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -887,7 +887,7 @@ static MUI_ENTRY msMYSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -939,7 +939,7 @@ static MUI_ENTRY msMYBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -992,7 +992,7 @@ static MUI_ENTRY msMYSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1065,7 +1065,7 @@ static MUI_ENTRY msMYChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1187,7 +1187,7 @@ static MUI_ENTRY msMYConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1295,7 +1295,7 @@ static MUI_ENTRY msMYFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1333,7 +1333,7 @@ static MUI_ENTRY msMYCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1364,7 +1364,7 @@ static MUI_ENTRY msMYInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1423,7 +1423,7 @@ static MUI_ENTRY msMYFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1468,7 +1468,7 @@ static MUI_ENTRY msMYBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1527,7 +1527,7 @@ static MUI_ENTRY msMYBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1551,7 +1551,7 @@ static MUI_ENTRY msMYKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1610,7 +1610,7 @@ static MUI_ENTRY msMYLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1670,7 +1670,7 @@ static MUI_ENTRY msMYPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1702,7 +1702,7 @@ static MUI_ENTRY msMYSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1750,7 +1750,7 @@ static MUI_ENTRY msMYDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1802,7 +1802,7 @@ static MUI_ENTRY msMYRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Persediaan ", + " Windivs 2k3 Service Pack 2 Persediaan ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index bb62ef48a59..fd5e39fd207 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -13,7 +13,7 @@ static MUI_ENTRY nlNLSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -51,7 +51,7 @@ static MUI_ENTRY nlNLLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -103,7 +103,7 @@ static MUI_ENTRY nlNLWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -197,7 +197,7 @@ static MUI_ENTRY nlNLIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -284,7 +284,7 @@ static MUI_ENTRY nlNLLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -427,7 +427,7 @@ static MUI_ENTRY nlNLDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -527,7 +527,7 @@ static MUI_ENTRY nlNLRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -607,7 +607,7 @@ static MUI_ENTRY nlNLUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -687,7 +687,7 @@ static MUI_ENTRY nlNLComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -746,7 +746,7 @@ static MUI_ENTRY nlNLFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -791,7 +791,7 @@ static MUI_ENTRY nlNLQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -843,7 +843,7 @@ static MUI_ENTRY nlNLDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -902,7 +902,7 @@ static MUI_ENTRY nlNLSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -954,7 +954,7 @@ static MUI_ENTRY nlNLBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1007,7 +1007,7 @@ static MUI_ENTRY nlNLSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1088,7 +1088,7 @@ static MUI_ENTRY nlNLChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1210,7 +1210,7 @@ static MUI_ENTRY nlNLConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1318,7 +1318,7 @@ static MUI_ENTRY nlNLFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1356,7 +1356,7 @@ static MUI_ENTRY nlNLCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1387,7 +1387,7 @@ static MUI_ENTRY nlNLInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1446,7 +1446,7 @@ static MUI_ENTRY nlNLFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1491,7 +1491,7 @@ static MUI_ENTRY nlNLBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1550,7 +1550,7 @@ static MUI_ENTRY nlNLBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1574,7 +1574,7 @@ static MUI_ENTRY nlNLkeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1633,7 +1633,7 @@ static MUI_ENTRY nlNLLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1693,7 +1693,7 @@ static MUI_ENTRY nlNLPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1725,7 +1725,7 @@ static MUI_ENTRY nlNLSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1773,7 +1773,7 @@ static MUI_ENTRY nlNLDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1825,7 +1825,7 @@ static MUI_ENTRY nlNLRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 5be7ebbf227..08a1889d317 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -18,7 +18,7 @@ static MUI_ENTRY plPLSetupInitPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -56,7 +56,7 @@ static MUI_ENTRY plPLLanguagePageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -108,7 +108,7 @@ static MUI_ENTRY plPLWelcomePageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -195,7 +195,7 @@ static MUI_ENTRY plPLIntroPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -282,7 +282,7 @@ static MUI_ENTRY plPLLicensePageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -425,7 +425,7 @@ static MUI_ENTRY plPLDevicePageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -532,7 +532,7 @@ static MUI_ENTRY plPLRepairPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -605,7 +605,7 @@ static MUI_ENTRY plPLUpgradePageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -685,7 +685,7 @@ static MUI_ENTRY plPLComputerPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -744,7 +744,7 @@ static MUI_ENTRY plPLFlushPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -789,7 +789,7 @@ static MUI_ENTRY plPLQuitPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -841,7 +841,7 @@ static MUI_ENTRY plPLDisplayPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -900,7 +900,7 @@ static MUI_ENTRY plPLSuccessPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -952,7 +952,7 @@ static MUI_ENTRY plPLBootPageEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1005,7 +1005,7 @@ static MUI_ENTRY plPLSelectPartitionEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1085,7 +1085,7 @@ static MUI_ENTRY plPLChangeSystemPartition[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1207,7 +1207,7 @@ static MUI_ENTRY plPLConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1315,7 +1315,7 @@ static MUI_ENTRY plPLFormatPartitionEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1353,7 +1353,7 @@ static MUI_ENTRY plPLCheckFSEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1384,7 +1384,7 @@ static MUI_ENTRY plPLInstallDirectoryEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1443,7 +1443,7 @@ static MUI_ENTRY plPLFileCopyEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1488,7 +1488,7 @@ static MUI_ENTRY plPLBootLoaderEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1547,7 +1547,7 @@ static MUI_ENTRY plPLBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1571,7 +1571,7 @@ static MUI_ENTRY plPLKeyboardSettingsEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1630,7 +1630,7 @@ static MUI_ENTRY plPLLayoutSettingsEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1690,7 +1690,7 @@ static MUI_ENTRY plPLPrepareCopyEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1722,7 +1722,7 @@ static MUI_ENTRY plPLSelectFSEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1770,7 +1770,7 @@ static MUI_ENTRY plPLDeletePartitionEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1822,7 +1822,7 @@ static MUI_ENTRY plPLRegistryEntries[] = { 4, 3, - " Instalator Windivs 2k3 Service Pack 1 ", + " Instalator Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 92d550b0317..9cacca96af8 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -8,7 +8,7 @@ static MUI_ENTRY ptBRSetupInitPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY ptBRLanguagePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY ptBRWelcomePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -185,7 +185,7 @@ static MUI_ENTRY ptBRIntroPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -272,7 +272,7 @@ static MUI_ENTRY ptBRLicensePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -415,7 +415,7 @@ static MUI_ENTRY ptBRDevicePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -515,7 +515,7 @@ static MUI_ENTRY ptBRRepairPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -588,7 +588,7 @@ static MUI_ENTRY ptBRUpgradePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -668,7 +668,7 @@ static MUI_ENTRY ptBRComputerPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -734,7 +734,7 @@ static MUI_ENTRY ptBRFlushPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -786,7 +786,7 @@ static MUI_ENTRY ptBRQuitPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -838,7 +838,7 @@ static MUI_ENTRY ptBRDisplayPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -897,7 +897,7 @@ static MUI_ENTRY ptBRSuccessPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -949,7 +949,7 @@ static MUI_ENTRY ptBRBootPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1002,7 +1002,7 @@ static MUI_ENTRY ptBRSelectPartitionEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1090,7 +1090,7 @@ static MUI_ENTRY ptBRChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1212,7 +1212,7 @@ static MUI_ENTRY ptBRConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1320,7 +1320,7 @@ static MUI_ENTRY ptBRFormatPartitionEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1358,7 +1358,7 @@ static MUI_ENTRY ptBRCheckFSEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1389,7 +1389,7 @@ static MUI_ENTRY ptBRInstallDirectoryEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1448,7 +1448,7 @@ static MUI_ENTRY ptBRFileCopyEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1493,7 +1493,7 @@ static MUI_ENTRY ptBRBootLoaderEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1552,7 +1552,7 @@ static MUI_ENTRY ptBRBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1576,7 +1576,7 @@ static MUI_ENTRY ptBRKeyboardSettingsEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1635,7 +1635,7 @@ static MUI_ENTRY ptBRLayoutSettingsEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1702,7 +1702,7 @@ static MUI_ENTRY ptBRPrepareCopyEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1741,7 +1741,7 @@ static MUI_ENTRY ptBRSelectFSEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1789,7 +1789,7 @@ static MUI_ENTRY ptBRDeletePartitionEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1848,7 +1848,7 @@ static MUI_ENTRY ptBRRegistryEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index e3d03be0a09..7879269172d 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -8,7 +8,7 @@ static MUI_ENTRY ptPTSetupInitPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -46,7 +46,7 @@ static MUI_ENTRY ptPTLanguagePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -98,7 +98,7 @@ static MUI_ENTRY ptPTWelcomePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -185,7 +185,7 @@ static MUI_ENTRY ptPTIntroPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -272,7 +272,7 @@ static MUI_ENTRY ptPTLicensePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -415,7 +415,7 @@ static MUI_ENTRY ptPTDevicePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -515,7 +515,7 @@ static MUI_ENTRY ptPTRepairPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -588,7 +588,7 @@ static MUI_ENTRY ptPTUpgradePageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -668,7 +668,7 @@ static MUI_ENTRY ptPTComputerPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -734,7 +734,7 @@ static MUI_ENTRY ptPTFlushPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -786,7 +786,7 @@ static MUI_ENTRY ptPTQuitPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -838,7 +838,7 @@ static MUI_ENTRY ptPTDisplayPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -897,7 +897,7 @@ static MUI_ENTRY ptPTSuccessPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -949,7 +949,7 @@ static MUI_ENTRY ptPTBootPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1002,7 +1002,7 @@ static MUI_ENTRY ptPTSelectPartitionEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1090,7 +1090,7 @@ static MUI_ENTRY ptPTChangeSystemPartition[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1212,7 +1212,7 @@ static MUI_ENTRY ptPTConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1320,7 +1320,7 @@ static MUI_ENTRY ptPTFormatPartitionEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1358,7 +1358,7 @@ static MUI_ENTRY ptPTCheckFSEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1389,7 +1389,7 @@ static MUI_ENTRY ptPTInstallDirectoryEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1448,7 +1448,7 @@ static MUI_ENTRY ptPTFileCopyEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1493,7 +1493,7 @@ static MUI_ENTRY ptPTBootLoaderEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1552,7 +1552,7 @@ static MUI_ENTRY ptPTBootLoaderInstallPageEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1576,7 +1576,7 @@ static MUI_ENTRY ptPTKeyboardSettingsEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1635,7 +1635,7 @@ static MUI_ENTRY ptPTLayoutSettingsEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1702,7 +1702,7 @@ static MUI_ENTRY ptPTPrepareCopyEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1741,7 +1741,7 @@ static MUI_ENTRY ptPTSelectFSEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1789,7 +1789,7 @@ static MUI_ENTRY ptPTDeletePartitionEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1848,7 +1848,7 @@ static MUI_ENTRY ptPTRegistryEntries[] = { 4, 3, - " Instala\207\306o do Windivs 2k3 Service Pack 1 ", + " Instala\207\306o do Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index c95d144b880..361c78f574f 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -107,7 +107,7 @@ static MUI_ENTRY roROWelcomePageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -222,7 +222,7 @@ static MUI_ENTRY roROIntroPageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -302,7 +302,7 @@ static MUI_ENTRY roROLicensePageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -466,7 +466,7 @@ static MUI_ENTRY roRODevicePageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -581,7 +581,7 @@ static MUI_ENTRY roRORepairPageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -734,7 +734,7 @@ static MUI_ENTRY roROComputerPageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -793,7 +793,7 @@ static MUI_ENTRY roROFlushPageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -838,7 +838,7 @@ static MUI_ENTRY roROQuitPageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -890,7 +890,7 @@ static MUI_ENTRY roRODisplayPageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -949,7 +949,7 @@ static MUI_ENTRY roROSuccessPageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1001,7 +1001,7 @@ static MUI_ENTRY roROBootPageEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1054,7 +1054,7 @@ static MUI_ENTRY roROSelectPartitionEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1134,7 +1134,7 @@ static MUI_ENTRY roROChangeSystemPartition[] = { 4, 3, - " Instalare 2k3 Service Pack 1 Windivs ", + " Instalare 2k3 Service Pack 2 Windivs ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1364,7 +1364,7 @@ static MUI_ENTRY roROFormatPartitionEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1395,7 +1395,7 @@ static MUI_ENTRY roROCheckFSEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1426,7 +1426,7 @@ static MUI_ENTRY roROInstallDirectoryEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1485,7 +1485,7 @@ static MUI_ENTRY roROFileCopyEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1523,7 +1523,7 @@ static MUI_ENTRY roROBootLoaderEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1582,7 +1582,7 @@ static MUI_ENTRY roROBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1606,7 +1606,7 @@ static MUI_ENTRY roROKeyboardSettingsEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC, }, @@ -1665,7 +1665,7 @@ static MUI_ENTRY roROLayoutSettingsEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1725,7 +1725,7 @@ static MUI_ENTRY roROPrepareCopyEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1757,7 +1757,7 @@ static MUI_ENTRY roROSelectFSEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1811,7 +1811,7 @@ static MUI_ENTRY roRODeletePartitionEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1863,7 +1863,7 @@ static MUI_ENTRY roRORegistryEntries[] = { 4, 3, - " Instalare Windivs 2k3 Service Pack 1 ", + " Instalare Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 48fc90b0279..2b86dcbc863 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1096,7 +1096,7 @@ static MUI_ENTRY ruRUChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index c5a60154bf0..4ad0dcacbb8 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -14,7 +14,7 @@ static MUI_ENTRY skSKSetupInitPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -52,7 +52,7 @@ static MUI_ENTRY skSKLanguagePageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -104,7 +104,7 @@ static MUI_ENTRY skSKWelcomePageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -191,7 +191,7 @@ static MUI_ENTRY skSKIntroPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -278,7 +278,7 @@ static MUI_ENTRY skSKLicensePageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -421,7 +421,7 @@ static MUI_ENTRY skSKDevicePageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -528,7 +528,7 @@ static MUI_ENTRY skSKRepairPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -601,7 +601,7 @@ static MUI_ENTRY skSKUpgradePageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -681,7 +681,7 @@ static MUI_ENTRY skSKComputerPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -740,7 +740,7 @@ static MUI_ENTRY skSKFlushPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -785,7 +785,7 @@ static MUI_ENTRY skSKQuitPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -837,7 +837,7 @@ static MUI_ENTRY skSKDisplayPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -896,7 +896,7 @@ static MUI_ENTRY skSKSuccessPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -948,7 +948,7 @@ static MUI_ENTRY skSKBootPageEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1001,7 +1001,7 @@ static MUI_ENTRY skSKSelectPartitionEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1082,7 +1082,7 @@ static MUI_ENTRY skSKChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1204,7 +1204,7 @@ static MUI_ENTRY skSKConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1312,7 +1312,7 @@ static MUI_ENTRY skSKFormatPartitionEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1350,7 +1350,7 @@ static MUI_ENTRY skSKCheckFSEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1381,7 +1381,7 @@ static MUI_ENTRY skSKInstallDirectoryEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1440,7 +1440,7 @@ static MUI_ENTRY skSKFileCopyEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1485,7 +1485,7 @@ static MUI_ENTRY skSKBootLoaderEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1544,7 +1544,7 @@ static MUI_ENTRY skSKBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1568,7 +1568,7 @@ static MUI_ENTRY skSKKeyboardSettingsEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1627,7 +1627,7 @@ static MUI_ENTRY skSKLayoutSettingsEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1687,7 +1687,7 @@ static MUI_ENTRY skSKPrepareCopyEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1719,7 +1719,7 @@ static MUI_ENTRY skSKSelectFSEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1767,7 +1767,7 @@ static MUI_ENTRY skSKDeletePartitionEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1819,7 +1819,7 @@ static MUI_ENTRY skSKRegistryEntries[] = { 4, 3, - " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 1 ", + " In\347tal\240tor syst\202mu Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 28b59bd0698..726b951dc40 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -12,7 +12,7 @@ static MUI_ENTRY sqALSetupInitPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -50,7 +50,7 @@ static MUI_ENTRY sqALLanguagePageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -102,7 +102,7 @@ static MUI_ENTRY sqALWelcomePageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -189,7 +189,7 @@ static MUI_ENTRY sqALIntroPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -276,7 +276,7 @@ static MUI_ENTRY sqALLicensePageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -419,7 +419,7 @@ static MUI_ENTRY sqALDevicePageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -526,7 +526,7 @@ static MUI_ENTRY sqALRepairPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -599,7 +599,7 @@ static MUI_ENTRY sqALUpgradePageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -679,7 +679,7 @@ static MUI_ENTRY sqALComputerPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -738,7 +738,7 @@ static MUI_ENTRY sqALFlushPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -783,7 +783,7 @@ static MUI_ENTRY sqALQuitPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -835,7 +835,7 @@ static MUI_ENTRY sqALDisplayPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -894,7 +894,7 @@ static MUI_ENTRY sqALSuccessPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -946,7 +946,7 @@ static MUI_ENTRY sqALBootPageEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -999,7 +999,7 @@ static MUI_ENTRY sqALSelectPartitionEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1080,7 +1080,7 @@ static MUI_ENTRY sqALChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1202,7 +1202,7 @@ static MUI_ENTRY sqALConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1310,7 +1310,7 @@ static MUI_ENTRY sqALFormatPartitionEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1348,7 +1348,7 @@ static MUI_ENTRY sqALCheckFSEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1379,7 +1379,7 @@ static MUI_ENTRY sqALInstallDirectoryEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1438,7 +1438,7 @@ static MUI_ENTRY sqALFileCopyEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1483,7 +1483,7 @@ static MUI_ENTRY sqALBootLoaderEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1542,7 +1542,7 @@ static MUI_ENTRY sqALBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1566,7 +1566,7 @@ static MUI_ENTRY sqALKeyboardSettingsEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1625,7 +1625,7 @@ static MUI_ENTRY sqALLayoutSettingsEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1685,7 +1685,7 @@ static MUI_ENTRY sqALPrepareCopyEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1717,7 +1717,7 @@ static MUI_ENTRY sqALSelectFSEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1765,7 +1765,7 @@ static MUI_ENTRY sqALDeletePartitionEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1817,7 +1817,7 @@ static MUI_ENTRY sqALRegistryEntries[] = { 4, 3, - " Instalimi i Windivs 2k3 Service Pack 1 ", + " Instalimi i Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 9c47f77a613..909de767990 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -14,7 +14,7 @@ static MUI_ENTRY svSESetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -52,7 +52,7 @@ static MUI_ENTRY svSELanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -104,7 +104,7 @@ static MUI_ENTRY svSEWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -191,7 +191,7 @@ static MUI_ENTRY svSEIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -278,7 +278,7 @@ static MUI_ENTRY svSELicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -421,7 +421,7 @@ static MUI_ENTRY svSEDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -528,7 +528,7 @@ static MUI_ENTRY svSERepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -601,7 +601,7 @@ static MUI_ENTRY svSEUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -681,7 +681,7 @@ static MUI_ENTRY svSEComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -740,7 +740,7 @@ static MUI_ENTRY svSEFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -785,7 +785,7 @@ static MUI_ENTRY svSEQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -837,7 +837,7 @@ static MUI_ENTRY svSEDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -896,7 +896,7 @@ static MUI_ENTRY svSESuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -948,7 +948,7 @@ static MUI_ENTRY svSEBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1001,7 +1001,7 @@ static MUI_ENTRY svSESelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1082,7 +1082,7 @@ static MUI_ENTRY svSEChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1204,7 +1204,7 @@ static MUI_ENTRY svSEConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1312,7 +1312,7 @@ static MUI_ENTRY svSEFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1350,7 +1350,7 @@ static MUI_ENTRY svSECheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1381,7 +1381,7 @@ static MUI_ENTRY svSEInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1440,7 +1440,7 @@ static MUI_ENTRY svSEFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1485,7 +1485,7 @@ static MUI_ENTRY svSEBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1544,7 +1544,7 @@ static MUI_ENTRY svSEBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1568,7 +1568,7 @@ static MUI_ENTRY svSEKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1627,7 +1627,7 @@ static MUI_ENTRY svSELayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1687,7 +1687,7 @@ static MUI_ENTRY svSEPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1719,7 +1719,7 @@ static MUI_ENTRY svSESelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1767,7 +1767,7 @@ static MUI_ENTRY svSEDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1819,7 +1819,7 @@ static MUI_ENTRY svSERegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 8f4b7004569..19e254e3a76 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -10,7 +10,7 @@ static MUI_ENTRY trTRSetupInitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -48,7 +48,7 @@ static MUI_ENTRY trTRLanguagePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -100,7 +100,7 @@ static MUI_ENTRY trTRWelcomePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -187,7 +187,7 @@ static MUI_ENTRY trTRIntroPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -274,7 +274,7 @@ static MUI_ENTRY trTRLicensePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -410,7 +410,7 @@ static MUI_ENTRY trTRDevicePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -518,7 +518,7 @@ static MUI_ENTRY trTRRepairPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -591,7 +591,7 @@ static MUI_ENTRY trTRUpgradePageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -671,7 +671,7 @@ static MUI_ENTRY trTRComputerPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -730,7 +730,7 @@ static MUI_ENTRY trTRFlushPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -775,7 +775,7 @@ static MUI_ENTRY trTRQuitPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -827,7 +827,7 @@ static MUI_ENTRY trTRDisplayPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -886,7 +886,7 @@ static MUI_ENTRY trTRSuccessPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -938,7 +938,7 @@ static MUI_ENTRY trTRBootPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -984,7 +984,7 @@ static MUI_ENTRY trTRSelectPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1064,7 +1064,7 @@ static MUI_ENTRY trTRChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1186,7 +1186,7 @@ static MUI_ENTRY trTRConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1287,7 +1287,7 @@ static MUI_ENTRY trTRFormatPartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1325,7 +1325,7 @@ static MUI_ENTRY trTRCheckFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1356,7 +1356,7 @@ static MUI_ENTRY trTRInstallDirectoryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1408,7 +1408,7 @@ static MUI_ENTRY trTRFileCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1453,7 +1453,7 @@ static MUI_ENTRY trTRBootLoaderEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1512,7 +1512,7 @@ static MUI_ENTRY trTRBootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1536,7 +1536,7 @@ static MUI_ENTRY trTRKeyboardSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1595,7 +1595,7 @@ static MUI_ENTRY trTRLayoutSettingsEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1655,7 +1655,7 @@ static MUI_ENTRY trTRPrepareCopyEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1687,7 +1687,7 @@ static MUI_ENTRY trTRSelectFSEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1735,7 +1735,7 @@ static MUI_ENTRY trTRDeletePartitionEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1787,7 +1787,7 @@ static MUI_ENTRY trTRRegistryEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Kur ", + " Windivs 2k3 Service Pack 2 Kur ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 67748e72cea..47341f1e49a 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -13,7 +13,7 @@ static MUI_ENTRY ukUASetupInitPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -51,7 +51,7 @@ static MUI_ENTRY ukUALanguagePageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -103,7 +103,7 @@ static MUI_ENTRY ukUAWelcomePageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -190,7 +190,7 @@ static MUI_ENTRY ukUAIntroPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -277,7 +277,7 @@ static MUI_ENTRY ukUALicensePageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -420,7 +420,7 @@ static MUI_ENTRY ukUADevicePageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -527,7 +527,7 @@ static MUI_ENTRY ukUARepairPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -600,7 +600,7 @@ static MUI_ENTRY ukUAUpgradePageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -680,7 +680,7 @@ static MUI_ENTRY ukUAComputerPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -739,7 +739,7 @@ static MUI_ENTRY ukUAFlushPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -784,7 +784,7 @@ static MUI_ENTRY ukUAQuitPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -836,7 +836,7 @@ static MUI_ENTRY ukUADisplayPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -895,7 +895,7 @@ static MUI_ENTRY ukUASuccessPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -947,7 +947,7 @@ static MUI_ENTRY ukUABootPageEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1000,7 +1000,7 @@ static MUI_ENTRY ukUASelectPartitionEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1081,7 +1081,7 @@ static MUI_ENTRY ukUAChangeSystemPartition[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1203,7 +1203,7 @@ static MUI_ENTRY ukUAConfirmDeleteSystemPartitionEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1311,7 +1311,7 @@ static MUI_ENTRY ukUAFormatPartitionEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1349,7 +1349,7 @@ static MUI_ENTRY ukUACheckFSEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1380,7 +1380,7 @@ static MUI_ENTRY ukUAInstallDirectoryEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1439,7 +1439,7 @@ static MUI_ENTRY ukUAFileCopyEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1484,7 +1484,7 @@ static MUI_ENTRY ukUABootLoaderEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1543,7 +1543,7 @@ static MUI_ENTRY ukUABootLoaderInstallPageEntries[] = { 4, 3, - " Windivs 2k3 Service Pack 1 Setup ", + " Windivs 2k3 Service Pack 2 Setup ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1567,7 +1567,7 @@ static MUI_ENTRY ukUAKeyboardSettingsEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1626,7 +1626,7 @@ static MUI_ENTRY ukUALayoutSettingsEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1686,7 +1686,7 @@ static MUI_ENTRY ukUAPrepareCopyEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1718,7 +1718,7 @@ static MUI_ENTRY ukUASelectFSEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1766,7 +1766,7 @@ static MUI_ENTRY ukUADeletePartitionEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, @@ -1818,7 +1818,7 @@ static MUI_ENTRY ukUARegistryEntries[] = { 4, 3, - " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 1 ", + " \202\341\342\240\255\256\242\253\245\255\255\357 Windivs 2k3 Service Pack 2 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, diff --git a/dll/win32/shell32/res/bitmaps/reactosserver.bmp b/dll/win32/shell32/res/bitmaps/reactosserver.bmp index 63db5adbb6905262000f6357b05dab13a1b7258f..0693b451869331db2e9f064cfea4f29cf198669b 100644 GIT binary patch literal 89334 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 literal 89334 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 J0+q5r^#AKSeyacg diff --git a/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp b/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp index 1e6000e2bd31c400c60a6173be03301718d4b926..6ef29d7ba0c3d734042624c2fcd7f3bd7003b6e6 100644 GIT binary patch literal 118998 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 YaN)v*M+AE&D+f!el;xP)(}p+gKa>J1F8}}l delta 100 zcmdlcvQ1=yQt$yz1_ot42xdS54GauG#L&me{AXZj_|MP)q#GLkHvst!Kz;*|-vHzvIB)nAj+_SxPd-8UV1NFR%ar delta 109 zcmeyig7Mo5#tF(nAq))4dJxQj0vZ??fQX@?0YU*uAQOli7!Djb0F?L-MhyS|gIGWe cgdm~+|2H<)N=%%8JHvst!Kz;*|f8f9Yp#1;; eKv^IJ0tg4h0P+4aly~$`Y&4rVfqmol@5}%>=Pkbg delta 105 zcmZ3-xsG#!QiKHy1B0?21T&z31_lNoVrXc9P(TvM1mXsU0|yQOCH{jE!~g#v77zm= VNC-rfcl1weG@CeqedG4;%m8@)9qRx9 From 49391ea3c3cd9d475c1f902af2c5f6150d462c1a Mon Sep 17 00:00:00 2001 From: jpb Date: Tue, 1 Aug 2023 20:46:54 +0100 Subject: [PATCH 03/74] Update .ico assets --- base/applications/osk/res/reactos.ico | Bin 2862 -> 1150 bytes win32ss/user/user32/resources/oic_reactos.ico | Bin 25214 -> 4286 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/base/applications/osk/res/reactos.ico b/base/applications/osk/res/reactos.ico index 24b3225f370a8318451d86799ad993ff962c5436..aa611c782b1af92854364e520890b844fafe3348 100644 GIT binary patch literal 1150 zcma)*O-NKx6vxk<&qPRrvIw#nBN1CY?)(s%(5u?pnVFuWH z41z^MAuGrhmpdG%)QrNUJMZ}Y3MPA=xbwj7l)dBEJ=-(}GMwav^8kA$XN4DV+v5U@ zjd&4yycX;8T9DX*fNy$jL)ft{KfTbFoh360IJ-hDs@h5C+K}xN-hh;P@60oRX|y}{ zOMZ`OFI8Dl=ab5o*d%tcg;o9*?b1ym=Us47@`c8xY}$KH&G4i%*uswoEG*`&E|`xu z77hKWITBv>6-VONb6O-XoZdl?%8PnCg7v5$2IA*Wj!bX)HWmh4oB&Lc$0l7y-z(2M zr_Atjs1`d*?LtWH`|X|aUwiv>2Jqh$t*t6TIis%FUdh+CkL6drxYJi2IyQQE{OH)( z=eGwN^i;I97H1>Onpas_haBc(con-}=-9H1fho}!<#P=s-F z*d6uA3{6WE>AICvGqff|e;xlm?lgZ!fPbcEzWUW+RDN+SRgK$|-NUZvA<5U(h3&+L zR6bp6Jl0zhJA?4rCTFFeE55Y)zY#r6OO|Vz`Gnp@oD`+{ZbPGSP|mOCm;+$C0ZK?< VU#licSJhAFei}(DA7D-g_zw*i+Iau~ literal 2862 zcmeH}dr(wm7>9rBBI2FpqG?)Ccq>$35imsrxos@CyIcej-6|St5p0DkFxIT4*Ag*YT2?48?fAq?3QV{SIp7j4_k_(KO@PdHDAI&i8%i?0Y!h z^8zZUVQ&w%cF67w_yCOU8QWl}3iyb9_s_c^+XmQc3k+4p5Er7%>*#3OU5%fP)#CD* zYMf~-Lt|YT>TB0x*R~D#V(q*5yrLLeYgS|1=GC}xq7HYiox+`~Cvl_o8(coM9<2w9 z@x%69tbgB%b!GFgFf#}%teI%uQ;FM`4&&b4EBNi#Hr#Ie9xaEKMti-Kf8gcj9X|y(%;KWx3SknSfT9}CK)hke(?uTuw3vu;AJ=%_zqh(_ARgJ*eok{qyAszdxQ&F1Zj!&1yp?2LeY$=b$hqL{7eJ#GO2*c58 zZyc!dLe0to%#ZiN()<`SZe4<=?ep>7mzIvw{Pf(@4E+By5au-0Im~E^{^OUpB3$=s zgg!EA$iyKArPn)XLa=tMHY5~beUy0gD`Up`j|&(d2uCG^rx6zJ*@4M$b5lY^t$!&9RP)VON-;8YG8sM?o$+|4}9k<$MAJh?pX z677B7-rk)^SK>hWlYYdB^ddb-H)2OR6C0w8S3PKz?@C`Eq8vsNPbQEt#FzLG58_6Y z^_@uH2j7+0CVfg&WO8hHS$wo^1LJb?F6|yTlBw!=s^+Y{A%{bLM zE4A4e89bN%5&B2yAEAGQ{t@~|l1={i=trT0WMS$!p@)QXmHSn4VV9E@{n|21>}7gQ z=ry6&gnktIPu@!M6*^9qy%8X~(14bdxUjS4#IWm}mq?Txc1ugtC(xThZwkFBD++>y z-V}OM=uM$Fh2E4%UC@=R$q{X_hR|u8r{uK@>6@Eju+qyyFH6xBt<*dPX8ln4z?iadW=zf_J>3=UG zJn#(Xd_pqGz?>xAzC~F8tWHf{UWSig!K#Wp;~@E^p0HEGgFERba$A)$~3+A zO>?sT7U%CMoMzZ;%};KcZBA;Klb2l2dP!I>J$n6v#lm_?3eEASW@nj>&77(`xi~9W zd46+A=jrLDB(}=`yW_MJV|Z0X(E-+Ha_RI&VSOg$B^gIjC+kyq-Yp|(qW<*^!^(o} u*b2tOiSqpait;|#66L+=NqRqMl~{RJ%6p`sjOn;g{M)zozd!MCfBGHU1bq4c diff --git a/win32ss/user/user32/resources/oic_reactos.ico b/win32ss/user/user32/resources/oic_reactos.ico index 8b44f79c629a3177129b75317818ab92e569fe57..463b6351298c04f1f9bbb0bfe8ae0d046d58189c 100644 GIT binary patch literal 4286 zcmbW5e{57$7RT@VF&zddB0rY6M5!$e5ZDDb@ejpBNc1mBb~l?4V*+ke{%|)2e?*}j z=FJo+3Y8z7DIii5OSEjV%c83mH@izM(p4k~skC%jiWRB_x|Xr?^ZmGI&$;it>2%r- z)kn_U`|f>nKj)nLz2{9~Ou~O9C5%4V(dmr+f-$xb4TsnYG#VEd&YhZOn?3OJKBLvs zrNnMUfrGeofeQ{ZDZWQl3Ow?Yr}}qHl5@YLM?ClaxZ7I;b*usH5XaVtC>6=@q^0h2 z@Ihfe-RBCmv*TX*>8Pr@&s^V8^o$jePeYvq$Q@-I$I*}0n>F6m^c`pz+lNJoDe`>X zGj1Li{OFVJ1(wa>luJ6= z`{i-(c8q@w+8;|TX0Ef2<_6? z{FLXnwEk_(Eal9chtDmGtAB^rrHc+<>~VoSh#XlFsrUPxclwBztSuU$fko-bvoOY+ z4qwOC%roxHS!JBTERa4o!g3Qa@vPl$4}^bo7Gk?6{f79s7o&1eYRWARgV^Kcg3m|( zOppfueazDUdxQpV7r)Q|`U$sod7mf#SQ;$T)vXiY1IEwqLjTr9)i+TCw@h0DxAQ@0 zz=+825+C-D)?k^XEO+>BuE)$lDKLvPuq3G*gBqoM3=LQikIZ-|$kqTdiH97F5AeNU!XcItb`Wd88}?aA z)y$yR5;G&i8o+!CJ(OAU#}nBDTLUb9>|@Vr4e2KyFP6k(^3{30;8TC6D+-PTT>4G=*BJsavkUaxfe?-4LRkZwGF44Xh z%0FNoFiJp%1-kqNp25azPp>}G#^5A!;WApcY{F&S4m3{IO?@2eVI10(bT{$oIyt>d zXrMe}zk3$Prur}!{iR$cAB;Rd$S13mD>x^?J;3yP47vWZ*#pmGj3#l3(apHkjgmma z{s^OSh{|U2^E1K|gQWx&eklK>#geSwU?5n~jzp zX8p&BUF5hx9>jcynrS6IrZQUtDuV-}zrL!)7YJqgv=E1?0Kk?C+cs|kAf8rbV#|rm zLpZ;2JHK*vmi`{bf_p&u9kJ)Rv1jwsC0T=Kiu>s&Dr@t`vp#5=oey09ZNUmzI>t${ zI`P_Enj;Ho0F~7MM;}eS)r%T*_8^~`e{V(cJbdBnUqyV}i|ig~nko94mRaX8OqVrg ztAV9e0lfBt{@zu_ySuRTO;iJIMe!=)qc2&0FsO_3plON4m;;y1$7I_%ur;vNI@QID z<_T&*Xs}Z@P7r@6rw&zAd@uImsi(H7nx=O~%N4}Y6|dKUSRdu`rqYXJH0I7~MWV$bvaAPx9Y14mZr`+6BqI~ov7QIn7* zYGPiC8iX&WTz?>!O?^$XYeFz+JU$VA(9yuFFX?~nWmYs-gO_9@(XOV>eB~W{8_&nf z|DD`-yu*`j!QA%|ze7!H`Fy|Mu89>D*A}53-P{+{0OergHsh;{o>Vi%dP&hcvBo|3 z>GYnt`Rmht)4cQ3&P?uKd)jyP+5CA;8_J%?V9+`@fgD)k9KH&%PZka}M%j?~o$anm zHD(Ys)+KWl`?8)>bLg3G^6qJDxDJ?m9X`cxpt<=VEl{7vgf37oT&uYC5PhGn9tl*8 zG5db8NA1rqi?2&xdlJe;B{}9iYCw!{+LU+@Ye6fX#gxmzHfJw5vaLZ)OYeH=#m+KX z{a?QZ+j`S3Efw7HoreV8%&+nJ2kpA#Ckx!9kwV%UnY?>Riun$(Z~ X1!0>M8(`C>#o1l4I9mV)y8{0Q!aZC$ literal 25214 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 From 1fc17735735bbf4db8d5e72839655e22f880c524 Mon Sep 17 00:00:00 2001 From: EpicnessGithub2 <140702195+EpicnessGithub2@users.noreply.github.com> Date: Fri, 4 Aug 2023 02:03:12 +0100 Subject: [PATCH 04/74] Update README.md --- README.md | 135 ------------------------------------------------------ 1 file changed, 135 deletions(-) diff --git a/README.md b/README.md index 67c367f8c63..8b137891791 100644 --- a/README.md +++ b/README.md @@ -1,136 +1 @@ -

- - ReactOS - -

---- - -

- - ReactOS 0.4.14 Release - - - Download ReactOS - - - SourceForge Download - - - License - - - Donate - - - Follow on Twitter - -

- -## Quick Links -[Website](https://reactos.org/) • -[Official chat](https://chat.reactos.org/) • -[Wiki](https://reactos.org/wiki/) • -[Forum](https://reactos.org/forum/) • -[Community Discord](https://discord.gg/7knjvhT) • -[JIRA Bug Tracker](https://jira.reactos.org/issues/) • -[ReactOS Git mirror](https://git.reactos.org/) • -[Testman](https://reactos.org/testman/) - -## What is ReactOS? - -ReactOS™ is an Open Source effort to develop a quality operating system that is compatible with applications and drivers written for the Microsoft® Windows™ NT family of operating systems (NT4, 2000, XP, 2003, Vista, 7). - -The ReactOS project, although currently focused on Windows Server 2003 compatibility, is always keeping an eye toward compatibility with Windows Vista and future Windows NT releases. - -The code of ReactOS is licensed under [GNU GPL 2.0](https://github.com/reactos/reactos/blob/master/COPYING). - -### Product quality warning - -**ReactOS is currently an Alpha quality operating system.** This means that ReactOS is under heavy development and you have to be ready to encounter some problems. Different things may not work well and it can corrupt the data present on your hard disk. It is HIGHLY recommended to test ReactOS on a virtual machine or on a computer with no sensitive or critical data! - -## Building - -![Build](https://github.com/reactos/reactos/workflows/Build/badge.svg) [![rosbewin.badge]][rosbewin.link] [![rosbeunix.badge]][rosbeunix.link] [![coverity.badge]][coverity.link] - -To build the system it is strongly advised to use the _ReactOS Build Environment (RosBE)._ -Up-to-date versions for Windows and for Unix/GNU-Linux are available from our download page at: ["Build Environment"](https://reactos.org/wiki/Build_Environment). - -Alternatively one can use Microsoft Visual C++ (MSVC) version 2015+. Building with MSVC is covered here: ["Visual Studio or Microsoft Visual C++"](https://reactos.org/wiki/CMake#Visual_Studio_or_Microsoft_Visual_C.2B.2B). - -See ["Building ReactOS"](https://reactos.org/wiki/Building_ReactOS) article for more details. - -### Binaries - -To build ReactOS you must run the `configure` script in the directory you want to have your build files. Choose `configure.cmd` or `configure.sh` depending on your system. Then run `ninja ` to build a module you want or just `ninja` to build all modules. - -### Bootable images - -To build a bootable CD image run `ninja bootcd` from the build directory. This will create a CD image with a filename `bootcd.iso`. - -You can always download fresh binary builds of bootable images from the ["Daily builds"](https://reactos.org/getbuilds/) page. - -## Installing - -By default, ReactOS currently can only be installed on a machine that has a FAT16 or FAT32 partition as the active (bootable) partition. -The partition on which ReactOS is to be installed (which may or may not be the bootable partition) must also be formatted as FAT16 or FAT32. -ReactOS Setup can format the partitions if needed. - -Starting with 0.4.10, ReactOS can be installed using the BtrFS file system. But consider this as an experimental feature and thus regressions not triggered on FAT setup may be observed. - -To install ReactOS from the bootable CD distribution, extract the archive contents. Then burn the CD image, boot from it, and follow the instructions. - -See ["Installing ReactOS"](https://reactos.org/wiki/Installing_ReactOS) Wiki page or [INSTALL](INSTALL) for more details. - -## Testing - -If you discover a bug in ReactOS search on JIRA first - it might be reported already. If not report the bug providing logs and as much information as possible. - -See ["File Bugs"](https://reactos.org/wiki/File_Bugs) for a guide. - -__NOTE:__ The bug tracker is _not_ for discussions. Please use our [official chat](https://chat.reactos.org/) or our [forum](https://reactos.org/forum/). - -## Contributing [![prwelcome.badge]](https://reactos.org/wiki/Commiting_Changes) - -We are always looking for developers! Check [how to contribute](CONTRIBUTING.md) if you are willing to participate. - -__Legal notice__: If you have seen proprietary Microsoft Windows source code (including but not limited to the leaked Windows NT 3.5, NT 4, 2000 source code and the Windows Research Kernel), your contribution won't be accepted because of potential copyright violation. - -Try out cloud-based ReactOS development using Gitpod and Docker: - -[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/reactos/reactos) - -You can also support ReactOS by [donating](https://reactos.org/donate/)! We rely on our backers to maintain our servers and accelerate development by [hiring full-time devs](https://reactos.org/contributing/#paid-jobs). - -## More information - -ReactOS is a Free and Open Source operating system based on the Windows architecture, -providing support for existing applications and drivers, and an alternative to the current dominant consumer operating system. - -It is not another wrapper built on Linux, like WINE. It does not attempt or plan to compete with WINE; in fact, the user-mode part of ReactOS is almost entirely WINE-based and our two teams have cooperated closely in the past. - -ReactOS is also not "yet another OS". It does not attempt to be a third player like any other alternative OS out there. People are not meant to uninstall Linux and use ReactOS instead; ReactOS is a replacement for Windows users who want a Windows replacement that behaves just like Windows. - -More information is available at: [reactos.org](https://reactos.org/). - -Also see the [media/doc](/media/doc/) subdirectory for some sparse notes. - -## Who is responsible - -Active devs are listed as members of [GitHub organization](https://github.com/orgs/reactos/people). -See also the [CREDITS](CREDITS) file for others. - -## Code mirrors - -The main development is done on [GitHub](https://github.com/reactos/reactos). We have an [alternative mirror](https://git.reactos.org/?p=reactos.git) in case GitHub is down. - -There is also an obsolete [SVN archive repository](https://svn.reactos.org/reactos/) that is kept for historical purposes. - -[coverity.badge]: https://scan.coverity.com/projects/205/badge.svg?flat=1 -[rosbewin.badge]: https://img.shields.io/badge/RosBE_Windows-2.2.0-0688CB.svg -[rosbeunix.badge]: https://img.shields.io/badge/RosBE_Unix-2.2-0688CB.svg -[prwelcome.badge]: https://img.shields.io/badge/PR-welcome-0688CB.svg - -[coverity.link]: https://scan.coverity.com/projects/205 -[rosbewin.link]: https://sourceforge.net/projects/reactos/files/RosBE-Windows/i386/2.2.0/ -[rosbeunix.link]: https://sourceforge.net/projects/reactos/files/RosBE-Unix/2.2/ From 79efcf6b2d29fecbf0e0503dff2496fe7b73bf2f Mon Sep 17 00:00:00 2001 From: EpicnessGithub2 <140702195+EpicnessGithub2@users.noreply.github.com> Date: Sat, 2 Sep 2023 16:55:18 +0100 Subject: [PATCH 05/74] Change README.md ReactOS branding to Windivs --- README.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/README.md b/README.md index 8b137891791..ce9476330c4 100644 --- a/README.md +++ b/README.md @@ -1 +1,66 @@ +What is Windivs? + +Windivs™ is an Open Source effort to develop a quality operating system that is compatible with applications and drivers written for the Microsoft® Windows™ NT family of operating systems (NT4, 2000, XP, 2003, Vista, 7). + +The Windivs project, although currently focused on Windows Server 2003 compatibility, is always keeping an eye toward compatibility with Windows Vista and future Windows NT releases. + +The code of Windivs is licensed under GNU GPL 2.0. + +Product quality warning +Windivs is currently an Alpha quality operating system. This means that Windivs is under heavy development, and you have to be ready to encounter some problems. Different things may not work well, and it can corrupt the data present on your hard disk. It is HIGHLY recommended to test Windivs on a virtual machine or on a computer with no sensitive or critical data! + +Building +Build rosbewin.badge rosbeunix.badge coverity.badge + +To build the system, it is strongly advised to use the Windivs Build Environment (WinBE). Up-to-date versions for Windows and for Unix/GNU-Linux are available from our download page at: "Build Environment". + +Alternatively, one can use Microsoft Visual C++ (MSVC) version 2015+. Building with MSVC is covered here: "Visual Studio or Microsoft Visual C++". + +See the "Building Windivs" article for more details. + +Binaries +To build Windivs, you must run the configure script in the directory you want to have your build files. Choose configure.cmd or configure.sh depending on your system. Then run ninja to build a module you want or just ninja to build all modules. + +Bootable images +To build a bootable CD image, run ninja bootcd from the build directory. This will create a CD image with a filename bootcd.iso. + +You can always download fresh binary builds of bootable images from the "Daily builds" page. + +Installing +By default, Windivs currently can only be installed on a machine that has a FAT16 or FAT32 partition as the active (bootable) partition. The partition on which Windivs is to be installed (which may or may not be the bootable partition) must also be formatted as FAT16 or FAT32. Windivs Setup can format the partitions if needed. + +Starting with 0.4.10, Windivs can be installed using the BtrFS file system. But consider this as an experimental feature, and thus regressions not triggered on FAT setup may be observed. + +To install Windivs from the bootable CD distribution, extract the archive contents. Then burn the CD image, boot from it, and follow the instructions. + +See the "Installing Windivs" Wiki page or INSTALL for more details. + +Testing +If you discover a bug in Windivs, search on JIRA first - it might be reported already. If not, report the bug providing logs and as much information as possible. + +See "File Bugs" for a guide. + +NOTE: The bug tracker is not for discussions. Please use our official chat or our forum. + +Contributing prwelcome.badge +We are always looking for developers! Check how to contribute if you are willing to participate. + +Legal notice: If you have seen proprietary Microsoft Windows source code (including but not limited to the leaked Windows NT 3.5, NT 4, 2000 source code and the Windows Research Kernel), your contribution won't be accepted because of potential copyright violation. + +Try out cloud-based Windivs development using Gitpod and Docker: + +Open in Gitpod + +You can also support Windivs by donating! We rely on our backers to maintain our servers and accelerate development by hiring full-time devs. + +More information +Windivs is a Free and Open Source operating system based on the Windows architecture, providing support for existing applications and drivers, and an alternative to the current dominant consumer operating system. + +It is not another wrapper built on Linux, like WINE. It does not attempt or plan to compete with WINE; in fact, the user-mode part of Windivs is almost entirely WINE-based, and our two teams have cooperated closely in the past. + +Windivs is also not "yet another OS." It does not attempt to be a third player like any other alternative OS out there. People are not meant to uninstall Linux and use Windivs instead; Windivs is a replacement for Windows users who want a Windows replacement that behaves just like Windows. + +More information is available at: windivs.org. + +Also see the media/doc subdirectory for some sparse notes. From 0bceb923a718cc08d9281cea602d00949cfccfdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 2 Sep 2023 17:25:47 +0200 Subject: [PATCH 06/74] [BOOTDATA] Fix Standard Time description for "Mountain Standard Time (Mexico)" CORE-11855 It was erroneously forgotten while making the timezone names translatable in commit f25d0ce42 (r74415). (cherry picked from commit 9da6fda9fe8a8d4b21453638a36c9f1db2e24f92) --- boot/bootdata/hivesft.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index 6d2e60961ee..36cb025fb4e 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -799,7 +799,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mountain Standard HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mountain Standard Time (Mexico)","Display",0x00000000,%GMT_MINUS_07_B_DESC% HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mountain Standard Time (Mexico)","Dlt",0x00000000,%GMT_MINUS_07_B_DAYLIGHT% -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mountain Standard Time (Mexico)","Std",0x00000000, +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mountain Standard Time (Mexico)","Std",0x00000000,%GMT_MINUS_07_B_STANDARD% HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mountain Standard Time (Mexico)","Index",0x00010001,13 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Mountain Standard Time (Mexico)","TZI",0x00000001,\ 0xa4,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ From 89c8df52dfe987659756d94d13cb253d9e956099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=89LUSCA=20-=20MA=C3=8FTO?= Date: Wed, 6 Sep 2023 14:15:33 +0200 Subject: [PATCH 07/74] [TIMEDATE] Fix the way the current time-zone is found in the list. (#5649) fies regression CORE-18666 'Wrong timezone saved/displayed' which was introduced by 0.4.14-dev-1522-g aa69236646f01a476377ec76ae7b762e061cd300 (cherry picked from commit 2a8c2b17a8aee8d32182b1e60b0c74b683fb1179) --- dll/cpl/timedate/timezone.c | 65 +++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/dll/cpl/timedate/timezone.c b/dll/cpl/timedate/timezone.c index 5b7911cc0b1..1424a69ba61 100644 --- a/dll/cpl/timedate/timezone.c +++ b/dll/cpl/timedate/timezone.c @@ -168,36 +168,51 @@ ShowTimeZoneList(HWND hwnd) { TIME_ZONE_INFORMATION TimeZoneInfo; PTIMEZONE_ENTRY Entry; - BOOL bDoAdvancedTest; - DWORD dwIndex; - DWORD i; + DWORD dwCount; + DWORD dwIndex = 0; + BOOL bFound = FALSE; - GetTimeZoneInformation(&TimeZoneInfo); - bDoAdvancedTest = (!*TimeZoneInfo.StandardName); + if (GetTimeZoneInformation(&TimeZoneInfo) == TIME_ZONE_ID_INVALID) + { + /* Failed to retrieve current time-zone info, reset it */ + ZeroMemory(&TimeZoneInfo, sizeof(TimeZoneInfo)); + } - dwIndex = 0; - i = 0; - Entry = TimeZoneListHead; - while (Entry != NULL) + for (Entry = TimeZoneListHead; Entry != NULL; Entry = Entry->Next) { - SendMessageW(hwnd, - CB_ADDSTRING, - 0, - (LPARAM)Entry->Description); - - if ( (!bDoAdvancedTest && *Entry->StandardName && - wcscmp(Entry->StandardName, TimeZoneInfo.StandardName) == 0) || - ( (Entry->TimezoneInfo.Bias == TimeZoneInfo.Bias) && - (Entry->TimezoneInfo.StandardBias == TimeZoneInfo.StandardBias) && - (Entry->TimezoneInfo.DaylightBias == TimeZoneInfo.DaylightBias) && - (memcmp(&Entry->TimezoneInfo.StandardDate, &TimeZoneInfo.StandardDate, sizeof(SYSTEMTIME)) == 0) && - (memcmp(&Entry->TimezoneInfo.DaylightDate, &TimeZoneInfo.DaylightDate, sizeof(SYSTEMTIME)) == 0) ) ) + dwCount = SendMessageW(hwnd, + CB_ADDSTRING, + 0, + (LPARAM)Entry->Description); + if (dwCount == CB_ERR || dwCount == CB_ERRSPACE) + continue; + + /* If the time-zone was found in the list, skip the tests */ + if (bFound) + continue; + + if (*TimeZoneInfo.StandardName && *Entry->StandardName) { - dwIndex = i; + /* Compare by name */ + if (wcscmp(Entry->StandardName, TimeZoneInfo.StandardName) == 0) + { + dwIndex = dwCount; + bFound = TRUE; + } + } + else + { + /* Compare by date and bias */ + if ((Entry->TimezoneInfo.Bias == TimeZoneInfo.Bias) && + (Entry->TimezoneInfo.StandardBias == TimeZoneInfo.StandardBias) && + (Entry->TimezoneInfo.DaylightBias == TimeZoneInfo.DaylightBias) && + (memcmp(&Entry->TimezoneInfo.StandardDate, &TimeZoneInfo.StandardDate, sizeof(SYSTEMTIME)) == 0) && + (memcmp(&Entry->TimezoneInfo.DaylightDate, &TimeZoneInfo.DaylightDate, sizeof(SYSTEMTIME)) == 0)) + { + dwIndex = dwCount; + bFound = TRUE; + } } - - i++; - Entry = Entry->Next; } SendMessageW(hwnd, From af70c8272b72210c05bcc1a552b7c4d608382863 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Wed, 6 Sep 2023 19:26:23 +0900 Subject: [PATCH 08/74] [NOTEPAD] Do type cast to kill C4244 warnings (#5655) - Do type cast to int from SendMessage return value. - Fix usage of EM_GETSEL and EM_LINEINDEX messages. CORE-18837 (cherry picked from commit c42c27fb892613a152461fd31fc4a73056139a99) --- base/applications/notepad/dialog.c | 11 +++++++++-- base/applications/notepad/main.c | 5 +++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 2867ea11ff5..f7d1be1d711 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -865,6 +865,10 @@ VOID DIALOG_GoTo(VOID) else ich = (INT)SendMessage(Globals.hEdit, EM_LINEINDEX, GotoData.iLine, 0); + /* EM_LINEINDEX can return -1 on failure */ + if (ich < 0) + ich = 0; + /* Move the caret */ SendMessage(Globals.hEdit, EM_SETSEL, ich, ich); SendMessage(Globals.hEdit, EM_SCROLLCARET, 0, 0); @@ -872,13 +876,16 @@ VOID DIALOG_GoTo(VOID) VOID DIALOG_StatusBarUpdateCaretPos(VOID) { - int line, col; + int line, ich, col; TCHAR buff[MAX_PATH]; DWORD dwStart, dwSize; SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwSize); line = SendMessage(Globals.hEdit, EM_LINEFROMCHAR, (WPARAM)dwStart, 0); - col = dwStart - SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0); + ich = (int)SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0); + + /* EM_LINEINDEX can return -1 on failure */ + col = ((ich < 0) ? 0 : (dwStart - ich)); _stprintf(buff, Globals.szStatusBarLineCol, line + 1, col + 1); SendMessage(Globals.hStatusBar, SB_SETTEXT, SBPART_CURPOS, (LPARAM)buff); diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index c232bfbf3e7..d73fbbfe2be 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -270,6 +270,7 @@ static VOID NOTEPAD_InitData(HINSTANCE hInstance) */ static VOID NOTEPAD_InitMenuPopup(HMENU menu, LPARAM index) { + DWORD dwStart, dwEnd; int enable; UNREFERENCED_PARAMETER(index); @@ -280,8 +281,8 @@ static VOID NOTEPAD_InitMenuPopup(HMENU menu, LPARAM index) SendMessage(Globals.hEdit, EM_CANUNDO, 0, 0) ? MF_ENABLED : MF_GRAYED); EnableMenuItem(menu, CMD_PASTE, IsClipboardFormatAvailable(CF_TEXT) ? MF_ENABLED : MF_GRAYED); - enable = (int) SendMessage(Globals.hEdit, EM_GETSEL, 0, 0); - enable = (HIWORD(enable) == LOWORD(enable)) ? MF_GRAYED : MF_ENABLED; + SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd); + enable = ((dwStart == dwEnd) ? MF_GRAYED : MF_ENABLED); EnableMenuItem(menu, CMD_CUT, enable); EnableMenuItem(menu, CMD_COPY, enable); EnableMenuItem(menu, CMD_DELETE, enable); From a0c83526769a0860941502d07a4fd2b40f6d6f10 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Mon, 21 Aug 2023 21:46:20 +0300 Subject: [PATCH 09/74] [KMTEST:TcpIp] Use 10 second timeout value instead of INFINITE (#5586) * [KMTEST:TcpIp] Use 10 second timeout value instead of INFINITE On x64 the test sometimes fails to connect and then times out on the testbot, causing the system to be rebooted. Co-authored-by: Stanislav Motylkov (cherry picked from commit 269c674971b7c5022d3f1a0aa76a3c1c94fc6176) --- modules/rostests/kmtests/tcpip/TcpIp_user.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/rostests/kmtests/tcpip/TcpIp_user.c b/modules/rostests/kmtests/tcpip/TcpIp_user.c index 7acdf3e924f..ec4fc6c3e83 100644 --- a/modules/rostests/kmtests/tcpip/TcpIp_user.c +++ b/modules/rostests/kmtests/tcpip/TcpIp_user.c @@ -113,7 +113,8 @@ START_TEST(TcpIpConnect) Error = KmtSendToDriver(IOCTL_TEST_CONNECT); ok_eq_ulong(Error, ERROR_SUCCESS); - WaitForSingleObject(AcceptThread, INFINITE); + Error = WaitForSingleObject(AcceptThread, 10 * 1000); + ok(Error == WAIT_OBJECT_0, "AcceptThread timed out\n"); UnloadTcpIpTestDriver(); From 278a3fc434fb3b7dd35e21f0eacd64129f0d3cf3 Mon Sep 17 00:00:00 2001 From: jpb Date: Sun, 17 Sep 2023 10:02:38 +0100 Subject: [PATCH 10/74] Version update --- sdk/include/reactos/version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index d2be2ee7b04..738eb8ca663 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -9,7 +9,7 @@ endif() set(KERNEL_VERSION_MAJOR "5") set(KERNEL_VERSION_MINOR "2") set(KERNEL_VERSION_PATCH_LEVEL "3790") -set(KERNEL_VERSION_PATCH_NUMBER "75") +set(KERNEL_VERSION_PATCH_NUMBER "81") set(COPYRIGHT_YEAR "2023") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds From 37cc3d2f828d5bbf43a08bb57a59c0223fee783e Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Wed, 13 Sep 2023 22:41:00 +0900 Subject: [PATCH 11/74] [SHELL32] Check m_ListView on some methods (#5684) - comdlg32:filedlg could encounter an assertion error in CWindow::SendMessage. - Assert the existence of the listview control m_ListView in the CDefView::LV_... function. - Actually check the existence of m_ListView outside the CDefView::LV_... function. ROSTESTS-388 --- dll/win32/shell32/CDefView.cpp | 58 ++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 6 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index ebcfa767090..9f12fd09549 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -545,6 +545,9 @@ void CDefView::UpdateStatusbar() WCHAR szPartText[MAX_PATH] = {0}; UINT cSelectedItems; + if (!m_ListView) + return; + cSelectedItems = m_ListView.GetSelectedCount(); if (cSelectedItems) { @@ -884,6 +887,8 @@ PCUITEMID_CHILD CDefView::_PidlByItem(LVITEM& lvItem) */ int CDefView::LV_FindItemByPidl(PCUITEMID_CHILD pidl) { + ASSERT(m_ListView); + int cItems = m_ListView.GetItemCount(); for (int i = 0; i(arg); /* in a commdlg This works as a filemask*/ - if (pThis->IncludeObject(pidl) == S_OK) + if (pThis->IncludeObject(pidl) == S_OK && pThis->m_ListView) pThis->LV_AddItem(pidl); SHFree(pidl); @@ -1482,6 +1497,8 @@ UINT CDefView::GetSelections() TRACE("-- Items selected =%u\n", m_cidl); + ASSERT(m_ListView); + UINT i = 0; int lvIndex = -1; while ((lvIndex = m_ListView.GetNextItem(lvIndex, LVNI_SELECTED)) > -1) @@ -1734,11 +1751,12 @@ LRESULT CDefView::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled TRACE("%p width=%u height=%u\n", this, wWidth, wHeight); + // WM_SIZE can come before WM_CREATE + if (!m_ListView) + return 0; + /* Resize the ListView to fit our window */ - if (m_ListView) - { - ::MoveWindow(m_ListView, 0, 0, wWidth, wHeight, TRUE); - } + ::MoveWindow(m_ListView, 0, 0, wWidth, wHeight, TRUE); _DoFolderViewCB(SFVM_SIZE, 0, 0); @@ -2313,6 +2331,10 @@ static BOOL ILIsParentOrSpecialParent(PCIDLIST_ABSOLUTE pidl1, PCIDLIST_ABSOLUTE */ LRESULT CDefView::OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { + // The change notify can come before WM_CREATE. + if (!m_ListView) + return FALSE; + HANDLE hChange = (HANDLE)wParam; DWORD dwProcID = (DWORD)lParam; PIDLIST_ABSOLUTE *Pidls; @@ -2658,6 +2680,12 @@ HRESULT WINAPI CDefView::SelectItem(PCUITEMID_CHILD pidl, UINT uFlags) TRACE("(%p)->(pidl=%p, 0x%08x) stub\n", this, pidl, uFlags); + if (!m_ListView) + { + ERR("!m_ListView\n"); + return E_FAIL; + } + i = LV_FindItemByPidl(pidl); if (i == -1) return S_OK; @@ -2866,6 +2894,12 @@ HRESULT STDMETHODCALLTYPE CDefView::GetFocusedItem(int *piItem) HRESULT STDMETHODCALLTYPE CDefView::GetItemPosition(PCUITEMID_CHILD pidl, POINT *ppt) { + if (!m_ListView) + { + ERR("!m_ListView\n"); + return E_FAIL; + } + int lvIndex = LV_FindItemByPidl(pidl); if (lvIndex == -1 || ppt == NULL) return E_INVALIDARG; @@ -2879,7 +2913,10 @@ HRESULT STDMETHODCALLTYPE CDefView::GetSpacing(POINT *ppt) TRACE("(%p)->(%p)\n", this, ppt); if (!m_ListView) + { + ERR("!m_ListView\n"); return S_FALSE; + } if (ppt) { @@ -2942,6 +2979,8 @@ HRESULT STDMETHODCALLTYPE CDefView::SelectItem(int iItem, DWORD dwFlags) HRESULT STDMETHODCALLTYPE CDefView::SelectAndPositionItems(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, POINT *apt, DWORD dwFlags) { + ASSERT(m_ListView); + /* Reset the selection */ m_ListView.SetItemState(-1, 0, LVIS_SELECTED); @@ -3099,6 +3138,11 @@ HRESULT STDMETHODCALLTYPE CDefView::AutoArrange() HRESULT STDMETHODCALLTYPE CDefView::AddObject(PITEMID_CHILD pidl, UINT *item) { TRACE("(%p)->(%p %p)\n", this, pidl, item); + if (!m_ListView) + { + ERR("!m_ListView\n"); + return E_FAIL; + } *item = LV_AddItem(pidl); return (int)*item >= 0 ? S_OK : E_OUTOFMEMORY; } @@ -3111,11 +3155,13 @@ HRESULT STDMETHODCALLTYPE CDefView::GetObject(PITEMID_CHILD *pidl, UINT item) HRESULT STDMETHODCALLTYPE CDefView::RemoveObject(PITEMID_CHILD pidl, UINT *item) { - TRACE("(%p)->(%p %p)\n", this, pidl, item); if (!m_ListView) + { + ERR("!m_ListView\n"); return E_FAIL; + } if (pidl) { From 8f3b869f91bfb5ef2e9a93274a441f4e2827404a Mon Sep 17 00:00:00 2001 From: Doug Lyons Date: Mon, 11 Sep 2023 17:42:19 -0500 Subject: [PATCH 12/74] [NTUSER] On Programmatic Move, Followed by Resize, Clear Normal Rectangle --- win32ss/user/ntuser/nonclient.c | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/user/ntuser/nonclient.c b/win32ss/user/ntuser/nonclient.c index 69291c50adb..bcf19e62616 100644 --- a/win32ss/user/ntuser/nonclient.c +++ b/win32ss/user/ntuser/nonclient.c @@ -285,6 +285,7 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) } else /* SC_SIZE */ { + RECTL_vSetEmptyRect(&pwnd->InternalPos.NormalRect); if (!thickframe) return; if (hittest && (syscommand != SC_MOUSEMENU)) { From 5a1be45855fa0cf7099f5bbe4f794af552b162ca Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Tue, 12 Sep 2023 06:16:05 +0900 Subject: [PATCH 13/74] [NTUSER] Error of co_UserCreateWindowEx should display class name (#5682) The error messsage of co_UserCreateWindowEx was unfriendly to the debugger. Show the window class name by using "%wZ" in co_UserCreateWindowEx. --- win32ss/user/ntuser/window.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index e587c73a58d..81b26ad1859 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2189,7 +2189,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, pti = GetW32ThreadInfo(); if (pti == NULL || pti->rpdesk == NULL) { - ERR("Thread is not attached to a desktop! Cannot create window!\n"); + ERR("Thread is not attached to a desktop! Cannot create window (%wZ)\n", ClassName); return NULL; // There is nothing to cleanup. } WinSta = pti->rpdesk->rpwinstaParent; @@ -2224,7 +2224,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, } else if ((Cs->style & (WS_CHILD|WS_POPUP)) == WS_CHILD) { - ERR("Cannot create a child window without a parent!\n"); + ERR("Cannot create a child window (%wZ) without a parent\n", ClassName); EngSetLastError(ERROR_TLW_WITH_WSCHILD); goto cleanup; /* WS_CHILD needs a parent, but WS_POPUP doesn't */ } @@ -2244,12 +2244,12 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, if (hWndParent && !ParentWindow) { - ERR("Got invalid parent window handle\n"); + ERR("Got invalid parent window handle for %wZ\n", ClassName); goto cleanup; } else if (hWndOwner && !OwnerWindow) { - ERR("Got invalid owner window handle\n"); + ERR("Got invalid owner window handle for %wZ\n", ClassName); ParentWindow = NULL; goto cleanup; } @@ -2288,7 +2288,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, dwVer ); if(!Window) { - ERR("IntCreateWindow failed!\n"); + ERR("IntCreateWindow(%wZ) failed\n", ClassName); goto cleanup; } @@ -2414,7 +2414,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, Result = co_IntSendMessage(UserHMGetHandle(Window), WM_NCCREATE, 0, (LPARAM) Cs); if (!Result) { - ERR("co_UserCreateWindowEx(): NCCREATE message failed\n"); + ERR("co_UserCreateWindowEx(%wZ): NCCREATE message failed\n", ClassName); goto cleanup; } @@ -2474,7 +2474,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, Result = co_IntSendMessage(UserHMGetHandle(Window), WM_CREATE, 0, (LPARAM) Cs); if (Result == (LRESULT)-1) { - ERR("co_UserCreateWindowEx(): WM_CREATE message failed\n"); + ERR("co_UserCreateWindowEx(%wZ): WM_CREATE message failed\n", ClassName); goto cleanup; } @@ -2565,7 +2565,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, co_IntUserManualGuiCheck(TRUE); } - TRACE("co_UserCreateWindowEx(): Created window %p\n", hWnd); + TRACE("co_UserCreateWindowEx(%wZ): Created window %p\n", ClassName, hWnd); ret = Window; cleanup: From 1a06c74cc2f84d3b99ef22f8af468447caf1f08e Mon Sep 17 00:00:00 2001 From: jpb Date: Sun, 1 Oct 2023 09:09:54 +0100 Subject: [PATCH 14/74] Version update --- sdk/include/reactos/version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index 738eb8ca663..d004d34f347 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -9,7 +9,7 @@ endif() set(KERNEL_VERSION_MAJOR "5") set(KERNEL_VERSION_MINOR "2") set(KERNEL_VERSION_PATCH_LEVEL "3790") -set(KERNEL_VERSION_PATCH_NUMBER "81") +set(KERNEL_VERSION_PATCH_NUMBER "87") set(COPYRIGHT_YEAR "2023") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds From 670b0de58223431140a441798fe468d1022ccc33 Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Wed, 27 Sep 2023 21:23:31 +0100 Subject: [PATCH 15/74] [SHELL32] *.rc: AGAIN! Use 1996 as birth year in IDD_ABOUT for consistency We do use the birth year 1996 instead of 1998 within our msgina pictures already, and also within the [SDK] for autogenerated file-info. Since SHELL32 IDD_ABOUT is used by many applications it makes sense to harmonize with that. Was done already during 0.4.15-dev for SHELL32, but we have to do it again, since some recent translation PRs to match the en-US.rc again. (cherry picked from commit 058b746bbe0884e27f8c24d8f56cfb3270cc5f51) --- dll/win32/shell32/lang/et-EE.rc | 10 ++++++++-- dll/win32/shell32/lang/he-IL.rc | 10 ++++++++-- dll/win32/shell32/lang/hi-IN.rc | 10 ++++++++-- dll/win32/shell32/lang/ro-RO.rc | 10 ++++++++-- dll/win32/shell32/lang/tr-TR.rc | 10 ++++++++-- dll/win32/shell32/lang/zh-CN.rc | 10 ++++++++-- 6 files changed, 48 insertions(+), 12 deletions(-) diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 3ed81a01b79..fa567cd2734 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -141,8 +141,8 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 - LTEXT "Autoriõigus 1998-", IDC_STATIC, 35, 75, 53, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Autoriõigus 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX @@ -154,6 +154,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -907,6 +908,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Muud programmid:" IDS_SHELL_ABOUT_AUTHORS "&Autorid" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Tagasi" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Uus &kaust" @@ -990,6 +992,10 @@ BEGIN IDS_OBJECTS "%d objekti" IDS_OBJECTS_SELECTED "%d objekti valitud" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Minu arvuti" IDS_TITLE_MYNET "Minu võrgukohad" IDS_TITLE_BIN_1 "Prügikast (täis)" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index b494677dcc6..5e52e210309 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -136,8 +136,8 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 - LTEXT "זכויות יוצרים 1998-", IDC_STATIC, 35, 75, 53, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "זכויות יוצרים 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " צוות Windivs\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX @@ -149,6 +149,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "אישור", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -902,6 +903,7 @@ BEGIN IDS_OPEN_WITH_OTHER "תכניות אחרות:" IDS_SHELL_ABOUT_AUTHORS "&יוצרים" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &חזרה" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "תיקיה חדשה" @@ -985,6 +987,10 @@ BEGIN IDS_OBJECTS "%d פריטים" IDS_OBJECTS_SELECTED "%d פריטים נבחרו" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "המחשב שלי" IDS_TITLE_MYNET "מיקומי הרשת שלי" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 00fc65b7f0e..4445ac55808 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -134,8 +134,8 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 - LTEXT "कॉपीराइट 1998-", IDC_STATIC, 35, 75, 53, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "कॉपीराइट 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " रिऐक्ट ओएस टीम\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "ओके", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -895,6 +896,7 @@ BEGIN IDS_OPEN_WITH_OTHER "अन्य प्रोग्राम:" IDS_SHELL_ABOUT_AUTHORS "&ऑथर" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &पीछे" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "नया &फोल्डर" @@ -978,6 +980,10 @@ BEGIN IDS_OBJECTS "%d वस्तुओं" IDS_OBJECTS_SELECTED "%d वस्तुओं का चयन किया" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "मेरा कंप्यूटर" IDS_TITLE_MYNET "मेरे नेटवर्क स्थान" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 62c63f17ddd..5cb2069f977 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -137,8 +137,8 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 - LTEXT "Drept de autor 1998-", IDC_STATIC, 35, 75, 68, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Drept de autor 1996-", IDC_STATIC, 35, 75, 68, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 103, 75, 17, 10 LTEXT " Echipa Windivs\0", IDC_STATIC, 120, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX @@ -150,6 +150,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "Î&nchide", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -903,6 +904,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Alte programe:" IDS_SHELL_ABOUT_AUTHORS "&Autori" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< Înap&oi" FCIDM_SHVIEW_NEW "&Crează" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Dosar" @@ -986,6 +988,10 @@ BEGIN IDS_OBJECTS "%d Obiecte" IDS_OBJECTS_SELECTED "%d Obiecte selectate" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Calculatorul meu" IDS_TITLE_MYNET "Locații în rețea" IDS_TITLE_BIN_1 "Coșul de gunoi (plin)" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index f31989c172e..1fd891e6bc9 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -136,8 +136,8 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 - LTEXT "Telif Hakkı 1998-", IDC_STATIC, 35, 75, 53, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Telif Hakkı 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Takımı\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX @@ -149,6 +149,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "Tamam", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -902,6 +903,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Diğer Programlar:" IDS_SHELL_ABOUT_AUTHORS "&Yazarlar" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Geri" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Yeni &Dizin" @@ -985,6 +987,10 @@ BEGIN IDS_OBJECTS "%d Nesne" IDS_OBJECTS_SELECTED "%d Nesne Seçili" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Bilgisayarım" IDS_TITLE_MYNET "Ağ Bağlantılarım" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index a66d4395f99..fc9217f9fdf 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -144,8 +144,8 @@ FONT 9, "宋体" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 - LTEXT "版权所有 1998-", IDC_STATIC, 35, 75, 53, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "版权所有 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX @@ -157,6 +157,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "确定", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -910,6 +911,7 @@ BEGIN IDS_OPEN_WITH_OTHER "其他程序：" IDS_SHELL_ABOUT_AUTHORS "作者(&A)" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< 返回(&B)" FCIDM_SHVIEW_NEW "新建(&W)" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "文件夹(&F)" @@ -993,6 +995,10 @@ BEGIN IDS_OBJECTS "%d 个对象" IDS_OBJECTS_SELECTED "已选中 %d 个对象" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "我的电脑" IDS_TITLE_MYNET "网上邻居" IDS_TITLE_BIN_1 "回收站(满)" From 60fdc2ec1fdb76ec1fb68915c508764060d9700a Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Mon, 24 May 2021 07:56:17 +0100 Subject: [PATCH 16/74] [CMAKE] CMakeLists.txt: Check compiler minimal version And remove obsolete checks. (cherry picked from commit 110b7d3f93cd146a49be778aaa1bbaa04fb61812) --- CMakeLists.txt | 26 ++++++++++++++++++++------ sdk/cmake/gcc.cmake | 9 +++------ sdk/cmake/msvc.cmake | 32 ++++++++++++-------------------- sdk/tools/widl/CMakeLists.txt | 11 ----------- sdk/tools/wpp/CMakeLists.txt | 13 ------------- 5 files changed, 35 insertions(+), 56 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b25e158ae45..4741020af4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,22 @@ endif() project(REACTOS) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + if(CMAKE_C_COMPILER_VERSION VERSION_LESS "13.0.1") + message(FATAL_ERROR "Unsupported old ${CMAKE_C_COMPILER_ID} compiler: ${CMAKE_C_COMPILER_VERSION}") + endif() +elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU") + if(CMAKE_C_COMPILER_VERSION VERSION_LESS "8.4") + message(FATAL_ERROR "Unsupported old ${CMAKE_C_COMPILER_ID} compiler: ${CMAKE_C_COMPILER_VERSION}") + endif() +elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC") + if(CMAKE_C_COMPILER_VERSION VERSION_LESS "19.0") # v14 (2015) + message(FATAL_ERROR "Unsupported old ${CMAKE_C_COMPILER_ID} compiler: ${CMAKE_C_COMPILER_VERSION}") + endif() +else() + message(WARNING "Unknown ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} compiler, skipping compiler version check...") +endif() + set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) set(CMAKE_SHARED_LIBRARY_PREFIX "") @@ -76,9 +92,9 @@ add_definitions( # There doesn't seem to be a standard for __FILE__ being relative or absolute, so detect it at runtime. file(RELATIVE_PATH _PATH_PREFIX ${REACTOS_BINARY_DIR} ${REACTOS_SOURCE_DIR}) -if (NOT MSVC AND ((CMAKE_C_COMPILER_ID STREQUAL "GNU") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0.0") - OR (CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "10.0.0"))) - # Thankfully, GCC has this +if(NOT MSVC AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" + OR CMAKE_C_COMPILER_ID STREQUAL "Clang")) + # Thankfully, CLANG and GCC have this add_compile_options(-ffile-prefix-map=${REACTOS_SOURCE_DIR}=) add_compile_options(-ffile-prefix-map=${_PATH_PREFIX}=) else() @@ -141,9 +157,7 @@ if(NOT CMAKE_CROSSCOMPILING) elseif(ARCH STREQUAL "amd64") add_definitions(-D_AMD64_ -D__x86_64__ /DWIN32 -D_WINDOWS) endif() - if(MSVC_VERSION GREATER 1699) - add_definitions(/D_ALLOW_KEYWORD_MACROS) - endif() + add_definitions(/D_ALLOW_KEYWORD_MACROS) endif() add_subdirectory(sdk/include/host) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 03b481b0140..212c5ffae1f 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -55,12 +55,9 @@ elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_options("$<$:-Wno-microsoft>") add_compile_options(-Wno-pragma-pack) add_compile_options(-fno-associative-math) - - if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0) - # disable "libcall optimization" - # see https://mudongliang.github.io/2020/12/02/undefined-reference-to-stpcpy.html - add_compile_options(-fno-builtin-stpcpy) - endif() + # disable "libcall optimization" + # see https://mudongliang.github.io/2020/12/02/undefined-reference-to-stpcpy.html + add_compile_options(-fno-builtin-stpcpy) set(CMAKE_LINK_DEF_FILE_FLAG "") set(CMAKE_STATIC_LIBRARY_SUFFIX ".a") diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index ea5ef0efbef..34f6cb81727 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -266,7 +266,7 @@ function(set_image_base MODULE IMAGE_BASE) endfunction() function(set_module_type_toolchain MODULE TYPE) - # Set the PE image version numbers from the NT OS version Windivs is based on + # Set the PE image version numbers from the NT OS version ReactOS is based on target_link_options(${MODULE} PRIVATE "/VERSION:5.01") if((TYPE STREQUAL win32dll) OR (TYPE STREQUAL win32ocx) OR (TYPE STREQUAL cpl)) @@ -312,7 +312,7 @@ function(fixup_load_config _target) # msvc knows how to generate a load_config so no hacks here endfunction() -function(generate_import_lib _libname _dllname _spec_file) +function(generate_import_lib _libname _dllname _spec_file __version_arg) set(_def_file ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def) set(_asm_stubs_file ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_stubs.asm) @@ -320,7 +320,7 @@ function(generate_import_lib _libname _dllname _spec_file) # Generate the def and asm stub files add_custom_command( OUTPUT ${_asm_stubs_file} ${_def_file} - COMMAND native-spec2def --ms -a=${SPEC2DEF_ARCH} --implib -n=${_dllname} -d=${_def_file} -l=${_asm_stubs_file} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def --ms ${__version_arg} -a=${SPEC2DEF_ARCH} --implib -n=${_dllname} -d=${_def_file} -l=${_asm_stubs_file} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) # Compile the generated asm stub file @@ -363,7 +363,7 @@ if(ARCH STREQUAL "amd64") elseif(ARCH STREQUAL "arm") set(SPEC2DEF_ARCH arm) elseif(ARCH STREQUAL "arm64") - add_definitions(/D__arm64__) + add_definitions(/D__arm64__) set(SPEC2DEF_ARCH arm64) else() set(SPEC2DEF_ARCH i386) @@ -386,6 +386,8 @@ function(spec2def _dllname _spec_file) if(__spec2def_VERSION) set(__version_arg "--version=0x${__spec2def_VERSION}") + else() + set(__version_arg "--version=${DLL_EXPORT_VERSION}") endif() # Generate exports def and C stubs file for the DLL @@ -395,7 +397,7 @@ function(spec2def _dllname _spec_file) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) if(__spec2def_ADD_IMPORTLIB) - generate_import_lib(lib${_file} ${_dllname} ${_spec_file}) + generate_import_lib(lib${_file} ${_dllname} ${_spec_file} "${__version_arg}") if(__spec2def_NO_PRIVATE_WARNINGS) set_property(TARGET lib${_file} APPEND PROPERTY STATIC_LIBRARY_OPTIONS /ignore:4104) endif() @@ -409,21 +411,15 @@ endmacro() # PSEH workaround set(PSEH_LIB "pseh") -# Use a full path for the x86 version of ml when using x64 VS. -# It's not a problem when using the DDK/WDK because, in x64 mode, -# both the x86 and x64 versions of ml are available. -if(ARCH STREQUAL "amd64") - if((MSVC_VERSION LESS_EQUAL 1900) AND (DEFINED ENV{VCINSTALLDIR})) +# Setup MASM/ML for compiling 16-bit x86 ASM code on x86 or non-x86 ports. +if(NOT ARCH STREQUAL "i386") + if((MSVC_VERSION EQUAL 1900) AND (DEFINED ENV{VCINSTALLDIR})) set(CMAKE_ASM16_COMPILER $ENV{VCINSTALLDIR}/bin/ml.exe) elseif(DEFINED ENV{VCToolsInstallDir}) - set(CMAKE_ASM16_COMPILER $ENV{VCToolsInstallDir}/bin/HostX86/x86/ml.exe) + set(CMAKE_ASM16_COMPILER $ENV{VCToolsInstallDir}/bin/Host$ENV{VSCMD_ARG_HOST_ARCH}/x86/ml.exe) else() set(CMAKE_ASM16_COMPILER ml.exe) endif() -elseif(ARCH STREQUAL "arm") - set(CMAKE_ASM16_COMPILER armasm.exe) -elseif(ARCH STREQUAL "arm64") - set(CMAKE_ASM16_COMPILER armasm64.exe) else() set(CMAKE_ASM16_COMPILER ml.exe) endif() @@ -446,11 +442,7 @@ function(CreateBootSectorTarget _target_name _asm_file _binary_file _base_addres COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag} /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_includes} ${_defines} /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file} DEPENDS ${_asm_file}) - if(ARCH STREQUAL "arm" OR ARCH STREQUAL "arm64") - set(_asm16_command ${CMAKE_ASM16_COMPILER} -nologo -o ${_object_file} ${_temp_file}) - else() - set(_asm16_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_temp_file}) - endif() + set(_asm16_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_temp_file}) add_custom_command( OUTPUT ${_object_file} diff --git a/sdk/tools/widl/CMakeLists.txt b/sdk/tools/widl/CMakeLists.txt index 4fbfb48749b..d851b3f38ac 100644 --- a/sdk/tools/widl/CMakeLists.txt +++ b/sdk/tools/widl/CMakeLists.txt @@ -1,15 +1,4 @@ -if(MSVC) - if(MSVC_VERSION LESS 1900) - add_definitions(-Dsnprintf=_snprintf) - - # Add this definition for WDK only, VS 9 doesn't like that - if(DEFINED ENV{DDKBUILDENV}) - add_definitions(-Dvsnprintf=_vsnprintf) - endif() - endif() -endif() - FLEX_TARGET(p_scanner parser.l ${CMAKE_CURRENT_BINARY_DIR}/parser.yy.c) BISON_TARGET(p_parser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.tab.c COMPILE_FLAGS "-p parser_") ADD_FLEX_BISON_DEPENDENCY(p_scanner p_parser) diff --git a/sdk/tools/wpp/CMakeLists.txt b/sdk/tools/wpp/CMakeLists.txt index 11999c26949..5fbb26fa616 100644 --- a/sdk/tools/wpp/CMakeLists.txt +++ b/sdk/tools/wpp/CMakeLists.txt @@ -1,22 +1,9 @@ if(MSVC) - if(MSVC_VERSION LESS 1900) - add_definitions( - -Dsnprintf=_snprintf - -Dstrtoull=_strtoui64 - -Dstrtoll=_strtoi64) - - # Add this definition for WDK only, VS 9 doesn't like that - if(DEFINED ENV{DDKBUILDENV}) - add_definitions(-Dvsnprintf=_vsnprintf) - endif() - endif() - # Disable warnings add_compile_options( /wd4146 # "unary minus operator applied to unsigned type, result still unsigned" /wd4244) # "'=': conversion from 'a' to 'b', possible loss of data" - endif() if(CMAKE_CROSSCOMPILING) From 4ae0487319f8f67bc95f3886286989ccd1be5759 Mon Sep 17 00:00:00 2001 From: Egor Ananyin Date: Wed, 27 Sep 2023 13:54:48 +0300 Subject: [PATCH 17/74] [NTUSER] Remove a wrong check in MENU_MouseMove This check doesn't seem to be correct in modern ReactOS. Furthermore, it actually hadn't been working for a long time until it was uncovered by the recent system menu changes. Fixes CORE-19170 (cherry picked from commit c0c371fc76c0dcbd5b47fb1775fcfe1c8c37d5f4) --- win32ss/user/ntuser/menu.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 01740c9c23e..3b9bd6c0e7c 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -3685,20 +3685,7 @@ static BOOL FASTCALL MENU_MouseMove(MTRACKER *pmt, PMENU PtMenu, UINT Flags) UINT Index = NO_SELECTED_ITEM; if ( PtMenu ) - { - if (IS_SYSTEM_MENU(PtMenu)) - { - Index = 0; - //// ReactOS only HACK: CORE-2338 - // Windows tracks mouse moves to the system menu but does not open it. - // Only keyboard tracking can do that. - // - TRACE("SystemMenu\n"); - return TRUE; // Stay inside the Loop! - } - else - MENU_FindItemByCoords( PtMenu, pmt->Pt, &Index ); - } + MENU_FindItemByCoords( PtMenu, pmt->Pt, &Index ); if (Index == NO_SELECTED_ITEM) { From 949c743650e0e0cb9c57db80bfeaa3b962722fd3 Mon Sep 17 00:00:00 2001 From: Serge Gautherie <32623169+SergeGautherie@users.noreply.github.com> Date: Wed, 27 Sep 2023 19:31:42 +0200 Subject: [PATCH 18/74] [NTOS:MM] Fix 'eanbled' typo in a comment (#5728) (cherry picked from commit 9ca88bef80e7f732a289ee266da20dac2c7391d2) --- ntoskrnl/mm/ARM3/pagfault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index a5dd04560d3..01ac9318ae7 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -2668,7 +2668,7 @@ MmSetExecuteOptions(IN ULONG ExecuteOptions) CurrentProcess->Flags.ImageDispatchEnable = TRUE; } - /* These are turned on by default if no-execution is also eanbled */ + /* These are turned on by default if no-execution is also enabled */ if (CurrentProcess->Flags.ExecuteEnable) { CurrentProcess->Flags.ExecuteDispatchEnable = TRUE; From ebc148504fc7f74b2c4b21c1ead4cc83ae8b1873 Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Wed, 27 Sep 2023 19:34:32 +0200 Subject: [PATCH 19/74] [CMICONTROL] Fix MSVC 14.2 dbg x64 warning C4267 (#5696) Can be observed on the buildbots: 2023-09-17T14:19:34.2051345Z [10663/14808] Building CXX object drivers\wdm\audio\drivers\CMIDriver\cmicontrol\CMakeFiles\cmicontrol.dir\main.cpp.obj 2023-09-17T14:19:34.2052611Z D:\a\reactos\reactos\src\drivers\wdm\audio\drivers\CMIDriver\cmicontrol\main.cpp(818): warning C4267: '=': conversion from 'size_t' to 'unsigned int', possible loss of data (cherry picked from commit e69d2e8b89f34ddb99442f36a75c5e3d61f34629) --- drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp index 6649e4d4841..618182708b1 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp +++ b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp @@ -804,7 +804,7 @@ void printUsage() void deleteDriverFiles() { TCHAR SysDir[MAX_PATH]; - unsigned int len; + size_t len; if (GetSystemDirectory(SysDir, sizeof(SysDir))==0) { PrintLastError("GetSystemDirectory()"); return; From 1c484dd6ea45a8a49d5f61f8a5a3828a84ced5af Mon Sep 17 00:00:00 2001 From: jpb Date: Sun, 1 Oct 2023 10:47:44 +0100 Subject: [PATCH 20/74] Fixes to rc files --- dll/win32/shell32/lang/bg-BG.rc | 8 +++++++- dll/win32/shell32/lang/ca-ES.rc | 8 +++++++- dll/win32/shell32/lang/cs-CZ.rc | 8 +++++++- dll/win32/shell32/lang/da-DK.rc | 8 +++++++- dll/win32/shell32/lang/de-DE.rc | 8 +++++++- dll/win32/shell32/lang/el-GR.rc | 8 +++++++- dll/win32/shell32/lang/en-GB.rc | 8 +++++++- dll/win32/shell32/lang/en-US.rc | 8 +++++++- dll/win32/shell32/lang/es-ES.rc | 8 +++++++- dll/win32/shell32/lang/et-EE.rc | 2 +- dll/win32/shell32/lang/eu-ES.rc | 8 +++++++- dll/win32/shell32/lang/fi-FI.rc | 8 +++++++- dll/win32/shell32/lang/fr-FR.rc | 8 +++++++- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hi-IN.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 8 +++++++- dll/win32/shell32/lang/id-ID.rc | 8 +++++++- dll/win32/shell32/lang/it-IT.rc | 8 +++++++- dll/win32/shell32/lang/ja-JP.rc | 8 +++++++- dll/win32/shell32/lang/ko-KR.rc | 8 +++++++- dll/win32/shell32/lang/nl-NL.rc | 8 +++++++- dll/win32/shell32/lang/no-NO.rc | 8 +++++++- dll/win32/shell32/lang/pl-PL.rc | 8 +++++++- dll/win32/shell32/lang/pt-BR.rc | 8 +++++++- dll/win32/shell32/lang/pt-PT.rc | 8 +++++++- dll/win32/shell32/lang/ro-RO.rc | 2 +- dll/win32/shell32/lang/ru-RU.rc | 8 +++++++- dll/win32/shell32/lang/sk-SK.rc | 8 +++++++- dll/win32/shell32/lang/sl-SI.rc | 8 +++++++- dll/win32/shell32/lang/sq-AL.rc | 8 +++++++- dll/win32/shell32/lang/sv-SE.rc | 8 +++++++- dll/win32/shell32/lang/tr-TR.rc | 2 +- dll/win32/shell32/lang/uk-UA.rc | 8 +++++++- dll/win32/shell32/lang/zh-HK.rc | 6 ++++++ dll/win32/shell32/lang/zh-TW.rc | 8 +++++++- 35 files changed, 214 insertions(+), 34 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 871eab75ea7..97df5052e62 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "Добре", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,6 +901,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Създатели" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Назад" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Нова &папка" @@ -983,6 +985,10 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Моят компютър" IDS_TITLE_MYNET "Моята мрежа" IDS_TITLE_BIN_1 "Кошче (пълно)" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 73eb47d8fb6..3420dd6f93e 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "D'Acord", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,6 +901,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Back" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" @@ -983,6 +985,10 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "My Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 419b7582f90..9793eb94c04 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -140,7 +140,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -153,6 +153,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -906,6 +907,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Ostatní programy:" IDS_SHELL_ABOUT_AUTHORS "&Autoři" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Zpět" FCIDM_SHVIEW_NEW "&Nový" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Nová &složka" @@ -989,6 +991,10 @@ BEGIN IDS_OBJECTS "Položek: %d" IDS_OBJECTS_SELECTED "Položek vybráno: %d" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Tento počítač" IDS_TITLE_MYNET "Místa v síti" IDS_TITLE_BIN_1 "Koš (plný)" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index ae6dc69e724..70269765d7e 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -140,7 +140,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -153,6 +153,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -906,6 +907,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Back" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Ny &Mappe" @@ -989,6 +991,10 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Min Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 484aacb517a..ce293a7cc71 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Das Windivs Team\0", IDC_STATIC, 105, 75, 70, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -901,6 +902,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Andere Programme:" IDS_SHELL_ABOUT_AUTHORS "&Autoren" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Zurück" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Neues Ver&zeichnis" @@ -984,6 +986,10 @@ BEGIN IDS_OBJECTS "%d Objekte" IDS_OBJECTS_SELECTED "%d Objekte ausgewählt" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Arbeitsplatz" IDS_TITLE_MYNET "Netzwerkumgebung" IDS_TITLE_BIN_1 "Papierkorb (voll)" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index a3e18dee077..afb1185bf57 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,6 +901,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Προγραμματιστές" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Επιστροφή" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Νέος &Φάκελος" @@ -983,6 +985,10 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Ο υπολογιστής μου" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Κάδος ανακύκλωσης (γεμάτος)" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index a3650bcc5f6..92ae5e38463 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,6 +901,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Back" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" @@ -983,6 +985,10 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "My Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 8095deb26a3..d2e22f1be8b 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,6 +901,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Back" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" @@ -983,6 +985,10 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "My Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 42d51380c3f..ec425d322e9 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -143,7 +143,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " El equipo de Windivs\0", IDC_STATIC, 105, 75, 100, 10 @@ -156,6 +156,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "Aceptar", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -909,6 +910,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Otros programas:" IDS_SHELL_ABOUT_AUTHORS "&Autores" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< A&trás" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Nueva &carpeta" @@ -992,6 +994,10 @@ BEGIN IDS_OBJECTS "%d elementos" IDS_OBJECTS_SELECTED "%d elementos seleccionados" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Mi equipo" IDS_TITLE_MYNET "Mis sitios de red" IDS_TITLE_BIN_1 "Papelera (llena)" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index fa567cd2734..250583f1ab0 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -154,7 +154,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc index dd88de16096..77933d37011 100644 --- a/dll/win32/shell32/lang/eu-ES.rc +++ b/dll/win32/shell32/lang/eu-ES.rc @@ -141,7 +141,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs taldea\0", IDC_STATIC, 105, 75, 100, 10 @@ -154,6 +154,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "Ados", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -905,6 +906,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Beste programak:" IDS_SHELL_ABOUT_AUTHORS "&Egileak" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< A&tzea" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Karpeta &berria" @@ -988,6 +990,10 @@ BEGIN IDS_OBJECTS "%d elementuak" IDS_OBJECTS_SELECTED "%d elementu hautatuak" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Ordenagailua" IDS_TITLE_MYNET "Nire sarelekuak" IDS_TITLE_BIN_1 "Zakarrontzia (betea)" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 2ea142f0a26..ece572c77fd 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,6 +901,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Back" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Uusi &Kansio" @@ -983,6 +985,10 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Oma Tietokone" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 3f3b53c654b..bc606373afb 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,6 +901,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Autres programmes :" IDS_SHELL_ABOUT_AUTHORS "&Auteurs" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< Précédent" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Nouveau d&ossier" @@ -983,6 +985,10 @@ BEGIN IDS_OBJECTS "%d objet(s)" IDS_OBJECTS_SELECTED "%d objet(s) sélectionné(s)" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Poste de travail" IDS_TITLE_MYNET "Mes emplacements réseau" IDS_TITLE_BIN_1 "Corbeille (pleine)" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 5e52e210309..9c5f7c21ee9 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -149,7 +149,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "אישור", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 4445ac55808..875dde027d0 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -147,7 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "ओके", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 7187ea7cbbe..54a1c0b6d41 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -899,6 +900,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Egyéb programok:" IDS_SHELL_ABOUT_AUTHORS "&Készítők" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Vissza" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Mappa" @@ -982,6 +984,10 @@ BEGIN IDS_OBJECTS "%d elem" IDS_OBJECTS_SELECTED "%d kijelölt elem" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Számítógép" IDS_TITLE_MYNET "Hálózati helyek" IDS_TITLE_BIN_1 "Lomtár (tele)" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 2349b5efd90..c46d73e180a 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Tim Windivs\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -897,6 +898,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Program Lain:" IDS_SHELL_ABOUT_AUTHORS "Peng&arang" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< Kem&bali" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Folder Baru" @@ -980,6 +982,10 @@ BEGIN IDS_OBJECTS "%d Obyek" IDS_OBJECTS_SELECTED "%d Obyek terpilih" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Komputer Saya" IDS_TITLE_MYNET "Tempat Jaringan Saya" IDS_TITLE_BIN_1 "Tampungan Daur Ulang (penuh)" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 9ab091d54d4..a4c644f3446 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,6 +901,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Altri Programmi:" IDS_SHELL_ABOUT_AUTHORS "&Autori" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Indietro" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Nuova &Cartella" @@ -983,6 +985,10 @@ BEGIN IDS_OBJECTS "%d Oggetti" IDS_OBJECTS_SELECTED "%d Oggetti selezionati" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Risorse del Computer" IDS_TITLE_MYNET "Risorse di rete" IDS_TITLE_BIN_1 "Cestino (pieno)" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index d42e4d9164a..88e2db9775e 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -134,7 +134,7 @@ FONT 9, "MS UI Gothic" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 135, 88, 10 DEFPUSHBUTTON "OK", IDOK, 167, 158, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 158, 50, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -897,6 +898,7 @@ BEGIN IDS_OPEN_WITH_OTHER "他のプログラム:" IDS_SHELL_ABOUT_AUTHORS "制作者(&A)" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< 戻る(&B)" FCIDM_SHVIEW_NEW "新規作成(&W)" FCIDM_SHVIEW_NEWFOLDER "フォルダ(&F)" @@ -980,6 +982,10 @@ BEGIN IDS_OBJECTS "%d 個のオブジェクト" IDS_OBJECTS_SELECTED "%d 個のオブジェクトが選択済み" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "マイ コンピュータ" IDS_TITLE_MYNET "マイ ネットワーク" IDS_TITLE_BIN_1 "ごみ箱 (いっぱい)" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 0129661027d..fc4c327aa70 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -141,7 +141,7 @@ FONT 9, "굴림" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -154,6 +154,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "확인", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -907,6 +908,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Back" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" @@ -990,6 +992,10 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "내 컴퓨터" IDS_TITLE_MYNET "내 네트워크 환경" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 9ffc99a2f28..8143ea8eecb 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,6 +901,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Back" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" @@ -983,6 +985,10 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "My Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index c6f4b4fb4e3..fdf4d85b0e1 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,6 +901,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Forfatter" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Tilbake" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Ny &mappe" @@ -983,6 +985,10 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Min datamaskin" IDS_TITLE_MYNET "Mine nettverkssteder" IDS_TITLE_BIN_1 "Papirkurv (full)" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 8b8bded7bbb..0668412613c 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -140,7 +140,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -153,6 +153,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -906,6 +907,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Inne programy:" IDS_SHELL_ABOUT_AUTHORS "&Autorzy" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Wstecz" FCIDM_SHVIEW_NEW "&Nowy" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Folder" @@ -989,6 +991,10 @@ BEGIN IDS_OBJECTS "Elementów: %d" IDS_OBJECTS_SELECTED "Zaznaczonych elementów: %d" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Mój komputer" IDS_TITLE_MYNET "Moje miejsca sieciowe" IDS_TITLE_BIN_1 "Kosz (pełny)" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 89104e44147..5ec3cba19a2 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,6 +901,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Outros Programas:" IDS_SHELL_ABOUT_AUTHORS "&Autores" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Voltar" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Pasta" @@ -983,6 +985,10 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Meu Computador" IDS_TITLE_MYNET "Meus Locais de Rede" IDS_TITLE_BIN_1 "Lixeira (cheia)" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index fea7ff885d7..528c688e742 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -899,6 +900,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Outros Programas:" IDS_SHELL_ABOUT_AUTHORS "&Autores" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Retroceder" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Pasta" @@ -982,6 +984,10 @@ BEGIN IDS_OBJECTS "%d Objetos" IDS_OBJECTS_SELECTED "%d Objectos seleccionados" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "O Meu Computador" IDS_TITLE_MYNET "Os Meus Locais na Rede" IDS_TITLE_BIN_1 "Reciclagem (cheia)" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 5cb2069f977..bcfe45762c9 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -150,7 +150,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "Î&nchide", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 1bf7018fcbe..13807630412 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -141,7 +141,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Команда Windivs\0", IDC_STATIC, 105, 75, 65, 10 @@ -154,6 +154,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -907,6 +908,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Другие программы:" IDS_SHELL_ABOUT_AUTHORS "&Авторы" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Назад" FCIDM_SHVIEW_NEW "Созд&ать" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Папка" @@ -990,6 +992,10 @@ BEGIN IDS_OBJECTS "Объектов: %d" IDS_OBJECTS_SELECTED "Выделено объектов: %d" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Мой компьютер" IDS_TITLE_MYNET "Сетевое окружение" IDS_TITLE_BIN_1 "Корзина (полная)" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index f50cfd0fb62..0041c28eea0 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,6 +901,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Autori" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Späť" FCIDM_SHVIEW_NEW "&Nový" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Priečinok" @@ -983,6 +985,10 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Tento počítač" IDS_TITLE_MYNET "Miesta v sieti" IDS_TITLE_BIN_1 "Kôš (plný)" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 4e09651f8b4..b720c0b5d93 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "V redu", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,6 +901,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Back" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" @@ -983,6 +985,10 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "My Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index aaa4ac17fe1..0a8b4d07fec 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -138,7 +138,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Ekipi Windivs\0", IDC_STATIC, 105, 75, 53, 10 @@ -151,6 +151,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -904,6 +905,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Programe të Tjerë:" IDS_SHELL_ABOUT_AUTHORS "&Autorët" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Mbrapa" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Dosje E're" @@ -987,6 +989,10 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Kompjuteri Im" IDS_TITLE_MYNET "Vendi Rrjetit Tim" IDS_TITLE_BIN_1 "Plehra (plot)" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index e4d056f8c3d..d6eef49d0df 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs-gruppen\0", IDC_STATIC, 105, 75, 60, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,6 +901,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Andra program:" IDS_SHELL_ABOUT_AUTHORS "&Upphovsinformation" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Bakåt" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Ny &mapp" @@ -983,6 +985,10 @@ BEGIN IDS_OBJECTS "%d objekt" IDS_OBJECTS_SELECTED "%d markerade objekt" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Den här datorn" IDS_TITLE_MYNET "Mina nätverksplatser" IDS_TITLE_BIN_1 "Papperskorgen (full)" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 1fd891e6bc9..31d0c7e4770 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -149,7 +149,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "Tamam", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index e49c7772967..510bf75f2b5 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,6 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,6 +901,7 @@ BEGIN IDS_OPEN_WITH_OTHER "Інші програми:" IDS_SHELL_ABOUT_AUTHORS "&Автори" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Назад" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Папку" @@ -983,6 +985,10 @@ BEGIN IDS_OBJECTS "%d об'єктів" IDS_OBJECTS_SELECTED "Обрано %d об'єктів" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "Мій комп'ютер" IDS_TITLE_MYNET "Мережне оточення" IDS_TITLE_BIN_1 "Кошик (повний)" diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc index d4f55e5496c..a881552797b 100644 --- a/dll/win32/shell32/lang/zh-HK.rc +++ b/dll/win32/shell32/lang/zh-HK.rc @@ -155,6 +155,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "確定", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -908,6 +909,7 @@ BEGIN IDS_OPEN_WITH_OTHER "其它程式：" IDS_SHELL_ABOUT_AUTHORS "作者(&A)" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< 返回(&B)" FCIDM_SHVIEW_NEW "新增(&W)" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "新增資料夾(&F)" @@ -991,6 +993,10 @@ BEGIN IDS_OBJECTS "%d 個物件" IDS_OBJECTS_SELECTED "已選擇 %d 個物件" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "我的電腦" IDS_TITLE_MYNET "網絡上的芳鄰" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 5cd48c759d3..49f29cbe1c4 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -143,7 +143,7 @@ FONT 9, "新細明體" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -156,6 +156,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "確定", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 + END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -909,6 +910,7 @@ BEGIN IDS_OPEN_WITH_OTHER "其它程式:" IDS_SHELL_ABOUT_AUTHORS "作者(&A)" + IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< 上一步(&B)" FCIDM_SHVIEW_NEW "新增(&W)" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "新增資料夾(&F)" @@ -992,6 +994,10 @@ BEGIN IDS_OBJECTS "%d 個物件" IDS_OBJECTS_SELECTED "已選擇 %d 個物件" + IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" + IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." + IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" + IDS_TITLE_MYCOMP "我的電腦" IDS_TITLE_MYNET "網路上的芳鄰" IDS_TITLE_BIN_1 "Recycle Bin (full)" From 8fb0453f9962cc76453844c20489ef70c27a44de Mon Sep 17 00:00:00 2001 From: jpb Date: Sun, 1 Oct 2023 16:21:43 +0100 Subject: [PATCH 21/74] Revert "Fixes to rc files" This reverts commit 1c484dd6ea45a8a49d5f61f8a5a3828a84ced5af. --- dll/win32/shell32/lang/bg-BG.rc | 8 +------- dll/win32/shell32/lang/ca-ES.rc | 8 +------- dll/win32/shell32/lang/cs-CZ.rc | 8 +------- dll/win32/shell32/lang/da-DK.rc | 8 +------- dll/win32/shell32/lang/de-DE.rc | 8 +------- dll/win32/shell32/lang/el-GR.rc | 8 +------- dll/win32/shell32/lang/en-GB.rc | 8 +------- dll/win32/shell32/lang/en-US.rc | 8 +------- dll/win32/shell32/lang/es-ES.rc | 8 +------- dll/win32/shell32/lang/et-EE.rc | 2 +- dll/win32/shell32/lang/eu-ES.rc | 8 +------- dll/win32/shell32/lang/fi-FI.rc | 8 +------- dll/win32/shell32/lang/fr-FR.rc | 8 +------- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hi-IN.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 8 +------- dll/win32/shell32/lang/id-ID.rc | 8 +------- dll/win32/shell32/lang/it-IT.rc | 8 +------- dll/win32/shell32/lang/ja-JP.rc | 8 +------- dll/win32/shell32/lang/ko-KR.rc | 8 +------- dll/win32/shell32/lang/nl-NL.rc | 8 +------- dll/win32/shell32/lang/no-NO.rc | 8 +------- dll/win32/shell32/lang/pl-PL.rc | 8 +------- dll/win32/shell32/lang/pt-BR.rc | 8 +------- dll/win32/shell32/lang/pt-PT.rc | 8 +------- dll/win32/shell32/lang/ro-RO.rc | 2 +- dll/win32/shell32/lang/ru-RU.rc | 8 +------- dll/win32/shell32/lang/sk-SK.rc | 8 +------- dll/win32/shell32/lang/sl-SI.rc | 8 +------- dll/win32/shell32/lang/sq-AL.rc | 8 +------- dll/win32/shell32/lang/sv-SE.rc | 8 +------- dll/win32/shell32/lang/tr-TR.rc | 2 +- dll/win32/shell32/lang/uk-UA.rc | 8 +------- dll/win32/shell32/lang/zh-HK.rc | 6 ------ dll/win32/shell32/lang/zh-TW.rc | 8 +------- 35 files changed, 34 insertions(+), 214 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 97df5052e62..871eab75ea7 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "Добре", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -901,7 +900,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Създатели" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Назад" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Нова &папка" @@ -985,10 +983,6 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Моят компютър" IDS_TITLE_MYNET "Моята мрежа" IDS_TITLE_BIN_1 "Кошче (пълно)" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 3420dd6f93e..73eb47d8fb6 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "D'Acord", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -901,7 +900,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Authors" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Back" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" @@ -985,10 +983,6 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "My Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 9793eb94c04..419b7582f90 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -140,7 +140,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -153,7 +153,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -907,7 +906,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Ostatní programy:" IDS_SHELL_ABOUT_AUTHORS "&Autoři" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Zpět" FCIDM_SHVIEW_NEW "&Nový" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Nová &složka" @@ -991,10 +989,6 @@ BEGIN IDS_OBJECTS "Položek: %d" IDS_OBJECTS_SELECTED "Položek vybráno: %d" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Tento počítač" IDS_TITLE_MYNET "Místa v síti" IDS_TITLE_BIN_1 "Koš (plný)" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 70269765d7e..ae6dc69e724 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -140,7 +140,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -153,7 +153,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -907,7 +906,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Authors" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Back" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Ny &Mappe" @@ -991,10 +989,6 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Min Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index ce293a7cc71..484aacb517a 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Das Windivs Team\0", IDC_STATIC, 105, 75, 70, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -902,7 +901,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Andere Programme:" IDS_SHELL_ABOUT_AUTHORS "&Autoren" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Zurück" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Neues Ver&zeichnis" @@ -986,10 +984,6 @@ BEGIN IDS_OBJECTS "%d Objekte" IDS_OBJECTS_SELECTED "%d Objekte ausgewählt" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Arbeitsplatz" IDS_TITLE_MYNET "Netzwerkumgebung" IDS_TITLE_BIN_1 "Papierkorb (voll)" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index afb1185bf57..a3e18dee077 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -901,7 +900,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Προγραμματιστές" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Επιστροφή" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Νέος &Φάκελος" @@ -985,10 +983,6 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Ο υπολογιστής μου" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Κάδος ανακύκλωσης (γεμάτος)" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 92ae5e38463..a3650bcc5f6 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -901,7 +900,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Authors" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Back" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" @@ -985,10 +983,6 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "My Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index d2e22f1be8b..8095deb26a3 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -901,7 +900,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Authors" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Back" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" @@ -985,10 +983,6 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "My Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index ec425d322e9..42d51380c3f 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -143,7 +143,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " El equipo de Windivs\0", IDC_STATIC, 105, 75, 100, 10 @@ -156,7 +156,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "Aceptar", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -910,7 +909,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Otros programas:" IDS_SHELL_ABOUT_AUTHORS "&Autores" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< A&trás" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Nueva &carpeta" @@ -994,10 +992,6 @@ BEGIN IDS_OBJECTS "%d elementos" IDS_OBJECTS_SELECTED "%d elementos seleccionados" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Mi equipo" IDS_TITLE_MYNET "Mis sitios de red" IDS_TITLE_BIN_1 "Papelera (llena)" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 250583f1ab0..fa567cd2734 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -154,7 +154,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - + PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc index 77933d37011..dd88de16096 100644 --- a/dll/win32/shell32/lang/eu-ES.rc +++ b/dll/win32/shell32/lang/eu-ES.rc @@ -141,7 +141,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs taldea\0", IDC_STATIC, 105, 75, 100, 10 @@ -154,7 +154,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "Ados", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -906,7 +905,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Beste programak:" IDS_SHELL_ABOUT_AUTHORS "&Egileak" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< A&tzea" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Karpeta &berria" @@ -990,10 +988,6 @@ BEGIN IDS_OBJECTS "%d elementuak" IDS_OBJECTS_SELECTED "%d elementu hautatuak" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Ordenagailua" IDS_TITLE_MYNET "Nire sarelekuak" IDS_TITLE_BIN_1 "Zakarrontzia (betea)" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index ece572c77fd..2ea142f0a26 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -901,7 +900,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Authors" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Back" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Uusi &Kansio" @@ -985,10 +983,6 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Oma Tietokone" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index bc606373afb..3f3b53c654b 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -901,7 +900,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Autres programmes :" IDS_SHELL_ABOUT_AUTHORS "&Auteurs" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< Précédent" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Nouveau d&ossier" @@ -985,10 +983,6 @@ BEGIN IDS_OBJECTS "%d objet(s)" IDS_OBJECTS_SELECTED "%d objet(s) sélectionné(s)" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Poste de travail" IDS_TITLE_MYNET "Mes emplacements réseau" IDS_TITLE_BIN_1 "Corbeille (pleine)" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 9c5f7c21ee9..5e52e210309 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -149,7 +149,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "אישור", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - + PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 875dde027d0..4445ac55808 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -147,7 +147,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "ओके", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - + PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 54a1c0b6d41..7187ea7cbbe 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,7 +899,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Egyéb programok:" IDS_SHELL_ABOUT_AUTHORS "&Készítők" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Vissza" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Mappa" @@ -984,10 +982,6 @@ BEGIN IDS_OBJECTS "%d elem" IDS_OBJECTS_SELECTED "%d kijelölt elem" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Számítógép" IDS_TITLE_MYNET "Hálózati helyek" IDS_TITLE_BIN_1 "Lomtár (tele)" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index c46d73e180a..2349b5efd90 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Tim Windivs\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -898,7 +897,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Program Lain:" IDS_SHELL_ABOUT_AUTHORS "Peng&arang" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< Kem&bali" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Folder Baru" @@ -982,10 +980,6 @@ BEGIN IDS_OBJECTS "%d Obyek" IDS_OBJECTS_SELECTED "%d Obyek terpilih" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Komputer Saya" IDS_TITLE_MYNET "Tempat Jaringan Saya" IDS_TITLE_BIN_1 "Tampungan Daur Ulang (penuh)" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index a4c644f3446..9ab091d54d4 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -901,7 +900,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Altri Programmi:" IDS_SHELL_ABOUT_AUTHORS "&Autori" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Indietro" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Nuova &Cartella" @@ -985,10 +983,6 @@ BEGIN IDS_OBJECTS "%d Oggetti" IDS_OBJECTS_SELECTED "%d Oggetti selezionati" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Risorse del Computer" IDS_TITLE_MYNET "Risorse di rete" IDS_TITLE_BIN_1 "Cestino (pieno)" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 88e2db9775e..d42e4d9164a 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -134,7 +134,7 @@ FONT 9, "MS UI Gothic" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 135, 88, 10 DEFPUSHBUTTON "OK", IDOK, 167, 158, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 158, 50, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -898,7 +897,6 @@ BEGIN IDS_OPEN_WITH_OTHER "他のプログラム:" IDS_SHELL_ABOUT_AUTHORS "制作者(&A)" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< 戻る(&B)" FCIDM_SHVIEW_NEW "新規作成(&W)" FCIDM_SHVIEW_NEWFOLDER "フォルダ(&F)" @@ -982,10 +980,6 @@ BEGIN IDS_OBJECTS "%d 個のオブジェクト" IDS_OBJECTS_SELECTED "%d 個のオブジェクトが選択済み" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "マイ コンピュータ" IDS_TITLE_MYNET "マイ ネットワーク" IDS_TITLE_BIN_1 "ごみ箱 (いっぱい)" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index fc4c327aa70..0129661027d 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -141,7 +141,7 @@ FONT 9, "굴림" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -154,7 +154,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "확인", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -908,7 +907,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Authors" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Back" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" @@ -992,10 +990,6 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "내 컴퓨터" IDS_TITLE_MYNET "내 네트워크 환경" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 8143ea8eecb..9ffc99a2f28 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -901,7 +900,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Authors" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Back" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" @@ -985,10 +983,6 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "My Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index fdf4d85b0e1..c6f4b4fb4e3 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -901,7 +900,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Forfatter" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Tilbake" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Ny &mappe" @@ -985,10 +983,6 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Min datamaskin" IDS_TITLE_MYNET "Mine nettverkssteder" IDS_TITLE_BIN_1 "Papirkurv (full)" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 0668412613c..8b8bded7bbb 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -140,7 +140,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -153,7 +153,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -907,7 +906,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Inne programy:" IDS_SHELL_ABOUT_AUTHORS "&Autorzy" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Wstecz" FCIDM_SHVIEW_NEW "&Nowy" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Folder" @@ -991,10 +989,6 @@ BEGIN IDS_OBJECTS "Elementów: %d" IDS_OBJECTS_SELECTED "Zaznaczonych elementów: %d" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Mój komputer" IDS_TITLE_MYNET "Moje miejsca sieciowe" IDS_TITLE_BIN_1 "Kosz (pełny)" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 5ec3cba19a2..89104e44147 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -901,7 +900,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Outros Programas:" IDS_SHELL_ABOUT_AUTHORS "&Autores" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Voltar" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Pasta" @@ -985,10 +983,6 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Meu Computador" IDS_TITLE_MYNET "Meus Locais de Rede" IDS_TITLE_BIN_1 "Lixeira (cheia)" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 528c688e742..fea7ff885d7 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -900,7 +899,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Outros Programas:" IDS_SHELL_ABOUT_AUTHORS "&Autores" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Retroceder" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Pasta" @@ -984,10 +982,6 @@ BEGIN IDS_OBJECTS "%d Objetos" IDS_OBJECTS_SELECTED "%d Objectos seleccionados" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "O Meu Computador" IDS_TITLE_MYNET "Os Meus Locais na Rede" IDS_TITLE_BIN_1 "Reciclagem (cheia)" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index bcfe45762c9..5cb2069f977 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -150,7 +150,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "Î&nchide", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - + PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 13807630412..1bf7018fcbe 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -141,7 +141,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Команда Windivs\0", IDC_STATIC, 105, 75, 65, 10 @@ -154,7 +154,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -908,7 +907,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Другие программы:" IDS_SHELL_ABOUT_AUTHORS "&Авторы" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Назад" FCIDM_SHVIEW_NEW "Созд&ать" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Папка" @@ -992,10 +990,6 @@ BEGIN IDS_OBJECTS "Объектов: %d" IDS_OBJECTS_SELECTED "Выделено объектов: %d" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Мой компьютер" IDS_TITLE_MYNET "Сетевое окружение" IDS_TITLE_BIN_1 "Корзина (полная)" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 0041c28eea0..f50cfd0fb62 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -901,7 +900,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Autori" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Späť" FCIDM_SHVIEW_NEW "&Nový" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Priečinok" @@ -985,10 +983,6 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Tento počítač" IDS_TITLE_MYNET "Miesta v sieti" IDS_TITLE_BIN_1 "Kôš (plný)" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index b720c0b5d93..4e09651f8b4 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "V redu", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -901,7 +900,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Other Programs:" IDS_SHELL_ABOUT_AUTHORS "&Authors" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Back" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "New &Folder" @@ -985,10 +983,6 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "My Computer" IDS_TITLE_MYNET "My Network Places" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 0a8b4d07fec..aaa4ac17fe1 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -138,7 +138,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Ekipi Windivs\0", IDC_STATIC, 105, 75, 53, 10 @@ -151,7 +151,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -905,7 +904,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Programe të Tjerë:" IDS_SHELL_ABOUT_AUTHORS "&Autorët" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Mbrapa" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Dosje E're" @@ -989,10 +987,6 @@ BEGIN IDS_OBJECTS "%d Objects" IDS_OBJECTS_SELECTED "%d Objects Selected" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Kompjuteri Im" IDS_TITLE_MYNET "Vendi Rrjetit Tim" IDS_TITLE_BIN_1 "Plehra (plot)" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index d6eef49d0df..e4d056f8c3d 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs-gruppen\0", IDC_STATIC, 105, 75, 60, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -901,7 +900,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Andra program:" IDS_SHELL_ABOUT_AUTHORS "&Upphovsinformation" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Bakåt" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Ny &mapp" @@ -985,10 +983,6 @@ BEGIN IDS_OBJECTS "%d objekt" IDS_OBJECTS_SELECTED "%d markerade objekt" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Den här datorn" IDS_TITLE_MYNET "Mina nätverksplatser" IDS_TITLE_BIN_1 "Papperskorgen (full)" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 31d0c7e4770..1fd891e6bc9 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -149,7 +149,7 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "Tamam", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - + PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 510bf75f2b5..e49c7772967 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -901,7 +900,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Інші програми:" IDS_SHELL_ABOUT_AUTHORS "&Автори" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Назад" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Папку" @@ -985,10 +983,6 @@ BEGIN IDS_OBJECTS "%d об'єктів" IDS_OBJECTS_SELECTED "Обрано %d об'єктів" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Мій комп'ютер" IDS_TITLE_MYNET "Мережне оточення" IDS_TITLE_BIN_1 "Кошик (повний)" diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc index a881552797b..d4f55e5496c 100644 --- a/dll/win32/shell32/lang/zh-HK.rc +++ b/dll/win32/shell32/lang/zh-HK.rc @@ -155,7 +155,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "確定", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -909,7 +908,6 @@ BEGIN IDS_OPEN_WITH_OTHER "其它程式：" IDS_SHELL_ABOUT_AUTHORS "作者(&A)" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< 返回(&B)" FCIDM_SHVIEW_NEW "新增(&W)" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "新增資料夾(&F)" @@ -993,10 +991,6 @@ BEGIN IDS_OBJECTS "%d 個物件" IDS_OBJECTS_SELECTED "已選擇 %d 個物件" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "我的電腦" IDS_TITLE_MYNET "網絡上的芳鄰" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 49f29cbe1c4..5cd48c759d3 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -143,7 +143,7 @@ FONT 9, "新細明體" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1996-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -156,7 +156,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "確定", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -910,7 +909,6 @@ BEGIN IDS_OPEN_WITH_OTHER "其它程式:" IDS_SHELL_ABOUT_AUTHORS "作者(&A)" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< 上一步(&B)" FCIDM_SHVIEW_NEW "新增(&W)" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "新增資料夾(&F)" @@ -994,10 +992,6 @@ BEGIN IDS_OBJECTS "%d 個物件" IDS_OBJECTS_SELECTED "已選擇 %d 個物件" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "我的電腦" IDS_TITLE_MYNET "網路上的芳鄰" IDS_TITLE_BIN_1 "Recycle Bin (full)" From d1abec41bff0e6124d08b945a872d100f56c787e Mon Sep 17 00:00:00 2001 From: jpb Date: Sun, 1 Oct 2023 16:21:50 +0100 Subject: [PATCH 22/74] Revert "[SHELL32] *.rc: AGAIN! Use 1996 as birth year in IDD_ABOUT for consistency" This reverts commit 670b0de58223431140a441798fe468d1022ccc33. --- dll/win32/shell32/lang/et-EE.rc | 10 ++-------- dll/win32/shell32/lang/he-IL.rc | 10 ++-------- dll/win32/shell32/lang/hi-IN.rc | 10 ++-------- dll/win32/shell32/lang/ro-RO.rc | 10 ++-------- dll/win32/shell32/lang/tr-TR.rc | 10 ++-------- dll/win32/shell32/lang/zh-CN.rc | 10 ++-------- 6 files changed, 12 insertions(+), 48 deletions(-) diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index fa567cd2734..3ed81a01b79 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -141,8 +141,8 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX - LTEXT "Autoriõigus 1996-", IDC_STATIC, 35, 75, 53, 10 + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "Autoriõigus 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX @@ -154,7 +154,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -908,7 +907,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Muud programmid:" IDS_SHELL_ABOUT_AUTHORS "&Autorid" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Tagasi" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Uus &kaust" @@ -992,10 +990,6 @@ BEGIN IDS_OBJECTS "%d objekti" IDS_OBJECTS_SELECTED "%d objekti valitud" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Minu arvuti" IDS_TITLE_MYNET "Minu võrgukohad" IDS_TITLE_BIN_1 "Prügikast (täis)" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 5e52e210309..b494677dcc6 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -136,8 +136,8 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX - LTEXT "זכויות יוצרים 1996-", IDC_STATIC, 35, 75, 53, 10 + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "זכויות יוצרים 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " צוות Windivs\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX @@ -149,7 +149,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "אישור", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -903,7 +902,6 @@ BEGIN IDS_OPEN_WITH_OTHER "תכניות אחרות:" IDS_SHELL_ABOUT_AUTHORS "&יוצרים" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &חזרה" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "תיקיה חדשה" @@ -987,10 +985,6 @@ BEGIN IDS_OBJECTS "%d פריטים" IDS_OBJECTS_SELECTED "%d פריטים נבחרו" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "המחשב שלי" IDS_TITLE_MYNET "מיקומי הרשת שלי" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 4445ac55808..00fc65b7f0e 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -134,8 +134,8 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX - LTEXT "कॉपीराइट 1996-", IDC_STATIC, 35, 75, 53, 10 + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "कॉपीराइट 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " रिऐक्ट ओएस टीम\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX @@ -147,7 +147,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "ओके", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -896,7 +895,6 @@ BEGIN IDS_OPEN_WITH_OTHER "अन्य प्रोग्राम:" IDS_SHELL_ABOUT_AUTHORS "&ऑथर" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &पीछे" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "नया &फोल्डर" @@ -980,10 +978,6 @@ BEGIN IDS_OBJECTS "%d वस्तुओं" IDS_OBJECTS_SELECTED "%d वस्तुओं का चयन किया" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "मेरा कंप्यूटर" IDS_TITLE_MYNET "मेरे नेटवर्क स्थान" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 5cb2069f977..62c63f17ddd 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -137,8 +137,8 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX - LTEXT "Drept de autor 1996-", IDC_STATIC, 35, 75, 68, 10 + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "Drept de autor 1998-", IDC_STATIC, 35, 75, 68, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 103, 75, 17, 10 LTEXT " Echipa Windivs\0", IDC_STATIC, 120, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX @@ -150,7 +150,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "Î&nchide", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -904,7 +903,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Alte programe:" IDS_SHELL_ABOUT_AUTHORS "&Autori" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< Înap&oi" FCIDM_SHVIEW_NEW "&Crează" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Dosar" @@ -988,10 +986,6 @@ BEGIN IDS_OBJECTS "%d Obiecte" IDS_OBJECTS_SELECTED "%d Obiecte selectate" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Calculatorul meu" IDS_TITLE_MYNET "Locații în rețea" IDS_TITLE_BIN_1 "Coșul de gunoi (plin)" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 1fd891e6bc9..f31989c172e 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -136,8 +136,8 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX - LTEXT "Telif Hakkı 1996-", IDC_STATIC, 35, 75, 53, 10 + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "Telif Hakkı 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Takımı\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX @@ -149,7 +149,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "Tamam", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -903,7 +902,6 @@ BEGIN IDS_OPEN_WITH_OTHER "Diğer Programlar:" IDS_SHELL_ABOUT_AUTHORS "&Yazarlar" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< &Geri" FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Yeni &Dizin" @@ -987,10 +985,6 @@ BEGIN IDS_OBJECTS "%d Nesne" IDS_OBJECTS_SELECTED "%d Nesne Seçili" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "Bilgisayarım" IDS_TITLE_MYNET "Ağ Bağlantılarım" IDS_TITLE_BIN_1 "Recycle Bin (full)" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index fc9217f9fdf..a66d4395f99 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -144,8 +144,8 @@ FONT 9, "宋体" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10, SS_NOPREFIX - LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10, SS_NOPREFIX - LTEXT "版权所有 1996-", IDC_STATIC, 35, 75, 53, 10 + LTEXT "Release Candidate 2\0", IDC_ABOUT_VERSION, 35, 65, 250, 10 + LTEXT "版权所有 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Windivs Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20, SS_NOPREFIX @@ -157,7 +157,6 @@ BEGIN LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "确定", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 - PUSHBUTTON "", IDC_ABOUT_CHANGELOG, 110, 178, 70, 14 END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 @@ -911,7 +910,6 @@ BEGIN IDS_OPEN_WITH_OTHER "其他程序：" IDS_SHELL_ABOUT_AUTHORS "作者(&A)" - IDS_SHELL_ABOUT_CHANGELOG "&Changelog" IDS_SHELL_ABOUT_BACK "< 返回(&B)" FCIDM_SHVIEW_NEW "新建(&W)" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "文件夹(&F)" @@ -995,10 +993,6 @@ BEGIN IDS_OBJECTS "%d 个对象" IDS_OBJECTS_SELECTED "已选中 %d 个对象" - IDS_RECYCLE_CLEANER_DISPLAYNAME "Recycle Bin" - IDS_RECYCLE_CLEANER_DESCRIPTION "The Recycle Bin contains files you have deleted from your computer. These files are not permanently removed until you empty the Recycle Bin." - IDS_RECYCLE_CLEANER_BUTTON_TEXT "&View Files" - IDS_TITLE_MYCOMP "我的电脑" IDS_TITLE_MYNET "网上邻居" IDS_TITLE_BIN_1 "回收站(满)" From 084ad14ed5cebf1d7098ced2138e7c6b471046c8 Mon Sep 17 00:00:00 2001 From: jpb Date: Fri, 20 Oct 2023 16:04:42 +0100 Subject: [PATCH 23/74] Update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f14e4ccbe72..53f45abf92c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ modules/[Aa][Hh][Kk]_[Tt]ests .settings .vscode sdk/tools/winesync/winesync.cfg +/.vs From cffb5fd5af047c0389c9bdafc7f8ab70cf0e3ebe Mon Sep 17 00:00:00 2001 From: Andrei Miloiu Date: Mon, 3 Jul 2023 15:24:21 +0300 Subject: [PATCH 24/74] [MSPAINT] Update Romanian (ro-RO) translation (#5353) --- base/applications/mspaint/lang/ro-RO.rc | 1 - 1 file changed, 1 deletion(-) diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index f43c549153d..47d6bc73159 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -263,5 +263,4 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixeli/cm" IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END From 059df3e947b35ec905cffb599fbdc9ecefaab613 Mon Sep 17 00:00:00 2001 From: Piotr Hetnarowicz Date: Mon, 3 Jul 2023 14:28:38 +0200 Subject: [PATCH 25/74] [MSPAINT] Update Polish (pl-PL) translation (#5368) --- base/applications/mspaint/lang/pl-PL.rc | 1 - 1 file changed, 1 deletion(-) diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index f172b9b0769..cb86cad2b9d 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -264,5 +264,4 @@ BEGIN IDS_VERTICAL "Pionowe" IDS_PRINTRES "%d x %d piksel/cm" IDS_CANTPASTE "Nie można wkleić ze schowka. Format danych jest nieprawidłowy lub nieobsługiwany." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" END From c7cea546986531b4f251b6e55553ff8aa8c8378a Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Tue, 17 Oct 2023 15:58:34 +0900 Subject: [PATCH 26/74] [MSPAINT] Implement mouse middle button dragging (#5804) - Handle WM_MBUTTONDOWN and WM_MBUTTONUP messages. - Implement dragging by mouse middle button. - Add IDC_HANDDRAG cursor resource. CORE-19094 --- base/applications/mspaint/canvas.cpp | 36 ++++++++++++++++--- base/applications/mspaint/canvas.h | 14 ++++---- base/applications/mspaint/icons/handdrag.cur | Bin 0 -> 326 bytes base/applications/mspaint/resource.h | 1 + base/applications/mspaint/rsrc.rc | 1 + 5 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 base/applications/mspaint/icons/handdrag.cur diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 3568657a21f..4f891aa7897 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -229,7 +229,7 @@ VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar) { case SB_THUMBTRACK: case SB_THUMBPOSITION: - si.nPos = HIWORD(wParam); + si.nPos = (SHORT)HIWORD(wParam); break; case SB_LINELEFT: si.nPos -= 5; @@ -244,9 +244,9 @@ VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar) si.nPos += si.nPage; break; } + si.nPos = max(min(si.nPos, si.nMax), si.nMin); SetScrollInfo(fnBar, &si); - Update(m_hWnd); - Invalidate(FALSE); // FIXME: Flicker + Invalidate(); } LRESULT CCanvasWindow::OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -265,6 +265,17 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + m_nMouseDownMsg = nMsg; + BOOL bLeftButton = (nMsg == WM_LBUTTONDOWN); + + if (nMsg == WM_MBUTTONDOWN) + { + m_ptOrig = pt; + SetCapture(); + ::SetCursor(::LoadCursor(g_hinstExe, MAKEINTRESOURCE(IDC_HANDDRAG))); + return 0; + } + HITTEST hitSelection = SelectionHitTest(pt); if (hitSelection != HIT_NONE) { @@ -365,6 +376,17 @@ LRESULT CCanvasWindow::OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + + if (m_nMouseDownMsg == WM_MBUTTONDOWN) + { + INT x = GetScrollPos(SB_HORZ) - (pt.x - m_ptOrig.x); + INT y = GetScrollPos(SB_VERT) - (pt.y - m_ptOrig.y); + SendMessage(WM_HSCROLL, MAKEWPARAM(SB_THUMBPOSITION, x), 0); + SendMessage(WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, y), 0); + m_ptOrig = pt; + return 0; + } + CanvasToImage(pt); if (m_hitSelection != HIT_NONE) @@ -633,8 +655,12 @@ LRESULT CCanvasWindow::OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL return OnLRButtonUp(FALSE, nMsg, wParam, lParam, bHandled); } -LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ + if (m_nMouseDownMsg == WM_MBUTTONDOWN) + { + ::SetCursor(::LoadCursor(g_hinstExe, MAKEINTRESOURCE(IDC_HANDDRAG))); + return 0; + } + POINT pt; ::GetCursorPos(&pt); ScreenToClient(&pt); diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index db0e549837b..a27589dd044 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -20,13 +20,15 @@ class CCanvasWindow : public CWindowImpl MESSAGE_HANDLER(WM_HSCROLL, OnHScroll) MESSAGE_HANDLER(WM_VSCROLL, OnVScroll) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) - MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) - MESSAGE_HANDLER(WM_RBUTTONDOWN, OnRButtonDown) - MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnLButtonDblClk) - MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnRButtonDblClk) + MESSAGE_HANDLER(WM_LBUTTONDOWN, OnButtonDown) + MESSAGE_HANDLER(WM_RBUTTONDOWN, OnButtonDown) + MESSAGE_HANDLER(WM_MBUTTONDOWN, OnButtonDown) + MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnButtonDblClk) + MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnButtonDblClk) MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) - MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) - MESSAGE_HANDLER(WM_RBUTTONUP, OnRButtonUp) + MESSAGE_HANDLER(WM_LBUTTONUP, OnButtonUp) + MESSAGE_HANDLER(WM_RBUTTONUP, OnButtonUp) + MESSAGE_HANDLER(WM_MBUTTONUP, OnButtonUp) MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) MESSAGE_HANDLER(WM_MOUSEWHEEL, OnMouseWheel) MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) diff --git a/base/applications/mspaint/icons/handdrag.cur b/base/applications/mspaint/icons/handdrag.cur new file mode 100644 index 0000000000000000000000000000000000000000..74e5ba6b9c2b8e84d7696ce289ed5ba5296f4efa GIT binary patch literal 326 zcmZ|Ku?@m75CzchP*9;z(c+Sl4Z Date: Wed, 5 Jul 2023 12:06:22 +0900 Subject: [PATCH 27/74] [MSPAINT] Some bug fixes on loading/saving files (#5385) - Display a correct error message on failing to save a file. - Don't confuse the main file info and the non-main file info. - Rename ShowFileLoadError as ShowError, and strengthen and move it to dialogs.cpp. - Add SetFileInfo and InitializeImage helper functions. - Add IDS_SAVEERROR resource string. - Modify SaveDIBToFile, SetBitmapAndInfo, and DoLoadImageFile functions. CORE-18867 --- base/applications/mspaint/lang/bg-BG.rc | 6 +++--- base/applications/mspaint/lang/cs-CZ.rc | 6 +++--- base/applications/mspaint/lang/de-DE.rc | 6 +++--- base/applications/mspaint/lang/en-GB.rc | 6 +++--- base/applications/mspaint/lang/en-US.rc | 6 +++--- base/applications/mspaint/lang/es-ES.rc | 6 +++--- base/applications/mspaint/lang/et-EE.rc | 6 +++--- base/applications/mspaint/lang/eu-ES.rc | 6 +++--- base/applications/mspaint/lang/fr-FR.rc | 6 +++--- base/applications/mspaint/lang/he-IL.rc | 6 +++--- base/applications/mspaint/lang/hu-HU.rc | 6 +++--- base/applications/mspaint/lang/id-ID.rc | 6 +++--- base/applications/mspaint/lang/it-IT.rc | 6 +++--- base/applications/mspaint/lang/nl-NL.rc | 6 +++--- base/applications/mspaint/lang/no-NO.rc | 6 +++--- base/applications/mspaint/lang/pl-PL.rc | 1 + base/applications/mspaint/lang/pt-BR.rc | 6 +++--- base/applications/mspaint/lang/pt-PT.rc | 6 +++--- base/applications/mspaint/lang/ro-RO.rc | 1 + base/applications/mspaint/lang/ru-RU.rc | 6 +++--- base/applications/mspaint/lang/sk-SK.rc | 6 +++--- base/applications/mspaint/lang/sq-AL.rc | 6 +++--- base/applications/mspaint/lang/sv-SE.rc | 6 +++--- base/applications/mspaint/lang/tr-TR.rc | 6 +++--- base/applications/mspaint/lang/uk-UA.rc | 6 +++--- base/applications/mspaint/lang/vi-VN.rc | 6 +++--- base/applications/mspaint/lang/zh-CN.rc | 6 +++--- base/applications/mspaint/lang/zh-HK.rc | 6 +++--- base/applications/mspaint/lang/zh-TW.rc | 6 +++--- 29 files changed, 83 insertions(+), 81 deletions(-) diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index 333ecbad07e..31663fde2d3 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Bulgarian resource file * TRANSLATORS: Copyright 2009-2012 S. Stanev (CCTAHEB) @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint за Windivs" + IDS_INFOTITLE "Paint за ReactOS" IDS_INFOTEXT "Достъпен под GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Искате ли да запишете промените в %s?" IDS_DEFAULTFILENAME "Без име" @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Вертикален" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index 7e055c54ee0..c1d67ce1682 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Czech resource file * TRANSLATORS: Copyright 2009-2010 Radek Liška aka Black_Fox @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Malování" IDS_WINDOWTITLE "%s - Malování" - IDS_INFOTITLE "Windivs Malování" + IDS_INFOTITLE "ReactOS Malování" IDS_INFOTEXT "Dostupné pod licencí GNU Lesser General Public License (LGPL, viz. www.gnu.org)" IDS_SAVEPROMPTTEXT "Chcete uložit provedené změny v %s?" IDS_DEFAULTFILENAME "Bez názvu" @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 69a7192035e..fc46fe2f042 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: German resource file * TRANSLATOR: Copyright 2009 Benedikt Freisen @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint für Windivs" + IDS_INFOTITLE "Paint für ReactOS" IDS_INFOTEXT "Steht unter der GNU Lesser General Public License (LGPL, siehe www.gnu.org)" IDS_SAVEPROMPTTEXT "Möchten Sie die Änderungen an %s speichern?" IDS_DEFAULTFILENAME "Unbenannt" @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index 4d7769db9eb..c653732c4d8 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: English (United Kingdom) resource file * TRANSLATOR: Copyright 2009 Benedikt Freisen @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint for Windivs" + IDS_INFOTITLE "Paint for ReactOS" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Do you want to save the changes to %s?" IDS_DEFAULTFILENAME "Unnamed" @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d dots per inch" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index d0661fe2e7c..9de01a2499f 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: English (United States) resource file * TRANSLATORS: Copyright 2009 Benedikt Freisen @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint for Windivs" + IDS_INFOTITLE "Paint for ReactOS" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Do you want to save the changes to %s?" IDS_DEFAULTFILENAME "Unnamed" @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d dots per inch" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index fa32466b9e4..d30226ccaf7 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Spanish (Spain) resource file * TRANSLATORS: Copyright 2009 Gabriel Ilardi @@ -229,7 +229,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint para Windivs" + IDS_INFOTITLE "Paint para ReactOS" IDS_INFOTEXT "Disponible bajo los términos de la GNU Lesser General Public License (LGPL, ver www.gnu.org)" IDS_SAVEPROMPTTEXT "¿Guardar cambios a %s?" IDS_DEFAULTFILENAME "Sin título" @@ -264,5 +264,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 5e0e86be079..0c2b543cbe6 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Estonian resource file * TRANSLATOR: Copyright 2018 Joann Mõndresku @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint Windivs'ile" + IDS_INFOTITLE "Paint ReactOS'ile" IDS_INFOTEXT "On saadaval ""GNU Lesser General Public License"" litsentsi all (LGPL, vaata www.gnu.org)" IDS_SAVEPROMPTTEXT "Kas soovid salvesta muudatusi failis %s?" IDS_DEFAULTFILENAME "Nimetu" @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index ad3536624fd..273f8c9f20a 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Spanish (Basque) resource file * TRANSLATORS: Copyright 2009 Javier Remacha @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Windivs-ko Paint" + IDS_INFOTITLE "ReactOS-ko Paint" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, ver www.gnu.org)" IDS_SAVEPROMPTTEXT "%s aldaketak gorde nahi duzu?" IDS_DEFAULTFILENAME "Izegabea" @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 124a872777d..aee25ef236b 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: French resource file * TRANSLATORS: Copyright 2010-2014 Pierre Schweitzer @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint pour Windivs" + IDS_INFOTITLE "Paint pour ReactOS" IDS_INFOTEXT "Mis à disposition sous la Licence publique générale limitée GNU (LGPL, voir www.gnu.org)" IDS_SAVEPROMPTTEXT "Voulez-vous enregistrer les modifications de %s?" IDS_DEFAULTFILENAME "Sans titre" @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 18efa10b911..e02fcea3758 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Hebrew resource file * TRANSLATOR: Copyright 2013-2018 Baruch Rutman @@ -229,7 +229,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "צייר" IDS_WINDOWTITLE "%s - צייר" - IDS_INFOTITLE "צייר עבור Windivs" + IDS_INFOTITLE "צייר עבור ReactOS" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "האם ברצונך לשמור את השינויים של %s?" IDS_DEFAULTFILENAME "ללא שם" @@ -264,5 +264,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index 4e449cba455..ff132eda6f9 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Hungarian resource file * TRANSLATORS: Copyright 2009 Gábor Balogh (xxxx00) @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Windivs Paint" + IDS_INFOTITLE "ReactOS Paint" IDS_INFOTEXT "A GNU Lesser General Public License (LGPL) alatt érhető el (lásd www.gnu.org)" IDS_SAVEPROMPTTEXT "Kívánja menteni %s változásait?" IDS_DEFAULTFILENAME "Névtelen" @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 0fecc1ceca3..ad2d99b362a 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Indonesian resource file * TRANSLATOR: Copyright 2019 Mas Ahmad Muhammad @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint untuk Windivs" + IDS_INFOTITLE "Paint untuk ReactOS" IDS_INFOTEXT "Tersedia di bawah GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Ingin menyimpan perubahan untuk %s?" IDS_DEFAULTFILENAME "Tanpa Nama" @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 42ec466f222..45ff4d842e9 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Italian resource file * TRANSLATORS: Copyright 2009 Gabriel Ilardi @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint per Windivs" + IDS_INFOTITLE "Paint per ReactOS" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Volete salvare le modifiche a %s?" IDS_DEFAULTFILENAME "SenzaNome" @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 3bc28067aec..62ae6c4e47a 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Dutch resource file * TRANSLATOR: Copyright 2009 Wouter De Vlieger (reFly) @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint for Windivs" + IDS_INFOTITLE "Paint for ReactOS" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Wilt u de wijzigingen die zijn aangebracht in %s opslaan?" IDS_DEFAULTFILENAME "Naamloos" @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index f38b5af6928..b6014ef58e0 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Norwegian resource file * TRANSLATOR: Copyright 2009 Lars Martin Hambro (LMH1) @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint for Windivs" + IDS_INFOTITLE "Paint for ReactOS" IDS_INFOTEXT "Tilgjengelig under GNU Lesser General Public License (LGPL, se http://www.gnu.org/home.nb.html)" IDS_SAVEPROMPTTEXT "Vil du lagre endringene til %s?" IDS_DEFAULTFILENAME "Utennavn" @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index cb86cad2b9d..3506917b09d 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -264,4 +264,5 @@ BEGIN IDS_VERTICAL "Pionowe" IDS_PRINTRES "%d x %d piksel/cm" IDS_CANTPASTE "Nie można wkleić ze schowka. Format danych jest nieprawidłowy lub nieobsługiwany." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index 01bb5fcdfd2..0c8442b4b35 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Portuguese (Brazilian) resource file * TRANSLATORS: Copyright 2009 Wagner Leandro Bueno Angelo @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint para Windivs" + IDS_INFOTITLE "Paint para ReactOS" IDS_INFOTEXT "Disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)" IDS_SAVEPROMPTTEXT "Salvar as alterações em %s?" IDS_DEFAULTFILENAME "Imagem" @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 93b7f1292b7..e150cfa14a2 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Portuguese (Portugal) resource file * TRANSLATORS: Copyright 2009 Manuel D V Silva (mds) @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint para Windivs" + IDS_INFOTITLE "Paint para ReactOS" IDS_INFOTEXT "Disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)" IDS_SAVEPROMPTTEXT "Pretende guardar as alterações a %s?" IDS_DEFAULTFILENAME "Imagem" @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 47d6bc73159..3f6fdb07fed 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -263,4 +263,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixeli/cm" IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat." + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 77436936086..ded8d919f0f 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Russian resource file * TRANSLATORS: Copyright 2009 Dmitry Chapyshev @@ -230,7 +230,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint для Windivs" + IDS_INFOTITLE "Paint для ReactOS" IDS_INFOTEXT "Распространяется под лицензией GNU Lesser General Public License (LGPL, см. www.gnu.org)" IDS_SAVEPROMPTTEXT "Сохранить изменения в %s?" IDS_DEFAULTFILENAME "Безымянный" @@ -265,5 +265,5 @@ BEGIN IDS_VERTICAL "Вертикальный" IDS_PRINTRES "%d x %d точек/см" IDS_CANTPASTE "Не удалось вставить из буфера обмена. Формат данных либо некорректный, либо не поддерживается." - IDS_SAVEERROR "Не удалось сохранить точечный рисунок в файл:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index bd8e3f28bfa..1fb92dbb4f6 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Slovak resource file * TRANSLATOR: Copyright 2009 Mário Kačmár aka Kario @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Skicár" IDS_WINDOWTITLE "%s - Skicár" - IDS_INFOTITLE "Skicár systému Windivs" + IDS_INFOTITLE "Skicár systému ReactOS" IDS_INFOTEXT "Dostupný za podmienok GNU Lesser General Public License (LGPL, viď www.gnu.org)" IDS_SAVEPROMPTTEXT "Chcete uložiť vykonané zmeny do %s?" IDS_DEFAULTFILENAME "Bez názvu" @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index 44381ad680f..b2122a03273 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Albanian resource file * TRANSLATOR: Copyright 2013 Ardit Dani (ard1t) @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint për Windivs" + IDS_INFOTITLE "Paint për ReactOS" IDS_INFOTEXT "Ësht i disponueshme nën GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "A doni të ruani ndryshimet tek %s?" IDS_DEFAULTFILENAME "Unnamed" @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index 8f79b6a2b94..3d92c35f6c6 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Swedish resource file * TRANSLATORS: Copyright 2011 Michael Wu (Witch) @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint för Windivs" + IDS_INFOTITLE "Paint för ReactOS" IDS_INFOTEXT "Tillgänglig under GNU Lesser General Public License (LGPL, se www.gnu.org)" IDS_SAVEPROMPTTEXT "Vill du spara ändringarna till %s?" IDS_DEFAULTFILENAME "Namnlös" @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index ab2e89a717c..a87fb699142 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Turkish resource file * TRANSLATORS: Copyright 2013-2016, 2019 Erdem Ersoy (eersoy93) @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Windivs için Paint" + IDS_INFOTITLE "ReactOS için Paint" IDS_INFOTEXT "GNU Kısıtlı Genel Kamu Lisansı (LGPL, bakınız: www.gnu.org) altındadır." IDS_SAVEPROMPTTEXT "%s için yapılan değişiklikleri kaydetmek ister misiniz?" IDS_DEFAULTFILENAME "Adsız" @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "Düşey" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index 412943c8bc3..a998b99363a 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Ukrainian resource file * TRANSLATORS: Copyright 2009 Artem Reznikov @@ -228,7 +228,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint для Windivs" + IDS_INFOTITLE "Paint для ReactOS" IDS_INFOTEXT "Доступний згідно з GNU Lesser General Public License (LGPL, дивіться www.gnu.org)" IDS_SAVEPROMPTTEXT "Зберегти зміни до %s?" IDS_DEFAULTFILENAME "Без_імені" @@ -263,5 +263,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index c72aa3648ec..0db569f74f3 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Vietnamese (Vietnam) resource file * TRANSLATOR: Copyright 2018 Nguyễn Thanh Sơn @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Vẽ" IDS_WINDOWTITLE "%s - Vẽ" - IDS_INFOTITLE "Trình Vẽ cho Windivs" + IDS_INFOTITLE "Trình Vẽ cho ReactOS" IDS_INFOTEXT "Được cung cấp theo điều lệ trong GNU Lesser General Public License (LGPL, xem www.gnu.org)" IDS_SAVEPROMPTTEXT "Bạn có muốn lưu lại những thay đổi trong %s?" IDS_DEFAULTFILENAME "Khongten" @@ -261,5 +261,5 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 31d41c54c40..d40e2390b77 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Chinese (Simplified) resource file * TRANSLATORS: Copyright 2011 Song Fuchang (0xfc) @@ -229,7 +229,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "画图" IDS_WINDOWTITLE "%s - 画图" - IDS_INFOTITLE "Windivs 画图" + IDS_INFOTITLE "ReactOS 画图" IDS_INFOTEXT "GNU LGPL 许可证下发布的（详见 www.gnu.org）" IDS_SAVEPROMPTTEXT "您想把改变保存到 %s 吗？" IDS_DEFAULTFILENAME "未命名" @@ -264,5 +264,5 @@ BEGIN IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index c82ade4fcf4..85dd5341843 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Chinese (Hong Kong) resource file * TRANSLATORS: Copyright 2021 Chan Chilung @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "小畫家" IDS_WINDOWTITLE "%s - 小畫家" - IDS_INFOTITLE "Windivs 小畫家" + IDS_INFOTITLE "ReactOS 小畫家" IDS_INFOTEXT "GNU LGPL 下發佈的（詳見 www.gnu.org）" IDS_SAVEPROMPTTEXT "您想將變更儲存到 %s 嗎？" IDS_DEFAULTFILENAME "未命名" @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 58225aa24fc..b044da06910 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Chinese (Traditional) resource file * TRANSLATORS: Copyright 2011 Elton Chung @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "小畫家" IDS_WINDOWTITLE "%s - 小畫家" - IDS_INFOTITLE "Windivs 小畫家" + IDS_INFOTITLE "ReactOS 小畫家" IDS_INFOTEXT "以 GNU LGPL 條款發布（詳見 www.gnu.org）" IDS_SAVEPROMPTTEXT "您想把變更儲存到 %s 嗎？" IDS_DEFAULTFILENAME "未命名" @@ -262,5 +262,5 @@ BEGIN IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" END From 7a4d86f4962d3c7925ce849c7d7ef3d431961d7e Mon Sep 17 00:00:00 2001 From: Stanislav Motylkov Date: Thu, 6 Jul 2023 01:04:13 +0300 Subject: [PATCH 28/74] [MSPAINT] Update Russian (ru-RU) translation --- base/applications/mspaint/lang/ru-RU.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index ded8d919f0f..654ea538794 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -265,5 +265,5 @@ BEGIN IDS_VERTICAL "Вертикальный" IDS_PRINTRES "%d x %d точек/см" IDS_CANTPASTE "Не удалось вставить из буфера обмена. Формат данных либо некорректный, либо не поддерживается." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Не удалось сохранить точечный рисунок в файл:\n\n%s" END From 134b3980a2c7e3520788c0a483e03311f4297a27 Mon Sep 17 00:00:00 2001 From: Andrew Dent Date: Wed, 26 Jul 2023 17:58:29 +0100 Subject: [PATCH 29/74] [MSPAINT] Optimize images for help docs (#5486) Lossless optimization of png images using `pngslim`. Saves some bytes. No code changes. --- base/applications/mspaint/help/airbrush.png | Bin 556 -> 416 bytes base/applications/mspaint/help/appwindow.png | Bin 17648 -> 15047 bytes base/applications/mspaint/help/bezier.png | Bin 283 -> 137 bytes base/applications/mspaint/help/brush.png | Bin 567 -> 423 bytes base/applications/mspaint/help/color.png | Bin 497 -> 378 bytes base/applications/mspaint/help/ellipse.png | Bin 561 -> 391 bytes base/applications/mspaint/help/fill.png | Bin 651 -> 489 bytes base/applications/mspaint/help/freesel.png | Bin 401 -> 276 bytes base/applications/mspaint/help/line.png | Bin 181 -> 92 bytes base/applications/mspaint/help/palette.png | Bin 1646 -> 1029 bytes base/applications/mspaint/help/pen.png | Bin 591 -> 394 bytes base/applications/mspaint/help/rect.png | Bin 370 -> 287 bytes base/applications/mspaint/help/rectsel.png | Bin 377 -> 252 bytes base/applications/mspaint/help/rrect.png | Bin 414 -> 326 bytes base/applications/mspaint/help/rubber.png | Bin 569 -> 436 bytes base/applications/mspaint/help/settings1.png | Bin 3284 -> 2548 bytes base/applications/mspaint/help/settings2.png | Bin 850 -> 656 bytes base/applications/mspaint/help/settings3.png | Bin 967 -> 742 bytes base/applications/mspaint/help/settings4.png | Bin 1219 -> 891 bytes base/applications/mspaint/help/settings5.png | Bin 834 -> 657 bytes base/applications/mspaint/help/settings6.png | Bin 864 -> 671 bytes base/applications/mspaint/help/shape.png | Bin 455 -> 325 bytes base/applications/mspaint/help/text.png | Bin 621 -> 429 bytes base/applications/mspaint/help/toolbox.png | Bin 6512 -> 5644 bytes base/applications/mspaint/help/zoom.png | Bin 674 -> 506 bytes 25 files changed, 0 insertions(+), 0 deletions(-) diff --git a/base/applications/mspaint/help/airbrush.png b/base/applications/mspaint/help/airbrush.png index 86aaf3fd52718e47de263d31fcae65dc03500ef3..f98c1ae83565d24c95faaa831bfbc28014672d28 100644 GIT binary patch delta 390 zcmV;10eSwc1fT#9|& zc<*0>OB`erRP*fFGp=8|j(+*1T;48T|;~cF)Es29oliq@7qI^qJn#UUNQldZl9B?pZrv(#opw{U-&Ly~8I06z+=fY;F4L${ kBmIAR_X$QY4T9An0%IcaKidd*XaE2J07*qoM6N<$f(1XxQ~&?~ delta 532 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 z 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 Z1b$`}GM`S{XO#c|002ovPDHLkV1lI1FjW8m delta 267 zcmeBVoXs>rvYw5BfkFQB|3o0gSRCZ;#IWw1%u67LEy>&6h2cL4F4((#GEjuGz$3Dl zfq`2Xgc%uT&5-~KvX^-Jy0YJ7k`~aGsAXUD4Jb6*)5S5w;`GwV2YHVu2r$pB&SQVs zuwA-=>k?aTfP2v8YmV$Swd*JQo$5TT_OG7lTSYj7@XVP}*|Y9ep5;3((XGNTVYh$p zI*-Jr{H@nMtUssPbvyJ`lt;2Z--}}NU~2`1u4nBB==i5iQUb0j?R^BD6p&G~~Z4 z4xsRT@SbOkLGK-NPAr*o4y8PIL9G?vfpZS;JyJ@DF~VBAYmV?31B8$*SYwPqYYizS sgb-)AwFXM*5AP|Z5JEuC`I`O$sd?p`n2|wK00000Ne4wvM6N<$g6r?Q8UO$Q delta 543 zcmV+)0^t3p1GfZ_BYyw^b5ch_0Itp)=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2iXD}5GxD$x#K7R00Fm2L_t(I%f*tZ_dmseEEOaDlnS8+}e02Y&th zk$hfxz|3S1d-E$_)}G1O30@ZRvi>el&~!3y{z9>9^o$vPPfXF#PK{2mwY@`N;X0hY zOwJ0>Xw*wFtdlkF^i)dAkYI>u)&lp6AliRol=6Po6%O zvvcRrb)9m#Ot-Vo@e?QcVJva;&O_Tsi9f3q7UnNvSr*l56>LJiQDgDSa=+)u6<*|X z;&7;FnntNqqE@%q-K!J7b^DO`V}syCA|We<0^h!GVSl&VsZ@5@ZT<@n91x90#p!es z3WeAxZII1onVd4XclZ9llOJ*riA1DWEaLb32?m4cx{j)<>@}K4dg?of$K#SprEt65 zWHK4NUN7x-n^vpE?ChE0w@#+TW zivc}_o^J8s(GjouTo9ETXsQBDmGRT6n+K#b85+8QONR^MArGypK&XFBd!uteHk)Ol zIRiKVp%$R2GJnLQ452C*>U~4{>_oD43UE4|(#UfN#?w8t_EfD}z@WX3^jT5@fQ|vd zV2E?`e)JcEZLDC(E|5A+m@hxHzfaL5ub;@{0=eM!aCmfzV-r&}#o=&-^$#-tLMHFX zMUR&NFg`hLjw6vM8!b|)k*7t{z2sxphjI{&^8Jgv6I*1eM0&gya3Y!H=Qml>$xNB_ z`uyGFi(HPy`w}Y#d0ruxS5|51K>~qYR$s}>e2G5)nk8%l0NpUKv%QYTvW#$OPr`rJ YFGwcj*&3CLZ2$lO07*qoM6N<$f*u#t1poj5 diff --git a/base/applications/mspaint/help/ellipse.png b/base/applications/mspaint/help/ellipse.png index f2c8921e7e442107d1a87f999960f4f5a7be6d24..6a8f3a2d751d79183ae60e8dd44c03b5ced8cf08 100644 GIT binary patch delta 375 zcmV--0f_#w1cw8V8Gix*005AYXf^-<00wkYPE!B?00000Zl(v30003zNkl@dU>91r=kRH`21X#h_u_N^=0_2B(#lf&zy2`%1fySnp?~CsiAuHq%rAs{RX7@f(Q#F+kWr{mL4;?*7qbb?pczz5mIoA;bS0EDhBIMt^|X z{(%^3dgiz9K0s*r{p0)ZKmS4M{=tm@17d(gpy>avA72p~co^QDz4;Vu16Uer4?^4d zV|x{(#Sj{D!f$!aT@P=896S`YaLig~Q8y+d`CH)&`Z@;q V$h58~YrOyf002ovPDHLkV1ms(x4i%W delta 547 zcmV+;0^I$F1F-~<8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000JJOGiWi{{a60|De66 zlK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RU0vix2GQX!cD#i~IArTg6#1I(NMVx>{iHr^m`VXM1i+?dRk%@$lfnaFjqLU`# zq%Z&>g*s5a3Pws(tfoe^C=C~++;i`J9d0QpgqejWd2>$QoagsGC+EOPOFP_nJsOta zQUX0~W7)#)R+2(n=T?0c9S_>HV*#_#r1(Fs(oj>5x5C4P(qi)5Zc_RlUlYFw&4rl> zPVnq;J57z(bALf=>$*Jhf0pS;O4fCe@0%jgq{#A5k-3D(r?|*uOr-x^SQ=U$%HncF z_Pu!kXR7aZw%n+s_R2Yw1%`#Q+Romvz%apczKnvxVqU!*B=%*&2jBwO+;iitIO~|q z1Cz>>X*)1wL3Q0tqOo{3eLjFn@1jh>)<9(rD%*jnLw_)32}XJ+3vdCH@R!-hk8A>E zfiiRB?}O%pV^o%3$^~@XZ{+QVDHd10Ig>N@&!)*hmSzIHAM(-H{ru=N20|;+^ch{_l4V#_oZsoYd6p@J9bLQm;mdEKWh)-N{&w&A*MIvjzImlhLQ#F?K+vv5 zR`Xj`I)CKV5tH`O^K5C$7KKu?b_?G}CxStzu)U2vDQu=I9J~xHdC(qeEP(T#j~z9F1 zkwHk4aTvyb|8L(?=NuB1MFbu45ClRxDm-LRQAP-n5m}OvD}OA=q`IhNSrpm9!i!SZ zunv`YN`$<~s6%#$qJu>v+jP^p$@gua`}VzEY6P)NpVJHP^E|x#Uic4Pe{M;>owiiC zeQ;jVW-{+yU#cK&B+1&Dl^0m4e-~&=Uyz{Z+%_6-jL5PJPTv|8%SbxU%rPTM1Q8@j4X7peP<1xLJe<`j?d%f z(Lg`9J6rJ;yK!ltP}q)xna*;y`8=+=J*8bUkp!`*L4W@tv$~a^)4wY3^ zEZPpXBe-=9`9+}NWFwz~FO&kf)3Q#cW;66XjVpj%b*)md_Y9r_9dDrvpGT+E>t=O{ zn>9W+O?Ib_Gx>g0aUrtIWi#R2*u#>P|X&lhc}JRlWy-4qqL@OoSf^)?Zne5Y8BHkSM4V8fFwTEa#KL6kwp~TYH&IaZZMjl zglXEDGiTsZ2np5t4L}l?LBiTG>7|n)Y^bPq&SJO*T-pSb1AN>1L4g6*5H|x=172rC zC}K2lOL;&wDEl@Or9r|KszJ`Bk{AsfqK;4vN6+38Gfu(dFrYZ6r~^V4q7)e9!dg-P zaR5k!U+11002ov JPDHLkV1fW>Ws3j+ delta 385 zcmV-{0e=3J0+9od8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000JJOGiWi{{a60|De66 zlK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RU0vix27K5a|umAu75lKWrR5;76 zk}*pIK@f%Ch7gD%5<(z^_}F_jcaQ7=-``zl||QF{Hxc--lQx@sG-;))Zf00000NkvXXu0mjfy2Yg| diff --git a/base/applications/mspaint/help/line.png b/base/applications/mspaint/help/line.png index bc53d8e344a5363967f35a8bd41449655a32b432..564addbceda5a6a9bd9ba940b3627d07207a4f6b 100644 GIT binary patch delta 73 zcmdnW7&AfAnT3IYVe2pRS3pYH)5S5Q;#P9RulcX-nd=I^?H5#3<^3;xBG_ovkr)4O cIxb;hXl&Bm=h5CQ1ys)9>FVdQ&MBb@0QIpOyZ`_I delta 163 zcma#q$~Zx?o{fQlLH_gqL?Fdj9OUlAui(P=vFro z%-x;noBP?#&8?!MVkU#Z)}>dKHv0Tuyz%L(s;^Jx+_`hd%)T}psM)?G$S;_YiH%Rr zEOgzp@_h^}Vn#e1tjts8xgzwW^3pu*{L2;z^)!Y^o0O~ynk1{f$4z-{zQ*32oEv3K zckEuXp}T>%srP0&0|Qf>r;B4q#jUrqL(5(}2(Yp~>_~lPV4UpTKU47A{=VmCbFKLf zPhWnz!ajKUA?4&vy^0dH;)2aEpxNrk!7E|n^UoEFW$`*rQM$sHY&vOU>rg)gRQZhw|4<#@!; zr+w~{>yvnXs4ZIgGHKnWr)jd2=eFpomwfHLq*BZL;UC+Fe|#VQF@E^R@S%?XLml6T zI<61@SU&t?{ZPmH;UCwBI>rxmoC4M>k6&I|wC_RtpS8!gMER|oyr_Bd-d`abU%kB@ zcD}P@)8-8(`z^Nj`0WsGb=mCK*Z26=nGXT+>Y9q3X>)V>`>wiK`SJXyYLefcH`k}9 zulKw4!jRHM;p#7*e6*hEw?z2m64$1=9_qT2{sB3!%A5{7cze5SlF?j0wz<`%i;N0> z%gxRB@O`qjwc{1PpqB6U4d0_1zFRkZ&u{oH-|#)Y;k$do_wxSd^c|R z?%%NPol4+AKa*0Yg4arOOY&a0Sb?p2k~ml466bv((U(sy%`UlAKiTht+T57Vb@le1 zTb~uFGg-|PQTKUXzxWYLNzT7c`(muR zUvo<@-nD7tf_Zm~HoXf|4WBbFs_S@(YFyB{ACiF=PE=&?y!5OlHzqvm^Qp*y!&_>~ z@2;M*y4zTJm(k`G^CZpY9w;-`uFQXz5E0JzY|7@Rx|(%|b9_usMgEF(HtDnm{r-UW|b#j)f delta 1640 zcmV-u2ABDT2<{A!8Gi-<0088_eTe`700DDSM?wIu&K&6g000JJOGiWi{{a60|De66 zlK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RU0vrq&0{rD%5dZ)H8FWQhbVF}# zZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b1<6T7K~#9!?SGw5OdCfS#ovNUsYv0H z6h#U(Qq^2=gxf=~f_mmuluIR~=2Q~p7PXg1sF56Ui4;ZYHKj^(A(bjPAQUPT_0ORf za&szNlu8iw&=RGT1h8Y{8gCDt2{X&ucs#}?-uIJ6yI%Y4t{3xo^UZp2P#y<_5VDJF zY8DPng%DE4M1S^}N~na9IG%NfhC)c7jYMs}hN7B@vzS;Y@VXH~B#~&W3qV0M7r>74 zSTmInFBc)C3~vjw$cvU!)(dJn3Hfww2q8q$EsSFuKo&qoETI?*0JuyhgphLdh%}N0 zkOHtFwimqJ9j#`f?qPanz9DBGkH;}SK2AOL)Hg_bwC6UPHz*95v z?dHVe@rK!CcUv)$|k22S)nA#BEK#-t)eZe)ayOrpK7s^-GTE z*AKsTnSbd!AL#lm!{e{$$NzryT_b(u*_5V#Z}wv&{cQM({`s4KVfOhu{#erwUrHJ2 zua71*eRN>LNPlmlU(POB@p%)3 zkjB%6;)qU%NGGb1sAjVN&~Uwz2_fWA(T?IsPJf$dtzHw6wCuMhZ*nkQPS4CUnGo{& zA`?ifvhHgp6(&7)J{kf5|R{FujZ7coi{Yks-<%r$&OLji6)34YaKk{tK zNHnVk(n$aO$V-Ke_akk^buF8BPDgcfT9y!+l#; zp`qera!}Jaax{mK=D;YK9K?-hG!jCZ1Ecv&4&u&Lj^Yp!5HmUG@6<4v5W-}_WI_mG zG9iT27Nh%2_Dd$!7y?Ig2nmRpRDY68Y=(_#B!n=T7!MnBf+RwkmzvZ}Xe5M?nvCY~ zKl%|uDyo^(bLn^NYRRV7tn|Gnj#}wsmv36>lc&0^^v_QYTj`&yMeNRhsl!U|EFH1Z z4;;H_r60_!Sn1E7&RFTMj-Ij7hx@kbY9=M;GhtF7B$(8EJ`>h32qC656MvVNfe=yx zx5T=ynGixqIWut;BXMaagpg|3QCdN1drU>EnM9(oP5_+%x&ib62#aO6*xruae|GNh zIup{g6i_UzZlhRa&55>CiJ7QzCNG3p0BHbnj4218l}18HAi6g@!UML14@gtV`y~{w znG_TwNdwpvX~Y4L0nkP>A%7%LW+J`dU*QL7kDi@EdXzz zSZAS`5Yqf+QULIu@Pkd^2PyGbH50c~GRcV-Zzx8xp`;R;2_eBT6E&TrgcoGQwvyc( zD9I!%9_PhQ-W0EuMnW?or1{N6?XAc{YzDh`y%tn~<5_ovVT43$Q(@K}rV>H|nNH-O zjI5{T{kl1hkFiM8@N0yS;GvG(>|pOm&K@)ICKPp@T^mB!z3-~phQX`gb>wO m0H2%IT6t{UH5?cTNPOj+4(5&o`FO`NK)oI5n7-0Awp?CUE-j3?Xg_Lj$~`snWEbL-u2 zZ_mH7*yCis()=95o*Y-4sy8lbUDf4xXIuWoxwc1p6encLO{opSsd`F7S1cyS*v(>{OlYjdFGIs_PbY<5b;U^&t* zwyW5cKy*&8_q=nY`P#1HdG(I-y3+`#UeKHAXe{1eVl%BV^2mW5gcDY*6YrMgeZ(hQ Y0EwT8bUD4@ZvX%Q07*qoM6N<$f?UAH4FCWD delta 577 zcmV-H0>1r<1J4AI8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000JJOGiWi{{a60|De66 zlK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RU0vix1IRjYGDgXch&q+iJW&e9ki^A#|~!H zZlfaTuqX@1ENjECQOjBBY#M)^`QMz=G&_>?yB^<~1-N>=?%^WPRT-NP^c++l^lhy)68zLI+qkkyD zw`dlps&7+TW?3;S1;E+aBH5e9F>NnIee1yOdCzo89+%r(%4%<3127isA}!U3HtfSU zFpa@{JUS^DK-bY$D|a6_nTcuWjoB1huW;Z{g_3kRstz0FiQ|_1YcqcX$R)0C27&!# P00000NkvXXu0mjf;^7L^ diff --git a/base/applications/mspaint/help/rect.png b/base/applications/mspaint/help/rect.png index b3e4c025355c221c3390e97a301d57a9131d3b97..ccc831ff5e9c0e5bb5e3446fc547b381abddcb5d 100644 GIT binary patch delta 259 zcmV+e0sQ{*0-pkqB!A{fL_t(|+U-)sRfaJT9HfD-C)%I_3c#%b?i}d>t$|{&*b*Uw z3=+=hzwgcZP88oRb5#2mt<{o|{B6h06T&UbJz2)q5&a!3^jyzho*Z%(i=Z@MeQ6Pv zC!{jL3Xn2-j2?rreCF3ymhmF0P;yhK~y-)?UKP!#4rp+-!f@n zd!h|0paHlrLj~M9Qp6spfo8C=Y$>wCA=$*c**h0BqmeCre}8|;hQGE0!0YEUwd$xu zRKn~zVrh;l0h2(HA1ntn1-?%22Y>;937+o<%#Ub2VinZE9JGSfZLJPZj}NPYI{-JC zK^4X>_HGqMU-l}O1XcuZFt!=sXJETcXqqnxMwJcF!1{x&%P$z$bVX3oPX3u>bns;c zE7@K_UKMzMYfz`imzq_ulJ+flC)2Kn*VVj%-%?;*&wfLR^>gT6VE`~qyu5v^AIWm0 pq=-ty^7oRDSPqmFu_FB2X1^!=Bb?QiSHS=P002ovPDHLkV1k>IkQo2~ diff --git a/base/applications/mspaint/help/rectsel.png b/base/applications/mspaint/help/rectsel.png index 72eb64dd9e490901cad617abf24ac9be680ccae3..2ba5ebe4377f8cf4ee46618a2d3f9ebdb1407968 100644 GIT binary patch delta 235 zcmey#^oMbRWIYoD1H*)g8D>C=tt7}V7)S#_-ZJ)yKx(6>i(^OyW3qzeA9cY7lMnK{ zHTV7FnXvH6KG)3^t$vSW6rxQRI3L{Wc5NNU2{B_Ip^M$(7yBBs1ejN;on)JNlf6O3 zaXR;^Rwq-9?fHss%?(8Y5zHb2*A6Uy!G3kYY>V~a7i> zb{vWI_{_X~1+z}XTQ1LTcFxHqfrnKToFlBGJd~XrOj$(Kxaw>+-MbT{P+r_&Rm5>~ j)5mD0n@g6f&SGYmv^Id}n9_zPAYXX8`njxgN@xNAHz-w> delta 361 zcmV-v0ha#!0r>)u8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000JJOGiWi{{a60|De66 zlK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RU0vix19;Q-dK>z>%`AI}UR5;7U zlRYnkVHAch)o45Ti11pvG!hn;+C@yJ(#2$v_ZRpV4E_NYqkq99v07Nf!qibB@zEgh zcuM-5_cpXi+4}Y!T+><3mE3pEfs71EQWilTVB)Gl@#%xdjU{Gx&nPq^9pqnNq+ z9_^OHTAurheP*gLi5Zyja(4`p6rEmcP;vkxP1niOCjgW4n*ihh3SB`OWY!&i(f6{X zu}ZD8BT0+f2V$uOe>w0*M8_-!HTO!vFIFk6IF6gisjL00000NkvXX Hu0mjfCn1<# diff --git a/base/applications/mspaint/help/rrect.png b/base/applications/mspaint/help/rrect.png index c1c278931bbcb355264f9d23cd13efeb3f9637f9..e785cad7288d6f97c68d7de5ba5327f422cff8c1 100644 GIT binary patch delta 300 zcmV+{0n`4T1I7Z7BYy!6NklTB!T#kBwD?US|6sh-$GM51#6K3NhOsd}+EO`i_8bH* z00#R2?En)&Q{;*BB7XeuX-~%v9 zfPBElZ~#&4Id2{`T2>EOEuu!TWOy;lxz2}3d$j|~YtT2mNC3q-m5wzTNLaqkUu%pg z>zNqJYf9inQ`5{b_bBpIXD~U~jf=NJGc}kLy&naHD=EmrOh_wsUHHFv(-BCb0VbXw yUqK1zGms5RTqQ8}Cx*i8REDbZVn#$-90dS#`w&>9SeCm00000Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2iXD}5Gf5J>?EH600ACJL_t(I%k7fAN(C_xg}=SE zwIJwYEIxvTc7l~)Ar@+*Cn5;*jvw{4Eq!5sL2QAr9LEb8m@YO(()HUnC>TEcI z1Tt-Zc|lD)NMFHfyukBUH?z!8($ppzjt};RAL;V;sl2#;tUgViqO%mEQfxlKs3uQ1 i+~48!fz;fr`Nlj-{v{HQMoHuqC5`3)-)w#6hz^fxyr5`w1R(8 zxpop?d&{3kZi2Q0Do;!QSoRje`(2UAlkb|2WX@ z3U?QG5XOix0v_Sp8};_df@{-d&Hcs?2IH~l>i9|!35+p;8-8{3uBkSR9#vZ1r9tv_ zpgk0*FDeEQOn(Fd;q>&;_bKN5{L!s!QDNun;PomSao7nTg97%}&qOI4?VoBD^>64K z2$&M3h?1y8MJXUrQ3va1X&K3}u~GYnuO&6F=r7c}0`(@}cqr2E3tuijmbtWB^Y{kW z#xzl=G`4`xdT~AZ+QDF;hA*%4XV)urW{VS*9JbCiTOQc1HlbLWVITnj=;5}rQ1%M* P00000NkvXXu0mjfAfd|r delta 555 zcmV+`0@VGq1Gxl{8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000JJOGiWi{{a60|De66 zlK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RU0vix0H~ss}YybcOxk*GpR5;7c zlh0}sQ5431=T4HDR$K_;8~6kTpTNfucS1${^9C-9i_(QVQGWzcaG@JTD5wjiU@$7F zrM4+H+N7ywl1?&{%uF)Lz1KycpfzG~<5{2Y_rdwT1OGVkH%qnhdE04qX*C1Ro?DS4 z0h*NycI!h0&nu8~^Smo<(P_u*hZ#5S1)}~WZg0=qH!n*hgCR*eBug{q=1vo*V|oJv zKyI2i*tuw5J%3pt(*|QKMjMQ_6kn{dT1z?ZInx2%-AlH#T%?e95D`XN(~na&)*Ea$ zGiD18y@3Y6`BfZ!yJA1RT?Y{`1|VGpDX~bH-`a^C%4u49{0SM~z z7AuIFxQY@)gpKkSa`}nJW;NpG!_J}Da{#XAVl5~&aaE#ND^@sp>I7+$QeOSe(u3f) zolyYeu|bbCN-12=r7+{tixOs!dAu*}uyD6MwQveRXPPuhscr58;La3C`a@nn|H$=Q tEjiLJJS4kw# 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 P00000NkvXXu0mjfX23gA diff --git a/base/applications/mspaint/help/settings2.png b/base/applications/mspaint/help/settings2.png index 35ccaa63037f7d8027025b0811aedfbac384686f..d82b2bd3b1f1ba089659e2bec8c4d2236f084864 100644 GIT binary patch delta 632 zcmcb_Hi315ay?VHr;B4qMcmsv`?I1FW!gW^+aF z1~Ba9&;+V^z9AZaRG&reCr30-OIbVJShOkP8md%sv|q2x+hRn6T0`Y?-o_ zVwXo@pV%*nq%O&45f9D}Vd@hYNf3ttTVN%~hlloFI1|aZs^>bP0l+XkK DspkI0 delta 828 zcmV-C1H=4~1=0qPBYyw^b5ch_0Itp)=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L z01m?d01m?e$8V@)00007bV*G`2iXD~3l9h!{3jd$00PoUL_t(|+U=aZZWBQih0oZF zF+wCAsiM%(xp0O22$U45c>x|`pMn>lPC>~d1gao~ie~`HB!9~q6Yo&$9ddWF<4qzt z9?zbUuJ*^ay!V@PXJ-9#4AwV;G@89@f+i6VwhKfSNZxq+W(OfyFIpjJ0OtJcv`Rtm zlj&?9KqX-TtkiJ>M20lmGfD7DVyX5kt%9sY_9?UjN%jwb1%OhvP!IsXrmBEL>GcA@ zC4jk{ul!QT)_;xkCm%mWpJ|@w`1bX)fBJ>=`Y!-KRnNOH{umG}f#Wx?cU1uefUz7e z0Q?px1C_7M5?u5Ez;gf>D)~8pk#zV#PxGk)*q3c7D$vPm0Le~+W0?U)5<@?6*9M6K za6LU#`@IBUy2?9ysM?=QXN}|Yv(rt!ow@DUmZ}2oB!3kG=yQ9pX>h|ePX!PF0T2KI z5C8!X00Bg~67=r`V_F@u1PFit2!OLdUq1_=0tkQr2w)?F;H%>g_j=uzlebg=0i?DL zD89d6`}otB@2CI*AOHd&00JO@MAre^p696m0@y+cY~!wu3Lt<8XMxanf_~fPr^YM+ z0w4eaAb$V?AOHg3N^lb`=HCTS0R%t*1V8{?vp}Bb{RYtD%#dUW*aY(m`Udr74Dbz< zY~KK^RA}dz^;TMw>1+?c9%>(+LjXszJ&^NbT>s@hM$3%~P5+>!#OgKxv}~OF(gL*` zi!&ryqIP945leq1*L@+^?m%3%DZvL&spJdPK7Tx8Nw~zdA4lu}-1YyE910J@|FI$S zdfx#kQ9Cd>6QTuxCjcHH;KdOUfC|80G>w!l=pb~A1 zT{UVUL&e78sI50sw$$|PH9JjJQ*)KQu@D;e_fx!cWFr-p4F<2xcVc zN7#GWXDC2~7S7Q`h#(mu%K>`mqJs!$2;sv!6rh+4Fq_Sc$J!U*79$LCjR;LtQARNt zpa6GY0797TP=E#I7-NVIE)b#u7lmYi(xCvA_aBa7LVz_^m}7)4TByNCDR~jA!EgC!>Dqm9O^1c)tD1AN0LtT4p@S2+FW0DG2+0iN)HdrWbY z7QlIFfRy#307U-de*}1r1-LUJ0DSQ{WI`vD|?1dsp< zvKT-DNB{{yq%;QtNC1Uc5+EK<0>~{O0puwl0puWLYJUI;AOR$R1dsp{Kmz3OAf&!| ztKJ2)Z(jfFu>Q?!4WRq7*B(H_<_!-(s9b**mvew_5DAj^B7=< zt=iw`?SH2}KmqSiM}!{6_=q(=;}JVN;n_etJgSb+D8WY!Ep#!$3@fa$!4?mO+G3+R zM8!n~AuiCt5M#`-z!EFm8)}86$`~C7MU+uR6A`X4#0a;TV2V3KO))uokW&0C03RXF z5TS!Edgx<-8$%7yR~@BQfQvE$glOU%EktPJ5=d8ux&LmdsA8m@8t zI6c5gMDS2X1wH~>C=67Tk(w!2gYD9P_1uru{S8l-r|K0x(VYMQ002ovPDHLkV1n{5 BCI|ok delta 946 zcmV;j15Nzq1;+=FBYyw^b5ch_0Itp)=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L z01m?d01m?e$8V@)00007bV*G`2iXD~3l20Yh-%sZ00T!!L_t(|+U=aNa??N%hX0dA zFvE~^q{=`;=fV}^N1&ug%?t1ldJ0~EIt3+a;g=qmw3?=>K+a@6OKr2HTrK7|k{nXaWIYt3bph;*B#lErej5UI>8$Fw@C63nAYJ z!_gUljJgG|V)q*$VuabAkic8&OE%7U7Q_Wz7aN=k0HojE-Hji=cqE`-5wgu!s+ z1AwVp+ag~f;li6hI5e;b!rOE*mII)y;MFOFT*#qC9W(=6u}xNi>0~TQ{Lagu(4{ZT z8lV6afPfkx;B==Mpa2wrfPFyKzFgWS=U^M5eGWp>V2PdrK90{?1G;<^)(r5K0g_h- z&45rMsec)u02F`%Pyh-*0UQs2r!PHa0vHTOjW$V=U`59eF9}v8UA(Aohkc6?`+0!G zNO}VxHIiNcNRFfz0Qz}=?gSNp0#E>52GG_M-+x^OcYz=oT;nOQ3k1pFcB%osAnXdx zOA+)5LF_6ZHL6~hL5WfIz7LQV)uU{L+ImvdoqwPLPyh-*0d%=-{U@m;NxBW7z?mV) zDPRNCRq7kml^Wn0DA}$7Sh3EXW42pq4Thsr0H;{{@LT|RM%QzC-lyM@>N}KS(?4iQ zeN_hlPn+C*X@RvHOKwQA#M+g?2u}SKz4tY}dk*5ZC=*-&855sk?ZeY2!E^lc07*qoM6N<$f|nnnf&c&j diff --git a/base/applications/mspaint/help/settings4.png b/base/applications/mspaint/help/settings4.png index a90613e268d604bbe8c3024c06cd9dc6b49ed63d..3309c9b00424055ef1817a537ef5f7bc9f8eb34a 100644 GIT binary patch delta 869 zcmV-r1DgE93Ht_+BYy)zNkl~P$@tPU99(K@0ik2I}a)2QQ=p(~6QY46_05$h7n$2e3V|yvUDaIJ#5E;5?qk)(u?(POv#D)TV z#R8X@V2BLw(SJg0J-|2I;0k9r!X7qXOMvhAj5($_#sRioOMpk*;Tlt%KnzeZ7~p9s zz=CV)Hsr3|pVaOY8d3|M*;zsG|B&O)6C5Q&T7 zxh9VP2SM!wC}ONXfV(&a@fGD!d4}*{0@%doiV2Vj(|-Z~4ua}kKwhk3Dm)0FSv=&C z7Ip_YhSw7y)4%e@FNHPde7?39K(jl*ZUBh;zx@Dm2oC~;H$*~!5Fi8y0YZRcg#aNy z2oM6up9cB)hRDBKcxiqXC~)Co0KS$U?N0#DA@2?*0?4nvJONH1dlR78-wgy%d<-T% zhn)$K7k}$AcnmOeA*9)VSDym?zYfSBLBId64pgRHKp9CfQR@rfjMCvlKx8%hMJEJm5Chug@Eh{{{+p zhYe&HVuDXt;0x~YfJZ!e=mGb6Z=q2~f)08ZV2l~&Sl|Y?xbxI4Zt~tlB|;M^cG1TO z6I|dDSD544Q*&J9xs6T*H8jvh7a0yQ!WgGG!xZP9n&M1Tjp_9KeYX vqk$$8v`R*IL&b1QO<@|0$bWZPBgE|w1uzHB0?_FN00000NkvXXu0mjf7fE-{ delta 1200 zcmV;h1W)_>2Ez%EBYyw^b5ch_0Itp)=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L z01m?d01m?e$8V@)00007bV*G`2iXD~3l1ngi8hr000cuxL_t(|+U;C1Zrd;veNxoa zMbKnxrl4K2dGJ*D2pv0Q?gerPpCT9NoS|cn;C6BWcgh)Bz<*6tyKZcCFqwY;kQ6P6 z3{8muVM&k^z4sqK$uHw2Ft-G8v|?9)NhCxRWkh5e@CiFk_K<{vbtMUufMhxuuVc`A ze=s}&uok@lup;MML}ZAwy%YfNMPHKRHB~{TkbMm8RDk^hU;$t*K0!zTfFf1}oQbIC z0PXu!d%|;ob_iU&f48p+$N}`k z`2xUiK}t&S7Maal|MuczBTx19`hzb5UIDlz;Aa31MZi-!&07($hwVgs&V>pncuGLD z(_l}`0EeO`OVb>aC%J1 zumRH_42?O!r8+7Rz=0l}U+$~`-FR1lb(tX3s?oP0s4V&>u)b7~R*gO-f*+TW#3O2o ztOV{VS$|eef~v7^JN`{zxjHC0)5*B;VNh!p;NW%FY$Qz+A&q#DNsvaH%iUH1HdCLE z)nV;*KwZgmY0FQQLZaIXn84B@;8F!aY=$@y61I!k>=pBFzkAu2M0t_fCAf~p3n$`d~7g5C+xB{s0h4dx2e6Ybsgu@9T(gnIJQt;8in#X(r%*-vt?|>+!F<-!^&H z`F}y~2Fns+88N~9LZs^c-)1Io4ca>ay4T=k>wm76;Br6{IYaf+m}qlA6Nxd3?Xd2= zY^X#*K-oUPXF)WGA)u=mwT^(NY8?R`0e>9<9RVEyZEnVb$Y?ZbHvtM~hA4+X5g{(E zZ%|uu05?!7+D5>Nbm|;qw$kbkhQ|PovGL(K1MpgWo{H-|@tsh8ht}Bk4_b=8vLS%V zM!GL8uyJFNh9paDTp5yprN0u-eJh?_5^=9m0w-Wiz~|Wb@bm=WIsW@`gie5b{(m0= zL(WKe$PF2bz9e9djRTW3AzA=<0pJZ3->0TCRNPt|siGOPr70%2*DN(vjm=f|(L(5;CEI@OUf>^h8f<#Slp@>! O0000&4eWL_aJU{}U)I6Fs_gNO<^I09pYNENLMANench(^D7pO5YlhM*6Bc!` zs45>?fBfEJ2FWN3M`2B^G?w|yUoN<^OZH7va-1W+Ac1Yh*|c-XWvn|6aX7~)I17hP z2{2%8=_q4WXgU3f=}cj>VcUxbBATZ<1ZFXIRWhE+zqjkfN(OD6!e+r;84KH3TtCZk z2v&U7~+57*NN$Bpq`u?-r zhWG^y;VYD#`IGk?=8`Yy*OmM5Vu9|v-0%#Mi3{4qc1a|*sfI-)H(R^sZrB#PNN8b? z$nqBn9fo-Z$Cs#o|T%*z&a(sRajEb;0Q{3xBCr;5N8IM?WQ!*a&Jnyq|zMVAl);SK&RUU!Pvb-{u>k>Em z@v|5x9no0W!!p%5abrNBwrR0{v-+Fur++Ed*D=KB-21ow{pTMHK;Y@>=d#Wzp$Pyr CkN6S* delta 812 zcmbQpdWda;ayRz9rAQ>45_&Fc8-0~We1UC`?t0l9-dIL>s7JY$k^TK<6Pil&C8lZR-U(^1KUV=DDd$BsmC?e(2!rtLlJWJ2ZFy)$M1 zc6Qh9|9fv;+{E(<)e=Vpw`Dh}2?=cDbP1Zg=i|Gxa!woWaX4LIIP>&qq+s*C^v_2X z8=Tr$Hw2y+72tf-lRoJ|Z_n0U`dhdrHM~jgQ1<-B-yqr$vo1h@;lQy~4at#Tc@CI1 zEZw93C&**l+xjod=i7a^yKLh7@$GBz|6jc$zs57vt(sbX_(!!vF6W#*wVT&-onY{J zTFLrgyMyG)n%qmz*3{R2+BiLO-u!*5e_t+U2-o_l+R&-l`3-{pX*=z zp5e})dJn#t_3RJJ@;&xkEoUg2!sm0YC4=<=XM_8SkB?pmHZUEC59yt@H*Wd6 cb?*Ut!4038lV1y8048$=Pgg&ebxsLQ0A9{s=Kufz diff --git a/base/applications/mspaint/help/settings6.png b/base/applications/mspaint/help/settings6.png index 564d3cf54bd903da512b83743c82dad51d9bbfce..c44c99f12b2d4739242987e658f5b41596190a77 100644 GIT binary patch delta 648 zcmaFBHlKBZay?U;r;B4qMcmsv8}n`jNVGjn>T#WT`oIH5FNq+{nG!maCK?I}3n>YO zAGpw{)3L^2I%j7LgR)lO?xk8M?`(8_zr5Bx<>3}f-^Yhve)m4l`r(vE+@HO_&OV)! zP_UEby?|t^$Dao_H6j8sGni_g2s;Mpe}DXY`+PkG2T4V*ie85Le|{`GWEZq)DTN3u z+993zKKXq>gM{y#1&tg}Q&^@mmt1s|HtZ8rbeSNgFrUX@uHV|@Z@CLv71?$;^ss4Z zD9z`2aPYo(gMgVgx5059Wu6PiG?k`2IPA@)v4mA)Z*~6S<4kKd9N}>;x!@wI$aQjm zWBY-H4D&Z0l2I-Ze5`wlqdtcJ18cU9fg8W>mH*Qj;y(&{`&>9~+4s-N;n?@(jPDA& zrF{y1Ml{?BW)@K5_UHVtLHNP1n@k!FFys(s#GBA9&cA?x3y2a{PlvJ`R_NRmY%qvC zp#)dj!1Th^WBnnJIykC#n4%sBJn$%J}$K~WQd$4tyTg{_8aJGNb6NuI2@RK|vd zL-3)5;jI@7y5)ZD*b*Xdds$PL->yqT*@;;_L&=Rh-D3L{$tbqutZL`3EDwhpz6z71J|43+*KJAI8_DU&Y!E(Oyprdmos@qc z!xJOjhN-*s8a)J_S7b>A=9^z|bpt(6qiPiA8{cQNUrl z)xnDumtHij*VCU>FFwO>d2h#m`Tf&P!McG4+~C-{n4g2`z&>lkWkB_C{mVwE+3BhwElwsO|LQOd>mrUN8HE^Z3X#^i|Te13@`3h~*1LgsnVwpDt z1zR6qv;C4(uX;NJU*L}qa~LZ0jwkQ5KXP~fo%W2K6Boac-!f(AEw%F4{lI6OS| zh{to9MvSD-fra}gmByd0za`sodzHrr#wT7iZHL;^HJYC9`23hdwjug|`Nav90{^bI z9l2f0p3rxw@#IVaT?QMr4;-d(GK`ET82>ol^mysE&XgfqoYDK|2cORQiOtg92@EA7 z7TRlf-dXL-80)g-V+7j+hE(B26BuuFCA~OvWy?gVhTmz*ZZ2v@?62;y>~sEICz7-2 z^5#&61ubD`&3dhzj|LToY@KZwo%QS6ENS1+mdKI;Vst0Qp#H(EtDd diff --git a/base/applications/mspaint/help/shape.png b/base/applications/mspaint/help/shape.png index 5535e1df5bd21a334b76189c33c12ddaa1bee300..586b016d027e68ddb66bb492cc858f3bfdd64a44 100644 GIT binary patch delta 309 zcmV-50m}Zz1H}T68Gix*005AYXf^-<00wkYPE!B?00000Zl(v30002`Nkl(>R9F7(cxf~J58jlX=yxyhNPlk=S?mIh9$ij$Y%MN`0nX8f(2 zH-G$P`1uElq(yk}*|22uu`oyVAHNwu=nuoeL;J1Wf-r4B7=M5B+7+OwK&8LHzxc? z0Ikgn&_&TOXZiN#Oi!SxKVd%p0VaRJeE<9BSEvSv@mJ2D2C0A|ur^f9zkYs$XkY~5 z$olm^zkLFs?=GJqj9=eA|M>R#*Y{5#@+(OE7fALC!|(tAV)eX%PP)jj00000NkvXX Hu0mjfPz04= delta 440 zcmV;p0Z0DD0>=Z88Gi-<001BJ|6u?C00DDSM?wIu&K&6g000JJOGiWi{{a60|De66 zlK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RU0vix0C~)(^nE(I*M@d9MR5;7+ zl08cUK@f)D6FbE!ot31q5ey<&`B7MCWou<4C?fs^3kzGDbbnf;(JEL4JH18(g9sXe z7_Ly#7=*}Oa=Wv);kCGn@>yhV`Dn$7(p$`cINEo0} z+;@hGx>J0hM5M3DR)=i1$-SczvwTOgvd>M8LH7V{0kQEunHwLDY5U}sUyA$)$oDqc z_$1HD*K|GpUVnk>k@NY9pR8g59RYXM8kX};CjaQ*p;W%X@$L$g1tf|Chy|YOub5rk zq9hG9%186%-bwv}>yh=RN31Uupe-uKa$!0LojmM2>H(C#O#6f!!gT*&xfc0ecglsbi%B|0Hzz; iP3S{Z$HBh<0KNg!oauMhCv1NJ0000E<1eXMceYTK(zJLBOn)_>Q&p0 zM>lP`_~4y+>S7?;dgh6D+1gdxkK@!3P`+~2!P_&pUiBV8IY22a8j5>2wJkomZ2uko*jW$}{g_#K(@%Mo zZz%5Dghhj1^z=<99>%wAE9u(^Gh(A#@w&L4V>*%3&{fY^u`i-_{er#s?6ViEhfIPa z^VEe=-KUHb=YIngplC3Sn_j>0bj{)`g|jbIF1p;j@_OHfTXS~aUwPIi%v0to`}d$Bz1TS(bw@QqCIXc~HH4Ke@F-m$-gZdUzZ=tUDt_J0 z<$KN2SB91>fC?E!Oi=J@2cpXUb(k6|`qn{Y4Z|le&=&&$0FSk_1XEaDF8}}l07*qo IM6N<$g5xX2nE(I) delta 607 zcmV-l0-*h^1MLKm8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000JJOGiWi{{a60|De66 zlK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RU0vix07*;CrH2?qs?MXyIR5;7c zlif>GaTv!xd#ST!JJ~X~iC$>RN)l6oibBHjW<+!`LPP2%=zlNpsz0C$@4PbUjR=|E z*g=_yaaw|&nWPsnn`1)Tbgnj!Z&VYtUw1|BEP`%&E}!Sim(TMC{}`rXg>&~_h}}H_ zfYoAR`eCQ(uMN7Nt3uzlarasS0FOrAW~;5)x>_ib$_D&O_E!_X2OvboDK^B(~&gw zwQl-D$v+cJgy%$VBTrqWlb5d}w6|2z-crTn>>~0JnM7ubiSV2#N}x=p@LfE~hvXXR zPwU*danl6Q*x4tt`Zql8GL)%Qaf0#LWlq<*8Pj64HGjE&=C3xnh{l&FJ6_J%%#yJ| zZ$K6GHE#4Tdwg78Wq2xq*WV+&{vI)+CD_>9Vpmv^Y<7ABswimTac}|Om9xatUuizm zfK9S+NU~BQS&;1qaM-Pc7uHxREvIid`uhxmYFONV@{aEoJL91la@keGotMa^R8*hh zb1F_y4Ok0b>v@wE;Mr&tm#2bQQb*6`SX8|8) t(dOlWV*DTe%O?oDdJDjg!_NN^KLBtlws;A*&<6kj002ovPDHLkV1jv>7k2;v diff --git a/base/applications/mspaint/help/toolbox.png b/base/applications/mspaint/help/toolbox.png index 287bd396409bec636ef1e44a18d60241dbfab9c7..514b3c1faf123445b98d39fba6b1ab18c90f1007 100644 GIT binary patch literal 5644 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 W6Dfu<2gd3E0000zOSv8jW1nRqa?X zq9}?7gMp@L8?wQbQv8z$|D+$FgXs7Zf#|4~W&K|R-nyGyuYZ_}7a!MeKE(2GYPZ{e3n0;p zICrOM7D>0wyMH6msnRyqvrar_pl^`Ue~O;Y7KiRrk2_|Gw1Hh9tpghz0LSrb*RDZs48#25!DRBtvdr^5j5Y`Y-}m7N&1g28 zw{G1+5TsNp6$*tv*kB9{XaG3DPpj2}hC*%KZuk22>z?Nghr_>@Qc)C03FgRu1^mDf hE`bO2fLCT0_zYo`UY)x9KY{=N002ovPDHLkV1m5o@LT`@ delta 661 zcmV;G0&4yG1EK|x8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000JJOGiWi{{a60|De66 zlK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RU0vix02iqe2zyJUOB1uF+R5;6x zlTAw-Q51%sd*{w*J~XK$CPm#8`>_y2vnfHWi_&HH{Sp2>cYjJi2vq|vM2an06eq?= z8%&%ynz^~BtF*L6>AO9g=bZO^DE`sO$%*v)eVlV-vsu>G))Y_ZuVAfKlVY*RoeM}t z!dzMrhUet-dDhq0)sukz{e6*CfzMyBStvb2E6w+Imls8!H)S7d?L>$fSI*8o=b$;@ z)B6=XqZq`N<$r}72VdII8Bq#uCR)${T5EQWE~vaNVVz?*w1_wYqe!O$PR}D2mzJp4 z>oT!}AP7igh^H0t{SZ$noEy=P?$BZ}fzQtyOB6*+1Zb^s4x)I75)WU)?cF`sy#av- zI7eVWL?#2`IHr*G`PS+(mo}sWn9>4D&vWS zX>V^&GMNm8LIJHcQ54Z=G)SdV_`XlO-9|*HR;yGh74-lx*5ToySZm2-GI*ZH<>e)< zR*UKBX@9!iF3vetS6A8C*idGibbNd))>^E!7-N{7okc{5q6pvjnV+903`26c9O-nL ztE;O&7RJd*l8__`B7!l7(P%^*$0(&R#^9Wz*=(}8xk;zfA)n7bw9sfY#5sp^?)To6 vQfRHwTH|>hXJ==W%VoB Date: Fri, 20 Oct 2023 20:15:25 +0100 Subject: [PATCH 30/74] Update version --- sdk/include/reactos/version.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index d004d34f347..76248d24808 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -9,12 +9,12 @@ endif() set(KERNEL_VERSION_MAJOR "5") set(KERNEL_VERSION_MINOR "2") set(KERNEL_VERSION_PATCH_LEVEL "3790") -set(KERNEL_VERSION_PATCH_NUMBER "87") +set(KERNEL_VERSION_PATCH_NUMBER "95") set(COPYRIGHT_YEAR "2023") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds # or "RC1", "RC2", "" for releases. -set(KERNEL_VERSION_BUILD_TYPE "wins2k3-sp2") +set(KERNEL_VERSION_BUILD_TYPE "wins2k3-sp3") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}.${KERNEL_VERSION_PATCH_LEVEL}.${KERNEL_VERSION_PATCH_NUMBER}-${WINARCH}") if(NOT KERNEL_VERSION_BUILD_TYPE STREQUAL "") From a199dfc7d1dcb8221b7e112fd314c75c6759353c Mon Sep 17 00:00:00 2001 From: jpb Date: Fri, 20 Oct 2023 18:59:33 +0100 Subject: [PATCH 31/74] Reset mspaint --- base/applications/mspaint/dib.cpp | 2 +- base/applications/mspaint/dib.h | 2 +- base/applications/mspaint/fullscreen.cpp | 2 +- base/applications/mspaint/fullscreen.h | 2 +- base/applications/mspaint/help/settings.html | 14 +- base/applications/mspaint/help/tools.html | 44 +-- base/applications/mspaint/help/usage.html | 8 +- base/applications/mspaint/history.h | 2 +- base/applications/mspaint/lang/pl-PL.rc | 2 +- base/applications/mspaint/lang/ro-RO.rc | 2 +- base/applications/mspaint/main.cpp | 2 +- base/applications/mspaint/miniature.cpp | 2 +- base/applications/mspaint/miniature.h | 2 +- base/applications/mspaint/mouse.cpp | 334 +++++++++++++++---- base/applications/mspaint/palettemodel.cpp | 2 +- base/applications/mspaint/palettemodel.h | 2 +- base/applications/mspaint/registry.h | 2 +- base/applications/mspaint/rsrc.rc | 2 +- base/applications/mspaint/selectionmodel.cpp | 2 +- base/applications/mspaint/selectionmodel.h | 2 +- base/applications/mspaint/sizebox.cpp | 2 +- base/applications/mspaint/textedit.h | 2 +- base/applications/mspaint/toolsettings.h | 2 +- base/applications/mspaint/winproc.cpp | 2 +- base/applications/mspaint/winproc.h | 2 +- 25 files changed, 317 insertions(+), 125 deletions(-) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 93dc3cc4623..ea5ead7427a 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Some DIB related functions * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index 0560c24481e..9c1e5d4f09c 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Some DIB related functions * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/fullscreen.cpp b/base/applications/mspaint/fullscreen.cpp index ede0565d925..53e7f8ceb30 100644 --- a/base/applications/mspaint/fullscreen.cpp +++ b/base/applications/mspaint/fullscreen.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Window for fullscreen view * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/fullscreen.h b/base/applications/mspaint/fullscreen.h index d5ac52e0426..02efcca0c91 100644 --- a/base/applications/mspaint/fullscreen.h +++ b/base/applications/mspaint/fullscreen.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Window for fullscreen view * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/help/settings.html b/base/applications/mspaint/help/settings.html index 23fb9646c79..c40c2eed56a 100644 --- a/base/applications/mspaint/help/settings.html +++ b/base/applications/mspaint/help/settings.html @@ -15,7 +15,7 @@

Werkzeugeinstellungen

-Im Kapitel Werkzeuge in Paint wurden die Werkzeuge, die Ihnen in Paint f�r Windivs zur Verf�gung stehen, kurz vorgestellt. Einige von ihnen erlauben weitere Einstellungen, um z.B. Liniendicke, Pinselart u.�. genauer steuern zu k�nnen. +Im Kapitel Werkzeuge in Paint wurden die Werkzeuge, die Ihnen in Paint fr ReactOS zur Verfgung stehen, kurz vorgestellt. Einige von ihnen erlauben weitere Einstellungen, um z.B. Liniendicke, Pinselart u.. genauer steuern zu knnen.

@@ -23,22 +23,22 @@

Werkzeugeinstellungen

- + - + - + - + - + - +
Beschreibung
Transparenz - Die obere Einstellung steht f�r nicht transparent, die untere steht f�r transparent. Bei den Auswahlwerkzeugen bewirkt die transparente Einstellung, dass Stelen in der Auswahl, die der Hintergrundfarbe entsprechen, nicht gezeichnet werden. Das Bild dahinter scheint daher durch.
Beim Textwerkzeug wird standardm��ig ein Rechteck in der Hintergrundfarbe unter den Text gelegt. Bei der transparenten Einstellung hingegen wird der Text direkt auf das Bild geschrieben.
Transparenz - Die obere Einstellung steht fr nicht transparent, die untere steht fr transparent. Bei den Auswahlwerkzeugen bewirkt die transparente Einstellung, dass Stelen in der Auswahl, die der Hintergrundfarbe entsprechen, nicht gezeichnet werden. Das Bild dahinter scheint daher durch.
Beim Textwerkzeug wird standardmig ein Rechteck in der Hintergrundfarbe unter den Text gelegt. Bei der transparenten Einstellung hingegen wird der Text direkt auf das Bild geschrieben.
Radiererbreite - L�sst Sie die Breite des Radierwerkzeuges w�hlen. Die K�stchen entsprechen 4, 6, 8 und 10 Pixeln.
Radiererbreite - Lsst Sie die Breite des Radierwerkzeuges whlen. Die Kstchen entsprechen 4, 6, 8 und 10 Pixeln.
Pinselstil - W�hlen Sie eine der abgebildeten Pinselformen. Das Pinselwerkzeug zeichnet von nun an mit der gew�hlten Form.
Pinselstil - Whlen Sie eine der abgebildeten Pinselformen. Das Pinselwerkzeug zeichnet von nun an mit der gewhlten Form.
Spr�hradius - W�hlen Sie in dem Feld den Spr�hradius aus, den Sie fortan mit der Spr�hdose verwenden m�chten.
Sprhradius - Whlen Sie in dem Feld den Sprhradius aus, den Sie fortan mit der Sprhdose verwenden mchten.
Linienbreite - Aus diesem Feld k�nnen Sie per Mausklick eine Linienbreite zwischen 1 und 5 Pixeln ausw�hlen. Diese Einstellung beeinflusst die Werkzeuge Linie, Bezier-Kurve, Rechteck, Polygon, Ellipse und abgerundetes Rechteck.
Linienbreite - Aus diesem Feld knnen Sie per Mausklick eine Linienbreite zwischen 1 und 5 Pixeln auswhlen. Diese Einstellung beeinflusst die Werkzeuge Linie, Bezier-Kurve, Rechteck, Polygon, Ellipse und abgerundetes Rechteck.
F�llart - Aus diesem Feld k�nnen Sie eine von drei F�llarten auswahlen. Bei der ersten Einstellung wird nur der Rahmen gezeichnet. Die zweite Einstellung f�llt zudem den Innenraum der Form mit der aktuellen Hintergrundfarbe. Die dritte Einstellung zeichnet eine ausgef�llte Form in der Vordergrundfarbe ohne Rahmen. Diese Einstellungen wirken sich auf das Rechteck, das Polygon, die Ellipse und das abgerundete Rechteck aus.
Fllart - Aus diesem Feld knnen Sie eine von drei Fllarten auswahlen. Bei der ersten Einstellung wird nur der Rahmen gezeichnet. Die zweite Einstellung fllt zudem den Innenraum der Form mit der aktuellen Hintergrundfarbe. Die dritte Einstellung zeichnet eine ausgefllte Form in der Vordergrundfarbe ohne Rahmen. Diese Einstellungen wirken sich auf das Rechteck, das Polygon, die Ellipse und das abgerundete Rechteck aus.
diff --git a/base/applications/mspaint/help/tools.html b/base/applications/mspaint/help/tools.html index cf2cdc7aa9a..c65eb17fbe6 100644 --- a/base/applications/mspaint/help/tools.html +++ b/base/applications/mspaint/help/tools.html @@ -15,11 +15,11 @@

Werkzeuge in Paint

-Paint f�r Windivs stellt ihnen zum Bearbeiten ihrer Bilder zahlreiche Werkzeuge zur Verf�gung. Um eines der +Paint fr ReactOS stellt ihnen zum Bearbeiten ihrer Bilder zahlreiche Werkzeuge zur Verfgung. Um eines der -Werkzeuge auszuw�hlen, klicken Sie bitte auf das entsprechende Symbol im Werkzeugkasten, der sich �blicherweise +Werkzeuge auszuwhlen, klicken Sie bitte auf das entsprechende Symbol im Werkzeugkasten, der sich blicherweise -auf der linken Seite des Fensters befindet. Es folgt eine Auflistung der Ihnen zur Verf�gung stehenden +auf der linken Seite des Fensters befindet. Es folgt eine Auflistung der Ihnen zur Verfgung stehenden Werkzeuge mit jeweils einer kurzen Beschreibung.

@@ -29,75 +29,75 @@

Werkzeuge in Paint

Beschreibung -Die freie Auswahl erm�glicht es Ihnen, einen beliebigen Bereich des Bildes auszuw�hlen. Dr�cken Sie +Die freie Auswahl ermglicht es Ihnen, einen beliebigen Bereich des Bildes auszuwhlen. Drcken Sie -dazu im Bild die linke Maustaste und umfahren Sie mit der gedr�ckten Maustaste den Bereich, den Sie ausw�hlen +dazu im Bild die linke Maustaste und umfahren Sie mit der gedrckten Maustaste den Bereich, den Sie auswhlen -m�chten. Wenn Sie die Maustaste nun loslassen wird der Bereich automatisch in eine geschlossene Auswahl +mchten. Wenn Sie die Maustaste nun loslassen wird der Bereich automatisch in eine geschlossene Auswahl umgewandelt. -Die rechteckige Auswahl erm�glicht es Ihnen, im Bild einen beliebigen rechteckigen Bereich +Die rechteckige Auswahl ermglicht es Ihnen, im Bild einen beliebigen rechteckigen Bereich -auszuw�hlen. Dr�cken Sie dazu im Bild die linke Maustaste und ziehen Sie die Maus zur diagonal +auszuwhlen. Drcken Sie dazu im Bild die linke Maustaste und ziehen Sie die Maus zur diagonal -gegen�berliegenden Seite des gew�nschten Rechtecks. Wenn Sie die Maustaste loslassen, erscheint sie soeben +gegenberliegenden Seite des gewnschten Rechtecks. Wenn Sie die Maustaste loslassen, erscheint sie soeben erstellte Auswahl. -Der Radierer erlaubt es Ihnen, mit der Hintergrundfarbe zu Malen, um Teile des Bildes zu l�schen. +Der Radierer erlaubt es Ihnen, mit der Hintergrundfarbe zu Malen, um Teile des Bildes zu lschen. -M�chten Sie das gesamte Bild l�schen, verwenden Sie bitte den Men�eintrag Bild l�schen im Men� +Mchten Sie das gesamte Bild lschen, verwenden Sie bitte den Meneintrag Bild lschen im Men Bild.* -Mit dem F�llwerkzeug k�nnen Sie einfarbige Fl�chen einf�rben. Klicken Sie dazu an eine beliebige Stelle in der Fl�che.* +Mit dem Fllwerkzeug knnen Sie einfarbige Flchen einfrben. Klicken Sie dazu an eine beliebige Stelle in der Flche.* -Die Pipette l�sst Sie die Farbe an einer bestimmten Position im Bild aufnehmen. Klicken Sie dazu an die Stelle im Bild. Wenn Sie die Maustaste loslassen, wird die aktuelle Vorder-/Hintergrundfarbe auf die Farbe des angeklickten Pixels gesetzt.* +Die Pipette lsst Sie die Farbe an einer bestimmten Position im Bild aufnehmen. Klicken Sie dazu an die Stelle im Bild. Wenn Sie die Maustaste loslassen, wird die aktuelle Vorder-/Hintergrundfarbe auf die Farbe des angeklickten Pixels gesetzt.* -Mit dem Vergr��erungswerkzeug k�nnen Sie die Ansicht des Bildes vergr��ern (Linksklick) und verkleinern (Rechtsklick). +Mit dem Vergrerungswerkzeug knnen Sie die Ansicht des Bildes vergrern (Linksklick) und verkleinern (Rechtsklick). -Der Stift zeichnet einen d�nnen Strich entlang der Linie, die Sie bei gedr�ckter Maustaste mit der Maus fahren. Mit der jeweils anderen Maustaste k�nnen Sie den Zeichenvorgang jederzeit Abbrechen und das Bild zur�cksetzen.* +Der Stift zeichnet einen dnnen Strich entlang der Linie, die Sie bei gedrckter Maustaste mit der Maus fahren. Mit der jeweils anderen Maustaste knnen Sie den Zeichenvorgang jederzeit Abbrechen und das Bild zurcksetzen.* -Der Pinsel erweitert den Stift um die M�glichkeit, Zeichendicke und Zeichenform auszuw�hlen. N�here Informationen hierzu entnehmen Sie bitte dem Kapitel Werkzeugeinstellungen.* +Der Pinsel erweitert den Stift um die Mglichkeit, Zeichendicke und Zeichenform auszuwhlen. Nhere Informationen hierzu entnehmen Sie bitte dem Kapitel Werkzeugeinstellungen.* -Die Spr�hdose kann verwendet werden, um weit gestreute Linien zu zeichnen. Die Dichte der Linie ist dabei von der Geschwindigkeit abh�ngig mit der Sie die Maus bewegen.* +Die Sprhdose kann verwendet werden, um weit gestreute Linien zu zeichnen. Die Dichte der Linie ist dabei von der Geschwindigkeit abhngig mit der Sie die Maus bewegen.* Textwerkzeug -Eine gerade Linie zeichnen Sie, indem Sie zun�chst die linke Maustaste dr�cken, mit gedr�ckter Maustaste zum Zielpunkt fahren und dort die Maustaste wieder loslassen.* +Eine gerade Linie zeichnen Sie, indem Sie zunchst die linke Maustaste drcken, mit gedrckter Maustaste zum Zielpunkt fahren und dort die Maustaste wieder loslassen.* Bezier-Kurve* -Um ein Rechteck zu zeichnen, Dr�cken Sie die linke Maustaste. Fahren Sie mit der Maus bei gedr�ckter Maustaste in die diagonal gegen�berliegende Ecke und lassen Sie die Maustaste los.* +Um ein Rechteck zu zeichnen, Drcken Sie die linke Maustaste. Fahren Sie mit der Maus bei gedrckter Maustaste in die diagonal gegenberliegende Ecke und lassen Sie die Maustaste los.* Polygon* -Eine Ellipse zeichnen Sie, indem Sie mit der Maus, wie unter Rechteck beschrieben, die Diagonale des Au�enrechtecks der Ellipse ziehen.* +Eine Ellipse zeichnen Sie, indem Sie mit der Maus, wie unter Rechteck beschrieben, die Diagonale des Auenrechtecks der Ellipse ziehen.* -Das abgerundete Rechteck verh�lt sich wie das Rechteck. Sie ziehen mit der Maus die Diagonale des Rechtecks, das Sie zeichnen m�chten.* +Das abgerundete Rechteck verhlt sich wie das Rechteck. Sie ziehen mit der Maus die Diagonale des Rechtecks, das Sie zeichnen mchten.*

* Dieses Wekzeug kann auch mit der rechten Maustaste verwendet werden. Vorder- und Hintergrundfarbe werden in diesem Fall vertauscht verwendet.

-Viele Werkzeuge erlauben daruber hinaus weitere Einstellungen. Eine Liste dieser Einstellungsm�glichkeiten entnehmen Sie bitte dem Kapitel Werkzeugeinstellungen. +Viele Werkzeuge erlauben daruber hinaus weitere Einstellungen. Eine Liste dieser Einstellungsmglichkeiten entnehmen Sie bitte dem Kapitel Werkzeugeinstellungen.

diff --git a/base/applications/mspaint/help/usage.html b/base/applications/mspaint/help/usage.html index d45da2ad5eb..84fbee7f539 100644 --- a/base/applications/mspaint/help/usage.html +++ b/base/applications/mspaint/help/usage.html @@ -15,7 +15,7 @@

Benutzung von Paint

-Die Hauptbedienelemente von Paint f�r Windivs sind die Farbpalette, der Werkzeugkasten und das Feld f�r die Werkzeugeinstellungen. Diese Bedienelemente k�nnen ohne Hilfsmittel wie die Tastaturmaus nicht �ber die Tastatur, sondern ausschlie�lich �ber die Maus bedient werden. +Die Hauptbedienelemente von Paint fr ReactOS sind die Farbpalette, der Werkzeugkasten und das Feld fr die Werkzeugeinstellungen. Diese Bedienelemente knnen ohne Hilfsmittel wie die Tastaturmaus nicht ber die Tastatur, sondern ausschlielich ber die Maus bedient werden.

Es folgt ein Bildschirmfoto des Hauptfensters, in dem die genannten Elemente rot markiert und beschriftet sind. @@ -23,15 +23,15 @@

Benutzung von Paint

- +
Farbpalette

�ber die Farbpalette w�hlen Sie die zum Malen verwendete Vorder- und Hintergrundfarbe. Klicken Sie mit der linken Maustaste auf eine Farbe in der Palette, wird diese als Vordergrundfarbe gesetzt. Wenn Sie sie mit der rechten Maustaste anklicken, wird sie als Hintergrundfarbe gesetzt. Sie k�nnen die Farbe an der entsprechenden Stelle in der Palette ver�ndern, indem Sie mit der linken oder rechten Maustaste doppelt klicken.

ber die Farbpalette whlen Sie die zum Malen verwendete Vorder- und Hintergrundfarbe. Klicken Sie mit der linken Maustaste auf eine Farbe in der Palette, wird diese als Vordergrundfarbe gesetzt. Wenn Sie sie mit der rechten Maustaste anklicken, wird sie als Hintergrundfarbe gesetzt. Sie knnen die Farbe an der entsprechenden Stelle in der Palette verndern, indem Sie mit der linken oder rechten Maustaste doppelt klicken.

- +
Werkzeugkasten
�ber den Werkzeugkasten k�nnen Sie durch anklicken Ihr Malwerkzeug ausw�hlen. Eine �bersicht �ber die vorhandenen Werkzeuge finden Sie im Kapitel Werkzeuge in Paint. Jedes Werkzeug bringt seine eigenen Werkzeugeinstellungen mit sich.
ber den Werkzeugkasten knnen Sie durch anklicken Ihr Malwerkzeug auswhlen. Eine bersicht ber die vorhandenen Werkzeuge finden Sie im Kapitel Werkzeuge in Paint. Jedes Werkzeug bringt seine eigenen Werkzeugeinstellungen mit sich.

- +
Werkzeugeinstellungen
Viele Werkzeuge erlauben es Ihnen, erweiterte Einstellungen vorzunehmen. Hierzu verwenden Sie das Feld unter dem Werkzeugkasten. Eine Liste aller m�glichen Einstellungen aller Werkzeuge finden Sie im Kapitel Werkzeugeinstellungen.
Viele Werkzeuge erlauben es Ihnen, erweiterte Einstellungen vorzunehmen. Hierzu verwenden Sie das Feld unter dem Werkzeugkasten. Eine Liste aller mglichen Einstellungen aller Werkzeuge finden Sie im Kapitel Werkzeugeinstellungen.

diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index f9d63625b1f..b9fe323db67 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Undo and redo functionality * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 3506917b09d..8a9261e7732 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -229,7 +229,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint dla Windivs" + IDS_INFOTITLE "Paint dla ReactOS" IDS_INFOTEXT "Dostępny na licencji GNU Lesser General Public License (LGPL, www.gnu.org)" IDS_SAVEPROMPTTEXT "Czy chcesz zapisać zmiany do pliku %s?" IDS_DEFAULTFILENAME "bez tytułu" diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 3f6fdb07fed..69d2fcc2478 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -228,7 +228,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Pictare" IDS_WINDOWTITLE "%s - Pictare" - IDS_INFOTITLE "Pictare pentru Windivs" + IDS_INFOTITLE "Pictare pentru ReactOS" IDS_INFOTEXT "Disponibilă sub licența GNU Lesser General Public (vedeți www.gnu.org)" IDS_SAVEPROMPTTEXT "Doriți păstrarea modificărilor din %s?" IDS_DEFAULTFILENAME "Fără nume" diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index d80249afdfe..a4cbb54b5b0 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Initializing everything * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/miniature.cpp b/base/applications/mspaint/miniature.cpp index 029692d9704..dc9eacbca2f 100644 --- a/base/applications/mspaint/miniature.cpp +++ b/base/applications/mspaint/miniature.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Window procedure of the main window and all children apart from * hPalWin, hToolSettings and hSelection diff --git a/base/applications/mspaint/miniature.h b/base/applications/mspaint/miniature.h index 6183f141275..7c7d30d2c7f 100644 --- a/base/applications/mspaint/miniature.h +++ b/base/applications/mspaint/miniature.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Window procedure of the main window and all children apart from * hPalWin, hToolSettings and hSelection diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index f6cb9e2ac22..c7c19e16544 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -18,28 +18,28 @@ POINT ToolBase::s_pointStack[256] = { { 0 } }; void regularize(LONG x0, LONG y0, LONG& x1, LONG& y1) { - if (abs(x1 - x0) >= abs(y1 - y0)) - y1 = y0 + (y1 > y0 ? abs(x1 - x0) : -abs(x1 - x0)); + if (labs(x1 - x0) >= labs(y1 - y0)) + y1 = y0 + (y1 > y0 ? labs(x1 - x0) : -labs(x1 - x0)); else - x1 = x0 + (x1 > x0 ? abs(y1 - y0) : -abs(y1 - y0)); + x1 = x0 + (x1 > x0 ? labs(y1 - y0) : -labs(y1 - y0)); } void roundTo8Directions(LONG x0, LONG y0, LONG& x1, LONG& y1) { - if (abs(x1 - x0) >= abs(y1 - y0)) + if (labs(x1 - x0) >= labs(y1 - y0)) { - if (abs(y1 - y0) * 5 < abs(x1 - x0) * 2) + if (labs(y1 - y0) * 5 < labs(x1 - x0) * 2) y1 = y0; else - y1 = y0 + (y1 > y0 ? abs(x1 - x0) : -abs(x1 - x0)); + y1 = y0 + (y1 > y0 ? labs(x1 - x0) : -labs(x1 - x0)); } else { - if (abs(x1 - x0) * 5 < abs(y1 - y0) * 2) + if (labs(x1 - x0) * 5 < labs(y1 - y0) * 2) x1 = x0; else - x1 = x0 + (x1 > x0 ? abs(y1 - y0) : -abs(y1 - y0)); + x1 = x0 + (x1 > x0 ? labs(y1 - y0) : -labs(y1 - y0)); } } @@ -50,18 +50,6 @@ BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1) return (abs(x1 - x0) <= cxThreshold) && (abs(y1 - y0) <= cyThreshold); } -void updateStartAndLast(LONG x, LONG y) -{ - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; -} - -void updateLast(LONG x, LONG y) -{ - g_ptEnd.x = x; - g_ptEnd.y = y; -} - void ToolBase::reset() { s_pointSP = 0; @@ -124,10 +112,7 @@ struct FreeSelTool : ToolBase void OnDrawOverlayOnImage(HDC hdc) override { if (!selectionModel.IsLanded()) - { - selectionModel.DrawBackgroundPoly(hdc, selectionModel.m_rgbBack); selectionModel.DrawSelection(hdc, paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); - } if (canvasWindow.m_drawing) { @@ -153,7 +138,7 @@ struct FreeSelTool : ToolBase m_bLeftButton = bLeftButton; } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { if (bLeftButton) { @@ -162,9 +147,10 @@ struct FreeSelTool : ToolBase selectionModel.PushToPtStack(pt); imageModel.NotifyImageChanged(); } + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { if (bLeftButton) { @@ -186,6 +172,7 @@ struct FreeSelTool : ToolBase canvasWindow.ClientToScreen(&pt); mainWindow.TrackPopupMenu(pt, 0); } + return TRUE; } void OnFinishDraw() override @@ -199,6 +186,11 @@ struct FreeSelTool : ToolBase selectionModel.HideSelection(); ToolBase::OnCancelDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + selectionModel.StretchSelection(bMinus); + } }; // TOOL_RECTSEL @@ -213,10 +205,7 @@ struct RectSelTool : ToolBase void OnDrawOverlayOnImage(HDC hdc) override { if (!selectionModel.IsLanded()) - { - selectionModel.DrawBackgroundRect(hdc, selectionModel.m_rgbBack); selectionModel.DrawSelection(hdc, paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); - } if (canvasWindow.m_drawing) { @@ -241,7 +230,7 @@ struct RectSelTool : ToolBase m_bLeftButton = bLeftButton; } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { if (bLeftButton) { @@ -250,9 +239,10 @@ struct RectSelTool : ToolBase selectionModel.SetRectFromPoints(g_ptStart, pt); imageModel.NotifyImageChanged(); } + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { POINT pt = { x, y }; if (bLeftButton) @@ -267,6 +257,7 @@ struct RectSelTool : ToolBase canvasWindow.ClientToScreen(&pt); mainWindow.TrackPopupMenu(pt, 0); } + return TRUE; } void OnFinishDraw() override @@ -280,6 +271,11 @@ struct RectSelTool : ToolBase selectionModel.HideSelection(); ToolBase::OnCancelDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + selectionModel.StretchSelection(bMinus); + } }; struct TwoPointDrawTool : ToolBase @@ -295,26 +291,22 @@ struct TwoPointDrawTool : ToolBase { m_bLeftButton = bLeftButton; m_bDrawing = TRUE; - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { - g_ptEnd.x = x; - g_ptEnd.y = y; imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { - g_ptEnd.x = x; - g_ptEnd.y = y; imageModel.PushImageForUndo(); OnDrawOverlayOnImage(m_hdc); m_bDrawing = FALSE; imageModel.NotifyImageChanged(); + return TRUE; } void OnFinishDraw() override @@ -328,10 +320,109 @@ struct TwoPointDrawTool : ToolBase m_bDrawing = FALSE; ToolBase::OnCancelDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeLineThickerOrThinner(bMinus); + } }; +typedef enum DIRECTION +{ + NO_DIRECTION = -1, + DIRECTION_HORIZONTAL, + DIRECTION_VERTICAL, + DIRECTION_DIAGONAL_RIGHT_DOWN, + DIRECTION_DIAGONAL_RIGHT_UP, +} DIRECTION; + +#define THRESHOULD_DEG 15 + +static DIRECTION +GetDirection(LONG x0, LONG y0, LONG x1, LONG y1) +{ + LONG dx = x1 - x0, dy = y1 - y0; + + if (labs(dx) <= 8 && labs(dy) <= 8) + return NO_DIRECTION; + + double radian = atan2((double)dy, (double)dx); + if (radian < DEG2RAD(-180 + THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_HORIZONTAL; + } + if (radian < DEG2RAD(-90 - THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_DOWN: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_DOWN; + } + if (radian < DEG2RAD(-90 + THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_VERTICAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_VERTICAL; + } + if (radian < DEG2RAD(-THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_UP: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_UP; + } + if (radian < DEG2RAD(+THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_HORIZONTAL; + } + if (radian < DEG2RAD(+90 - THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_DOWN: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_DOWN; + } + if (radian < DEG2RAD(+90 + THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_VERTICAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_VERTICAL; + } + if (radian < DEG2RAD(+180 - THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_UP: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_UP; + } + ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_HORIZONTAL; +} + +static void +RestrictDrawDirection(DIRECTION dir, LONG x0, LONG y0, LONG& x1, LONG& y1) +{ + switch (dir) + { + case NO_DIRECTION: + default: + return; + + case DIRECTION_HORIZONTAL: + y1 = y0; + break; + + case DIRECTION_VERTICAL: + x1 = x0; + break; + + case DIRECTION_DIAGONAL_RIGHT_DOWN: + y1 = y0 + (x1 - x0); + break; + + case DIRECTION_DIAGONAL_RIGHT_UP: + x1 = x0 - (y1 - y0); + break; + } +} + struct SmoothDrawTool : ToolBase { + DIRECTION m_direction = NO_DIRECTION; + BOOL m_bShiftDown = FALSE; + SmoothDrawTool(TOOLTYPE type) : ToolBase(type) { } @@ -340,22 +431,48 @@ struct SmoothDrawTool : ToolBase void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { + m_direction = NO_DIRECTION; imageModel.PushImageForUndo(); - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; imageModel.NotifyImageChanged(); + m_bShiftDown = (::GetKeyState(VK_SHIFT) & 0x8000); // Is Shift key pressed? } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { + if (m_bShiftDown) + { + if (m_direction == NO_DIRECTION) + { + m_direction = GetDirection(g_ptStart.x, g_ptStart.y, x, y); + if (m_direction == NO_DIRECTION) + return FALSE; + } + + RestrictDrawDirection(m_direction, g_ptStart.x, g_ptStart.y, x, y); + } + else + { + draw(bLeftButton, x, y); + g_ptStart.x = g_ptEnd.x = x; + g_ptStart.y = g_ptEnd.y = y; + return TRUE; + } + draw(bLeftButton, x, y); imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { + if (m_bShiftDown && m_direction != NO_DIRECTION) + { + RestrictDrawDirection(m_direction, g_ptStart.x, g_ptStart.y, x, y); + } + draw(bLeftButton, x, y); OnFinishDraw(); + return TRUE; } void OnFinishDraw() override @@ -365,7 +482,8 @@ struct SmoothDrawTool : ToolBase void OnCancelDraw() override { - OnButtonUp(FALSE, 0, 0); + LONG x = 0, y = 0; + OnButtonUp(FALSE, x, y); imageModel.Undo(TRUE); ToolBase::OnCancelDraw(); } @@ -384,8 +502,11 @@ struct RubberTool : SmoothDrawTool Erase(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, m_bg, toolsModel.GetRubberRadius()); else Replace(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, m_fg, m_bg, toolsModel.GetRubberRadius()); - g_ptEnd.x = x; - g_ptEnd.y = y; + } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeRubberThickerOrThinner(bMinus); } }; @@ -425,41 +546,84 @@ struct ColorTool : ToolBase paletteModel.SetBgColor(rgbColor); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { fetchColor(bLeftButton, x, y); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { fetchColor(bLeftButton, x, y); toolsModel.SetActiveTool(toolsModel.GetOldActiveTool()); + return TRUE; } }; // TOOL_ZOOM struct ZoomTool : ToolBase { + BOOL m_bZoomed = FALSE; + ZoomTool() : ToolBase(TOOL_ZOOM) { } + BOOL getNewZoomRect(CRect& rcView, INT newZoom); + + void OnDrawOverlayOnCanvas(HDC hdc) override + { + CRect rcView; + INT oldZoom = toolsModel.GetZoom(); + if (oldZoom < MAX_ZOOM && getNewZoomRect(rcView, oldZoom * 2)) + DrawXorRect(hdc, &rcView); + } + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { - imageModel.PushImageForUndo(); + INT newZoom, oldZoom = toolsModel.GetZoom(); if (bLeftButton) - { - if (toolsModel.GetZoom() < MAX_ZOOM) - zoomTo(toolsModel.GetZoom() * 2, x, y); - } + newZoom = (oldZoom < MAX_ZOOM) ? (oldZoom * 2) : MIN_ZOOM; else + newZoom = (oldZoom > MIN_ZOOM) ? (oldZoom / 2) : MAX_ZOOM; + + m_bZoomed = FALSE; + + if (oldZoom != newZoom) { - if (toolsModel.GetZoom() > MIN_ZOOM) - zoomTo(toolsModel.GetZoom() / 2, x, y); + CRect rcView; + if (getNewZoomRect(rcView, newZoom)) + { + canvasWindow.zoomTo(newZoom, rcView.left, rcView.top); + m_bZoomed = TRUE; + } } } + + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override + { + if (m_bZoomed) + toolsModel.SetActiveTool(toolsModel.GetOldActiveTool()); + + return TRUE; + } }; +BOOL ZoomTool::getNewZoomRect(CRect& rcView, INT newZoom) +{ + CPoint pt; + ::GetCursorPos(&pt); + canvasWindow.ScreenToClient(&pt); + + canvasWindow.getNewZoomRect(rcView, newZoom, pt); + + CRect rc; + canvasWindow.GetImageRect(rc); + canvasWindow.ImageToCanvas(rc); + + return rc.PtInRect(pt); +} + // TOOL_PEN struct PenTool : SmoothDrawTool { @@ -470,10 +634,12 @@ struct PenTool : SmoothDrawTool void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; - Line(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, 1); - ::SetPixelV(m_hdc, x, y, rgb); - g_ptEnd.x = x; - g_ptEnd.y = y; + Line(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetPenWidth()); + } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakePenThickerOrThinner(bMinus); } }; @@ -487,9 +653,13 @@ struct BrushTool : SmoothDrawTool void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; - Brush(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetBrushStyle()); - g_ptEnd.x = x; - g_ptEnd.y = y; + Brush(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetBrushStyle(), + toolsModel.GetBrushWidth()); + } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeBrushThickerOrThinner(bMinus); } }; @@ -505,6 +675,11 @@ struct AirBrushTool : SmoothDrawTool COLORREF rgb = bLeftButton ? m_fg : m_bg; Airbrush(m_hdc, x, y, rgb, toolsModel.GetAirBrushWidth()); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeAirBrushThickerOrThinner(bMinus); + } }; // TOOL_TEXT @@ -540,9 +715,10 @@ struct TextTool : ToolBase UpdatePoint(x, y); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { UpdatePoint(x, y); + return TRUE; } void draw(HDC hdc) @@ -568,7 +744,7 @@ struct TextTool : ToolBase selectionModel.HideSelection(); } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { POINT pt = { x, y }; imageModel.Clamp(pt); @@ -585,7 +761,7 @@ struct TextTool : ToolBase if (::IsRectEmpty(&selectionModel.m_rc)) { quit(); - return; + return TRUE; } } @@ -620,11 +796,13 @@ struct TextTool : ToolBase textEditWindow.ValidateEditRect(&rc); textEditWindow.ShowWindow(SW_SHOWNOACTIVATE); textEditWindow.SetFocus(); + return TRUE; } void OnFinishDraw() override { - if (textEditWindow.GetWindowTextLength() > 0) + if (::IsWindowVisible(textEditWindow) && + textEditWindow.GetWindowTextLength() > 0) { imageModel.PushImageForUndo(); draw(m_hdc); @@ -710,23 +888,25 @@ struct BezierTool : ToolBase imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { s_pointStack[s_pointSP].x = x; s_pointStack[s_pointSP].y = y; imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { s_pointStack[s_pointSP].x = x; s_pointStack[s_pointSP].y = y; if (s_pointSP >= 3) { OnFinishDraw(); - return; + return TRUE; } imageModel.NotifyImageChanged(); + return TRUE; } void OnCancelDraw() override @@ -742,6 +922,11 @@ struct BezierTool : ToolBase m_bDrawing = FALSE; ToolBase::OnFinishDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeLineThickerOrThinner(bMinus); + } }; // TOOL_RECT @@ -812,7 +997,7 @@ struct ShapeTool : ToolBase imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); @@ -821,9 +1006,10 @@ struct ShapeTool : ToolBase s_pointStack[s_pointSP].y = y; imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); @@ -832,7 +1018,7 @@ struct ShapeTool : ToolBase if (nearlyEqualPoints(x, y, s_pointStack[0].x, s_pointStack[0].y)) { OnFinishDraw(); - return; + return TRUE; } else { @@ -845,6 +1031,7 @@ struct ShapeTool : ToolBase s_pointSP--; imageModel.NotifyImageChanged(); + return TRUE; } void OnCancelDraw() override @@ -868,6 +1055,11 @@ struct ShapeTool : ToolBase ToolBase::OnFinishDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeLineThickerOrThinner(bMinus); + } }; // TOOL_ELLIPSE diff --git a/base/applications/mspaint/palettemodel.cpp b/base/applications/mspaint/palettemodel.cpp index 52c3b766941..6d67523bbe5 100644 --- a/base/applications/mspaint/palettemodel.cpp +++ b/base/applications/mspaint/palettemodel.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Keep track of palette data, notify listeners * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/palettemodel.h b/base/applications/mspaint/palettemodel.h index 1b3d3fa66dd..80ca5e82d04 100644 --- a/base/applications/mspaint/palettemodel.h +++ b/base/applications/mspaint/palettemodel.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Keep track of palette data, notify listeners * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/registry.h b/base/applications/mspaint/registry.h index 89d3aa69420..d843c7b2be6 100644 --- a/base/applications/mspaint/registry.h +++ b/base/applications/mspaint/registry.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Offering functions dealing with registry values * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/rsrc.rc b/base/applications/mspaint/rsrc.rc index 9d3a7890b5d..316473f9357 100644 --- a/base/applications/mspaint/rsrc.rc +++ b/base/applications/mspaint/rsrc.rc @@ -13,7 +13,7 @@ #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "Windivs Paint" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Paint" #define REACTOS_STR_INTERNAL_NAME "mspaint" #define REACTOS_STR_ORIGINAL_FILENAME "mspaint.exe" diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 843979f05bd..a5e81d5c41a 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Keep track of selection parameters, notify listeners * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index 6585088f1c1..b47a0d40821 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Keep track of selection parameters, notify listeners * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/sizebox.cpp b/base/applications/mspaint/sizebox.cpp index d2509d6f8e8..a389fefb980 100644 --- a/base/applications/mspaint/sizebox.cpp +++ b/base/applications/mspaint/sizebox.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Window procedure of the size boxes * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/textedit.h b/base/applications/mspaint/textedit.h index 78b53d4408e..884d83e8b23 100644 --- a/base/applications/mspaint/textedit.h +++ b/base/applications/mspaint/textedit.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Text editor and font chooser for the text tool * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/toolsettings.h b/base/applications/mspaint/toolsettings.h index be9b09928dd..7b582256731 100644 --- a/base/applications/mspaint/toolsettings.h +++ b/base/applications/mspaint/toolsettings.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Window procedure of the tool settings window * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index ba3fbbc72a3..a15e6dd3d6b 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Window procedure of the main window and all children apart from * hPalWin, hToolSettings and hSelection diff --git a/base/applications/mspaint/winproc.h b/base/applications/mspaint/winproc.h index 749f5b5c1a2..fc2861b228c 100644 --- a/base/applications/mspaint/winproc.h +++ b/base/applications/mspaint/winproc.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for Windivs + * PROJECT: PAINT for ReactOS * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Window procedure of the main window and all children apart from * hPalWin, hToolSettings and hSelection From 21e0fbb1773dfa02fb5984b412e772aee22b5f95 Mon Sep 17 00:00:00 2001 From: jpb Date: Sat, 21 Oct 2023 08:16:11 +0100 Subject: [PATCH 32/74] Revert "Reset mspaint" This reverts commit a199dfc7d1dcb8221b7e112fd314c75c6759353c. --- base/applications/mspaint/dib.cpp | 2 +- base/applications/mspaint/dib.h | 2 +- base/applications/mspaint/fullscreen.cpp | 2 +- base/applications/mspaint/fullscreen.h | 2 +- base/applications/mspaint/help/settings.html | 14 +- base/applications/mspaint/help/tools.html | 44 +-- base/applications/mspaint/help/usage.html | 8 +- base/applications/mspaint/history.h | 2 +- base/applications/mspaint/lang/pl-PL.rc | 2 +- base/applications/mspaint/lang/ro-RO.rc | 2 +- base/applications/mspaint/main.cpp | 2 +- base/applications/mspaint/miniature.cpp | 2 +- base/applications/mspaint/miniature.h | 2 +- base/applications/mspaint/mouse.cpp | 334 ++++--------------- base/applications/mspaint/palettemodel.cpp | 2 +- base/applications/mspaint/palettemodel.h | 2 +- base/applications/mspaint/registry.h | 2 +- base/applications/mspaint/rsrc.rc | 2 +- base/applications/mspaint/selectionmodel.cpp | 2 +- base/applications/mspaint/selectionmodel.h | 2 +- base/applications/mspaint/sizebox.cpp | 2 +- base/applications/mspaint/textedit.h | 2 +- base/applications/mspaint/toolsettings.h | 2 +- base/applications/mspaint/winproc.cpp | 2 +- base/applications/mspaint/winproc.h | 2 +- 25 files changed, 125 insertions(+), 317 deletions(-) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index ea5ead7427a..93dc3cc4623 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Some DIB related functions * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index 9c1e5d4f09c..0560c24481e 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Some DIB related functions * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/fullscreen.cpp b/base/applications/mspaint/fullscreen.cpp index 53e7f8ceb30..ede0565d925 100644 --- a/base/applications/mspaint/fullscreen.cpp +++ b/base/applications/mspaint/fullscreen.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Window for fullscreen view * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/fullscreen.h b/base/applications/mspaint/fullscreen.h index 02efcca0c91..d5ac52e0426 100644 --- a/base/applications/mspaint/fullscreen.h +++ b/base/applications/mspaint/fullscreen.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Window for fullscreen view * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/help/settings.html b/base/applications/mspaint/help/settings.html index c40c2eed56a..23fb9646c79 100644 --- a/base/applications/mspaint/help/settings.html +++ b/base/applications/mspaint/help/settings.html @@ -15,7 +15,7 @@

Werkzeugeinstellungen

-Im Kapitel Werkzeuge in Paint wurden die Werkzeuge, die Ihnen in Paint fr ReactOS zur Verfgung stehen, kurz vorgestellt. Einige von ihnen erlauben weitere Einstellungen, um z.B. Liniendicke, Pinselart u.. genauer steuern zu knnen. +Im Kapitel Werkzeuge in Paint wurden die Werkzeuge, die Ihnen in Paint f�r Windivs zur Verf�gung stehen, kurz vorgestellt. Einige von ihnen erlauben weitere Einstellungen, um z.B. Liniendicke, Pinselart u.�. genauer steuern zu k�nnen.

@@ -23,22 +23,22 @@

Werkzeugeinstellungen

- + - + - + - + - + - +
Beschreibung
Transparenz - Die obere Einstellung steht fr nicht transparent, die untere steht fr transparent. Bei den Auswahlwerkzeugen bewirkt die transparente Einstellung, dass Stelen in der Auswahl, die der Hintergrundfarbe entsprechen, nicht gezeichnet werden. Das Bild dahinter scheint daher durch.
Beim Textwerkzeug wird standardmig ein Rechteck in der Hintergrundfarbe unter den Text gelegt. Bei der transparenten Einstellung hingegen wird der Text direkt auf das Bild geschrieben.
Transparenz - Die obere Einstellung steht f�r nicht transparent, die untere steht f�r transparent. Bei den Auswahlwerkzeugen bewirkt die transparente Einstellung, dass Stelen in der Auswahl, die der Hintergrundfarbe entsprechen, nicht gezeichnet werden. Das Bild dahinter scheint daher durch.
Beim Textwerkzeug wird standardm��ig ein Rechteck in der Hintergrundfarbe unter den Text gelegt. Bei der transparenten Einstellung hingegen wird der Text direkt auf das Bild geschrieben.
Radiererbreite - Lsst Sie die Breite des Radierwerkzeuges whlen. Die Kstchen entsprechen 4, 6, 8 und 10 Pixeln.
Radiererbreite - L�sst Sie die Breite des Radierwerkzeuges w�hlen. Die K�stchen entsprechen 4, 6, 8 und 10 Pixeln.
Pinselstil - Whlen Sie eine der abgebildeten Pinselformen. Das Pinselwerkzeug zeichnet von nun an mit der gewhlten Form.
Pinselstil - W�hlen Sie eine der abgebildeten Pinselformen. Das Pinselwerkzeug zeichnet von nun an mit der gew�hlten Form.
Sprhradius - Whlen Sie in dem Feld den Sprhradius aus, den Sie fortan mit der Sprhdose verwenden mchten.
Spr�hradius - W�hlen Sie in dem Feld den Spr�hradius aus, den Sie fortan mit der Spr�hdose verwenden m�chten.
Linienbreite - Aus diesem Feld knnen Sie per Mausklick eine Linienbreite zwischen 1 und 5 Pixeln auswhlen. Diese Einstellung beeinflusst die Werkzeuge Linie, Bezier-Kurve, Rechteck, Polygon, Ellipse und abgerundetes Rechteck.
Linienbreite - Aus diesem Feld k�nnen Sie per Mausklick eine Linienbreite zwischen 1 und 5 Pixeln ausw�hlen. Diese Einstellung beeinflusst die Werkzeuge Linie, Bezier-Kurve, Rechteck, Polygon, Ellipse und abgerundetes Rechteck.
Fllart - Aus diesem Feld knnen Sie eine von drei Fllarten auswahlen. Bei der ersten Einstellung wird nur der Rahmen gezeichnet. Die zweite Einstellung fllt zudem den Innenraum der Form mit der aktuellen Hintergrundfarbe. Die dritte Einstellung zeichnet eine ausgefllte Form in der Vordergrundfarbe ohne Rahmen. Diese Einstellungen wirken sich auf das Rechteck, das Polygon, die Ellipse und das abgerundete Rechteck aus.
F�llart - Aus diesem Feld k�nnen Sie eine von drei F�llarten auswahlen. Bei der ersten Einstellung wird nur der Rahmen gezeichnet. Die zweite Einstellung f�llt zudem den Innenraum der Form mit der aktuellen Hintergrundfarbe. Die dritte Einstellung zeichnet eine ausgef�llte Form in der Vordergrundfarbe ohne Rahmen. Diese Einstellungen wirken sich auf das Rechteck, das Polygon, die Ellipse und das abgerundete Rechteck aus.
diff --git a/base/applications/mspaint/help/tools.html b/base/applications/mspaint/help/tools.html index c65eb17fbe6..cf2cdc7aa9a 100644 --- a/base/applications/mspaint/help/tools.html +++ b/base/applications/mspaint/help/tools.html @@ -15,11 +15,11 @@

Werkzeuge in Paint

-Paint fr ReactOS stellt ihnen zum Bearbeiten ihrer Bilder zahlreiche Werkzeuge zur Verfgung. Um eines der +Paint f�r Windivs stellt ihnen zum Bearbeiten ihrer Bilder zahlreiche Werkzeuge zur Verf�gung. Um eines der -Werkzeuge auszuwhlen, klicken Sie bitte auf das entsprechende Symbol im Werkzeugkasten, der sich blicherweise +Werkzeuge auszuw�hlen, klicken Sie bitte auf das entsprechende Symbol im Werkzeugkasten, der sich �blicherweise -auf der linken Seite des Fensters befindet. Es folgt eine Auflistung der Ihnen zur Verfgung stehenden +auf der linken Seite des Fensters befindet. Es folgt eine Auflistung der Ihnen zur Verf�gung stehenden Werkzeuge mit jeweils einer kurzen Beschreibung.

@@ -29,75 +29,75 @@

Werkzeuge in Paint

Beschreibung -Die freie Auswahl ermglicht es Ihnen, einen beliebigen Bereich des Bildes auszuwhlen. Drcken Sie +Die freie Auswahl erm�glicht es Ihnen, einen beliebigen Bereich des Bildes auszuw�hlen. Dr�cken Sie -dazu im Bild die linke Maustaste und umfahren Sie mit der gedrckten Maustaste den Bereich, den Sie auswhlen +dazu im Bild die linke Maustaste und umfahren Sie mit der gedr�ckten Maustaste den Bereich, den Sie ausw�hlen -mchten. Wenn Sie die Maustaste nun loslassen wird der Bereich automatisch in eine geschlossene Auswahl +m�chten. Wenn Sie die Maustaste nun loslassen wird der Bereich automatisch in eine geschlossene Auswahl umgewandelt. -Die rechteckige Auswahl ermglicht es Ihnen, im Bild einen beliebigen rechteckigen Bereich +Die rechteckige Auswahl erm�glicht es Ihnen, im Bild einen beliebigen rechteckigen Bereich -auszuwhlen. Drcken Sie dazu im Bild die linke Maustaste und ziehen Sie die Maus zur diagonal +auszuw�hlen. Dr�cken Sie dazu im Bild die linke Maustaste und ziehen Sie die Maus zur diagonal -gegenberliegenden Seite des gewnschten Rechtecks. Wenn Sie die Maustaste loslassen, erscheint sie soeben +gegen�berliegenden Seite des gew�nschten Rechtecks. Wenn Sie die Maustaste loslassen, erscheint sie soeben erstellte Auswahl. -Der Radierer erlaubt es Ihnen, mit der Hintergrundfarbe zu Malen, um Teile des Bildes zu lschen. +Der Radierer erlaubt es Ihnen, mit der Hintergrundfarbe zu Malen, um Teile des Bildes zu l�schen. -Mchten Sie das gesamte Bild lschen, verwenden Sie bitte den Meneintrag Bild lschen im Men +M�chten Sie das gesamte Bild l�schen, verwenden Sie bitte den Men�eintrag Bild l�schen im Men� Bild.* -Mit dem Fllwerkzeug knnen Sie einfarbige Flchen einfrben. Klicken Sie dazu an eine beliebige Stelle in der Flche.* +Mit dem F�llwerkzeug k�nnen Sie einfarbige Fl�chen einf�rben. Klicken Sie dazu an eine beliebige Stelle in der Fl�che.* -Die Pipette lsst Sie die Farbe an einer bestimmten Position im Bild aufnehmen. Klicken Sie dazu an die Stelle im Bild. Wenn Sie die Maustaste loslassen, wird die aktuelle Vorder-/Hintergrundfarbe auf die Farbe des angeklickten Pixels gesetzt.* +Die Pipette l�sst Sie die Farbe an einer bestimmten Position im Bild aufnehmen. Klicken Sie dazu an die Stelle im Bild. Wenn Sie die Maustaste loslassen, wird die aktuelle Vorder-/Hintergrundfarbe auf die Farbe des angeklickten Pixels gesetzt.* -Mit dem Vergrerungswerkzeug knnen Sie die Ansicht des Bildes vergrern (Linksklick) und verkleinern (Rechtsklick). +Mit dem Vergr��erungswerkzeug k�nnen Sie die Ansicht des Bildes vergr��ern (Linksklick) und verkleinern (Rechtsklick). -Der Stift zeichnet einen dnnen Strich entlang der Linie, die Sie bei gedrckter Maustaste mit der Maus fahren. Mit der jeweils anderen Maustaste knnen Sie den Zeichenvorgang jederzeit Abbrechen und das Bild zurcksetzen.* +Der Stift zeichnet einen d�nnen Strich entlang der Linie, die Sie bei gedr�ckter Maustaste mit der Maus fahren. Mit der jeweils anderen Maustaste k�nnen Sie den Zeichenvorgang jederzeit Abbrechen und das Bild zur�cksetzen.* -Der Pinsel erweitert den Stift um die Mglichkeit, Zeichendicke und Zeichenform auszuwhlen. Nhere Informationen hierzu entnehmen Sie bitte dem Kapitel Werkzeugeinstellungen.* +Der Pinsel erweitert den Stift um die M�glichkeit, Zeichendicke und Zeichenform auszuw�hlen. N�here Informationen hierzu entnehmen Sie bitte dem Kapitel Werkzeugeinstellungen.* -Die Sprhdose kann verwendet werden, um weit gestreute Linien zu zeichnen. Die Dichte der Linie ist dabei von der Geschwindigkeit abhngig mit der Sie die Maus bewegen.* +Die Spr�hdose kann verwendet werden, um weit gestreute Linien zu zeichnen. Die Dichte der Linie ist dabei von der Geschwindigkeit abh�ngig mit der Sie die Maus bewegen.* Textwerkzeug -Eine gerade Linie zeichnen Sie, indem Sie zunchst die linke Maustaste drcken, mit gedrckter Maustaste zum Zielpunkt fahren und dort die Maustaste wieder loslassen.* +Eine gerade Linie zeichnen Sie, indem Sie zun�chst die linke Maustaste dr�cken, mit gedr�ckter Maustaste zum Zielpunkt fahren und dort die Maustaste wieder loslassen.* Bezier-Kurve* -Um ein Rechteck zu zeichnen, Drcken Sie die linke Maustaste. Fahren Sie mit der Maus bei gedrckter Maustaste in die diagonal gegenberliegende Ecke und lassen Sie die Maustaste los.* +Um ein Rechteck zu zeichnen, Dr�cken Sie die linke Maustaste. Fahren Sie mit der Maus bei gedr�ckter Maustaste in die diagonal gegen�berliegende Ecke und lassen Sie die Maustaste los.* Polygon* -Eine Ellipse zeichnen Sie, indem Sie mit der Maus, wie unter Rechteck beschrieben, die Diagonale des Auenrechtecks der Ellipse ziehen.* +Eine Ellipse zeichnen Sie, indem Sie mit der Maus, wie unter Rechteck beschrieben, die Diagonale des Au�enrechtecks der Ellipse ziehen.* -Das abgerundete Rechteck verhlt sich wie das Rechteck. Sie ziehen mit der Maus die Diagonale des Rechtecks, das Sie zeichnen mchten.* +Das abgerundete Rechteck verh�lt sich wie das Rechteck. Sie ziehen mit der Maus die Diagonale des Rechtecks, das Sie zeichnen m�chten.*

* Dieses Wekzeug kann auch mit der rechten Maustaste verwendet werden. Vorder- und Hintergrundfarbe werden in diesem Fall vertauscht verwendet.

-Viele Werkzeuge erlauben daruber hinaus weitere Einstellungen. Eine Liste dieser Einstellungsmglichkeiten entnehmen Sie bitte dem Kapitel Werkzeugeinstellungen. +Viele Werkzeuge erlauben daruber hinaus weitere Einstellungen. Eine Liste dieser Einstellungsm�glichkeiten entnehmen Sie bitte dem Kapitel Werkzeugeinstellungen.

diff --git a/base/applications/mspaint/help/usage.html b/base/applications/mspaint/help/usage.html index 84fbee7f539..d45da2ad5eb 100644 --- a/base/applications/mspaint/help/usage.html +++ b/base/applications/mspaint/help/usage.html @@ -15,7 +15,7 @@

Benutzung von Paint

-Die Hauptbedienelemente von Paint fr ReactOS sind die Farbpalette, der Werkzeugkasten und das Feld fr die Werkzeugeinstellungen. Diese Bedienelemente knnen ohne Hilfsmittel wie die Tastaturmaus nicht ber die Tastatur, sondern ausschlielich ber die Maus bedient werden. +Die Hauptbedienelemente von Paint f�r Windivs sind die Farbpalette, der Werkzeugkasten und das Feld f�r die Werkzeugeinstellungen. Diese Bedienelemente k�nnen ohne Hilfsmittel wie die Tastaturmaus nicht �ber die Tastatur, sondern ausschlie�lich �ber die Maus bedient werden.

Es folgt ein Bildschirmfoto des Hauptfensters, in dem die genannten Elemente rot markiert und beschriftet sind. @@ -23,15 +23,15 @@

Benutzung von Paint

- +
Farbpalette

ber die Farbpalette whlen Sie die zum Malen verwendete Vorder- und Hintergrundfarbe. Klicken Sie mit der linken Maustaste auf eine Farbe in der Palette, wird diese als Vordergrundfarbe gesetzt. Wenn Sie sie mit der rechten Maustaste anklicken, wird sie als Hintergrundfarbe gesetzt. Sie knnen die Farbe an der entsprechenden Stelle in der Palette verndern, indem Sie mit der linken oder rechten Maustaste doppelt klicken.

�ber die Farbpalette w�hlen Sie die zum Malen verwendete Vorder- und Hintergrundfarbe. Klicken Sie mit der linken Maustaste auf eine Farbe in der Palette, wird diese als Vordergrundfarbe gesetzt. Wenn Sie sie mit der rechten Maustaste anklicken, wird sie als Hintergrundfarbe gesetzt. Sie k�nnen die Farbe an der entsprechenden Stelle in der Palette ver�ndern, indem Sie mit der linken oder rechten Maustaste doppelt klicken.

- +
Werkzeugkasten
ber den Werkzeugkasten knnen Sie durch anklicken Ihr Malwerkzeug auswhlen. Eine bersicht ber die vorhandenen Werkzeuge finden Sie im Kapitel Werkzeuge in Paint. Jedes Werkzeug bringt seine eigenen Werkzeugeinstellungen mit sich.
�ber den Werkzeugkasten k�nnen Sie durch anklicken Ihr Malwerkzeug ausw�hlen. Eine �bersicht �ber die vorhandenen Werkzeuge finden Sie im Kapitel Werkzeuge in Paint. Jedes Werkzeug bringt seine eigenen Werkzeugeinstellungen mit sich.

- +
Werkzeugeinstellungen
Viele Werkzeuge erlauben es Ihnen, erweiterte Einstellungen vorzunehmen. Hierzu verwenden Sie das Feld unter dem Werkzeugkasten. Eine Liste aller mglichen Einstellungen aller Werkzeuge finden Sie im Kapitel Werkzeugeinstellungen.
Viele Werkzeuge erlauben es Ihnen, erweiterte Einstellungen vorzunehmen. Hierzu verwenden Sie das Feld unter dem Werkzeugkasten. Eine Liste aller m�glichen Einstellungen aller Werkzeuge finden Sie im Kapitel Werkzeugeinstellungen.

diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index b9fe323db67..f9d63625b1f 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Undo and redo functionality * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 8a9261e7732..3506917b09d 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -229,7 +229,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint dla ReactOS" + IDS_INFOTITLE "Paint dla Windivs" IDS_INFOTEXT "Dostępny na licencji GNU Lesser General Public License (LGPL, www.gnu.org)" IDS_SAVEPROMPTTEXT "Czy chcesz zapisać zmiany do pliku %s?" IDS_DEFAULTFILENAME "bez tytułu" diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 69d2fcc2478..3f6fdb07fed 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -228,7 +228,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Pictare" IDS_WINDOWTITLE "%s - Pictare" - IDS_INFOTITLE "Pictare pentru ReactOS" + IDS_INFOTITLE "Pictare pentru Windivs" IDS_INFOTEXT "Disponibilă sub licența GNU Lesser General Public (vedeți www.gnu.org)" IDS_SAVEPROMPTTEXT "Doriți păstrarea modificărilor din %s?" IDS_DEFAULTFILENAME "Fără nume" diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index a4cbb54b5b0..d80249afdfe 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Initializing everything * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/miniature.cpp b/base/applications/mspaint/miniature.cpp index dc9eacbca2f..029692d9704 100644 --- a/base/applications/mspaint/miniature.cpp +++ b/base/applications/mspaint/miniature.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Window procedure of the main window and all children apart from * hPalWin, hToolSettings and hSelection diff --git a/base/applications/mspaint/miniature.h b/base/applications/mspaint/miniature.h index 7c7d30d2c7f..6183f141275 100644 --- a/base/applications/mspaint/miniature.h +++ b/base/applications/mspaint/miniature.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Window procedure of the main window and all children apart from * hPalWin, hToolSettings and hSelection diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index c7c19e16544..f6cb9e2ac22 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -18,28 +18,28 @@ POINT ToolBase::s_pointStack[256] = { { 0 } }; void regularize(LONG x0, LONG y0, LONG& x1, LONG& y1) { - if (labs(x1 - x0) >= labs(y1 - y0)) - y1 = y0 + (y1 > y0 ? labs(x1 - x0) : -labs(x1 - x0)); + if (abs(x1 - x0) >= abs(y1 - y0)) + y1 = y0 + (y1 > y0 ? abs(x1 - x0) : -abs(x1 - x0)); else - x1 = x0 + (x1 > x0 ? labs(y1 - y0) : -labs(y1 - y0)); + x1 = x0 + (x1 > x0 ? abs(y1 - y0) : -abs(y1 - y0)); } void roundTo8Directions(LONG x0, LONG y0, LONG& x1, LONG& y1) { - if (labs(x1 - x0) >= labs(y1 - y0)) + if (abs(x1 - x0) >= abs(y1 - y0)) { - if (labs(y1 - y0) * 5 < labs(x1 - x0) * 2) + if (abs(y1 - y0) * 5 < abs(x1 - x0) * 2) y1 = y0; else - y1 = y0 + (y1 > y0 ? labs(x1 - x0) : -labs(x1 - x0)); + y1 = y0 + (y1 > y0 ? abs(x1 - x0) : -abs(x1 - x0)); } else { - if (labs(x1 - x0) * 5 < labs(y1 - y0) * 2) + if (abs(x1 - x0) * 5 < abs(y1 - y0) * 2) x1 = x0; else - x1 = x0 + (x1 > x0 ? labs(y1 - y0) : -labs(y1 - y0)); + x1 = x0 + (x1 > x0 ? abs(y1 - y0) : -abs(y1 - y0)); } } @@ -50,6 +50,18 @@ BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1) return (abs(x1 - x0) <= cxThreshold) && (abs(y1 - y0) <= cyThreshold); } +void updateStartAndLast(LONG x, LONG y) +{ + g_ptStart.x = g_ptEnd.x = x; + g_ptStart.y = g_ptEnd.y = y; +} + +void updateLast(LONG x, LONG y) +{ + g_ptEnd.x = x; + g_ptEnd.y = y; +} + void ToolBase::reset() { s_pointSP = 0; @@ -112,7 +124,10 @@ struct FreeSelTool : ToolBase void OnDrawOverlayOnImage(HDC hdc) override { if (!selectionModel.IsLanded()) + { + selectionModel.DrawBackgroundPoly(hdc, selectionModel.m_rgbBack); selectionModel.DrawSelection(hdc, paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); + } if (canvasWindow.m_drawing) { @@ -138,7 +153,7 @@ struct FreeSelTool : ToolBase m_bLeftButton = bLeftButton; } - BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { if (bLeftButton) { @@ -147,10 +162,9 @@ struct FreeSelTool : ToolBase selectionModel.PushToPtStack(pt); imageModel.NotifyImageChanged(); } - return TRUE; } - BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { if (bLeftButton) { @@ -172,7 +186,6 @@ struct FreeSelTool : ToolBase canvasWindow.ClientToScreen(&pt); mainWindow.TrackPopupMenu(pt, 0); } - return TRUE; } void OnFinishDraw() override @@ -186,11 +199,6 @@ struct FreeSelTool : ToolBase selectionModel.HideSelection(); ToolBase::OnCancelDraw(); } - - void OnSpecialTweak(BOOL bMinus) override - { - selectionModel.StretchSelection(bMinus); - } }; // TOOL_RECTSEL @@ -205,7 +213,10 @@ struct RectSelTool : ToolBase void OnDrawOverlayOnImage(HDC hdc) override { if (!selectionModel.IsLanded()) + { + selectionModel.DrawBackgroundRect(hdc, selectionModel.m_rgbBack); selectionModel.DrawSelection(hdc, paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); + } if (canvasWindow.m_drawing) { @@ -230,7 +241,7 @@ struct RectSelTool : ToolBase m_bLeftButton = bLeftButton; } - BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { if (bLeftButton) { @@ -239,10 +250,9 @@ struct RectSelTool : ToolBase selectionModel.SetRectFromPoints(g_ptStart, pt); imageModel.NotifyImageChanged(); } - return TRUE; } - BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { POINT pt = { x, y }; if (bLeftButton) @@ -257,7 +267,6 @@ struct RectSelTool : ToolBase canvasWindow.ClientToScreen(&pt); mainWindow.TrackPopupMenu(pt, 0); } - return TRUE; } void OnFinishDraw() override @@ -271,11 +280,6 @@ struct RectSelTool : ToolBase selectionModel.HideSelection(); ToolBase::OnCancelDraw(); } - - void OnSpecialTweak(BOOL bMinus) override - { - selectionModel.StretchSelection(bMinus); - } }; struct TwoPointDrawTool : ToolBase @@ -291,22 +295,26 @@ struct TwoPointDrawTool : ToolBase { m_bLeftButton = bLeftButton; m_bDrawing = TRUE; + g_ptStart.x = g_ptEnd.x = x; + g_ptStart.y = g_ptEnd.y = y; imageModel.NotifyImageChanged(); } - BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { + g_ptEnd.x = x; + g_ptEnd.y = y; imageModel.NotifyImageChanged(); - return TRUE; } - BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { + g_ptEnd.x = x; + g_ptEnd.y = y; imageModel.PushImageForUndo(); OnDrawOverlayOnImage(m_hdc); m_bDrawing = FALSE; imageModel.NotifyImageChanged(); - return TRUE; } void OnFinishDraw() override @@ -320,109 +328,10 @@ struct TwoPointDrawTool : ToolBase m_bDrawing = FALSE; ToolBase::OnCancelDraw(); } - - void OnSpecialTweak(BOOL bMinus) override - { - toolsModel.MakeLineThickerOrThinner(bMinus); - } }; -typedef enum DIRECTION -{ - NO_DIRECTION = -1, - DIRECTION_HORIZONTAL, - DIRECTION_VERTICAL, - DIRECTION_DIAGONAL_RIGHT_DOWN, - DIRECTION_DIAGONAL_RIGHT_UP, -} DIRECTION; - -#define THRESHOULD_DEG 15 - -static DIRECTION -GetDirection(LONG x0, LONG y0, LONG x1, LONG y1) -{ - LONG dx = x1 - x0, dy = y1 - y0; - - if (labs(dx) <= 8 && labs(dy) <= 8) - return NO_DIRECTION; - - double radian = atan2((double)dy, (double)dx); - if (radian < DEG2RAD(-180 + THRESHOULD_DEG)) - { - ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); - return DIRECTION_HORIZONTAL; - } - if (radian < DEG2RAD(-90 - THRESHOULD_DEG)) - { - ATLTRACE("DIRECTION_DIAGONAL_RIGHT_DOWN: %ld\n", RAD2DEG(radian)); - return DIRECTION_DIAGONAL_RIGHT_DOWN; - } - if (radian < DEG2RAD(-90 + THRESHOULD_DEG)) - { - ATLTRACE("DIRECTION_VERTICAL: %ld\n", RAD2DEG(radian)); - return DIRECTION_VERTICAL; - } - if (radian < DEG2RAD(-THRESHOULD_DEG)) - { - ATLTRACE("DIRECTION_DIAGONAL_RIGHT_UP: %ld\n", RAD2DEG(radian)); - return DIRECTION_DIAGONAL_RIGHT_UP; - } - if (radian < DEG2RAD(+THRESHOULD_DEG)) - { - ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); - return DIRECTION_HORIZONTAL; - } - if (radian < DEG2RAD(+90 - THRESHOULD_DEG)) - { - ATLTRACE("DIRECTION_DIAGONAL_RIGHT_DOWN: %ld\n", RAD2DEG(radian)); - return DIRECTION_DIAGONAL_RIGHT_DOWN; - } - if (radian < DEG2RAD(+90 + THRESHOULD_DEG)) - { - ATLTRACE("DIRECTION_VERTICAL: %ld\n", RAD2DEG(radian)); - return DIRECTION_VERTICAL; - } - if (radian < DEG2RAD(+180 - THRESHOULD_DEG)) - { - ATLTRACE("DIRECTION_DIAGONAL_RIGHT_UP: %ld\n", RAD2DEG(radian)); - return DIRECTION_DIAGONAL_RIGHT_UP; - } - ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); - return DIRECTION_HORIZONTAL; -} - -static void -RestrictDrawDirection(DIRECTION dir, LONG x0, LONG y0, LONG& x1, LONG& y1) -{ - switch (dir) - { - case NO_DIRECTION: - default: - return; - - case DIRECTION_HORIZONTAL: - y1 = y0; - break; - - case DIRECTION_VERTICAL: - x1 = x0; - break; - - case DIRECTION_DIAGONAL_RIGHT_DOWN: - y1 = y0 + (x1 - x0); - break; - - case DIRECTION_DIAGONAL_RIGHT_UP: - x1 = x0 - (y1 - y0); - break; - } -} - struct SmoothDrawTool : ToolBase { - DIRECTION m_direction = NO_DIRECTION; - BOOL m_bShiftDown = FALSE; - SmoothDrawTool(TOOLTYPE type) : ToolBase(type) { } @@ -431,48 +340,22 @@ struct SmoothDrawTool : ToolBase void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { - m_direction = NO_DIRECTION; imageModel.PushImageForUndo(); + g_ptStart.x = g_ptEnd.x = x; + g_ptStart.y = g_ptEnd.y = y; imageModel.NotifyImageChanged(); - m_bShiftDown = (::GetKeyState(VK_SHIFT) & 0x8000); // Is Shift key pressed? } - BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { - if (m_bShiftDown) - { - if (m_direction == NO_DIRECTION) - { - m_direction = GetDirection(g_ptStart.x, g_ptStart.y, x, y); - if (m_direction == NO_DIRECTION) - return FALSE; - } - - RestrictDrawDirection(m_direction, g_ptStart.x, g_ptStart.y, x, y); - } - else - { - draw(bLeftButton, x, y); - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; - return TRUE; - } - draw(bLeftButton, x, y); imageModel.NotifyImageChanged(); - return TRUE; } - BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { - if (m_bShiftDown && m_direction != NO_DIRECTION) - { - RestrictDrawDirection(m_direction, g_ptStart.x, g_ptStart.y, x, y); - } - draw(bLeftButton, x, y); OnFinishDraw(); - return TRUE; } void OnFinishDraw() override @@ -482,8 +365,7 @@ struct SmoothDrawTool : ToolBase void OnCancelDraw() override { - LONG x = 0, y = 0; - OnButtonUp(FALSE, x, y); + OnButtonUp(FALSE, 0, 0); imageModel.Undo(TRUE); ToolBase::OnCancelDraw(); } @@ -502,11 +384,8 @@ struct RubberTool : SmoothDrawTool Erase(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, m_bg, toolsModel.GetRubberRadius()); else Replace(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, m_fg, m_bg, toolsModel.GetRubberRadius()); - } - - void OnSpecialTweak(BOOL bMinus) override - { - toolsModel.MakeRubberThickerOrThinner(bMinus); + g_ptEnd.x = x; + g_ptEnd.y = y; } }; @@ -546,84 +425,41 @@ struct ColorTool : ToolBase paletteModel.SetBgColor(rgbColor); } - BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { fetchColor(bLeftButton, x, y); - return TRUE; } - BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { fetchColor(bLeftButton, x, y); toolsModel.SetActiveTool(toolsModel.GetOldActiveTool()); - return TRUE; } }; // TOOL_ZOOM struct ZoomTool : ToolBase { - BOOL m_bZoomed = FALSE; - ZoomTool() : ToolBase(TOOL_ZOOM) { } - BOOL getNewZoomRect(CRect& rcView, INT newZoom); - - void OnDrawOverlayOnCanvas(HDC hdc) override - { - CRect rcView; - INT oldZoom = toolsModel.GetZoom(); - if (oldZoom < MAX_ZOOM && getNewZoomRect(rcView, oldZoom * 2)) - DrawXorRect(hdc, &rcView); - } - void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { - INT newZoom, oldZoom = toolsModel.GetZoom(); + imageModel.PushImageForUndo(); if (bLeftButton) - newZoom = (oldZoom < MAX_ZOOM) ? (oldZoom * 2) : MIN_ZOOM; + { + if (toolsModel.GetZoom() < MAX_ZOOM) + zoomTo(toolsModel.GetZoom() * 2, x, y); + } else - newZoom = (oldZoom > MIN_ZOOM) ? (oldZoom / 2) : MAX_ZOOM; - - m_bZoomed = FALSE; - - if (oldZoom != newZoom) { - CRect rcView; - if (getNewZoomRect(rcView, newZoom)) - { - canvasWindow.zoomTo(newZoom, rcView.left, rcView.top); - m_bZoomed = TRUE; - } + if (toolsModel.GetZoom() > MIN_ZOOM) + zoomTo(toolsModel.GetZoom() / 2, x, y); } } - - BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override - { - if (m_bZoomed) - toolsModel.SetActiveTool(toolsModel.GetOldActiveTool()); - - return TRUE; - } }; -BOOL ZoomTool::getNewZoomRect(CRect& rcView, INT newZoom) -{ - CPoint pt; - ::GetCursorPos(&pt); - canvasWindow.ScreenToClient(&pt); - - canvasWindow.getNewZoomRect(rcView, newZoom, pt); - - CRect rc; - canvasWindow.GetImageRect(rc); - canvasWindow.ImageToCanvas(rc); - - return rc.PtInRect(pt); -} - // TOOL_PEN struct PenTool : SmoothDrawTool { @@ -634,12 +470,10 @@ struct PenTool : SmoothDrawTool void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; - Line(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetPenWidth()); - } - - void OnSpecialTweak(BOOL bMinus) override - { - toolsModel.MakePenThickerOrThinner(bMinus); + Line(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, 1); + ::SetPixelV(m_hdc, x, y, rgb); + g_ptEnd.x = x; + g_ptEnd.y = y; } }; @@ -653,13 +487,9 @@ struct BrushTool : SmoothDrawTool void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; - Brush(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetBrushStyle(), - toolsModel.GetBrushWidth()); - } - - void OnSpecialTweak(BOOL bMinus) override - { - toolsModel.MakeBrushThickerOrThinner(bMinus); + Brush(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetBrushStyle()); + g_ptEnd.x = x; + g_ptEnd.y = y; } }; @@ -675,11 +505,6 @@ struct AirBrushTool : SmoothDrawTool COLORREF rgb = bLeftButton ? m_fg : m_bg; Airbrush(m_hdc, x, y, rgb, toolsModel.GetAirBrushWidth()); } - - void OnSpecialTweak(BOOL bMinus) override - { - toolsModel.MakeAirBrushThickerOrThinner(bMinus); - } }; // TOOL_TEXT @@ -715,10 +540,9 @@ struct TextTool : ToolBase UpdatePoint(x, y); } - BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { UpdatePoint(x, y); - return TRUE; } void draw(HDC hdc) @@ -744,7 +568,7 @@ struct TextTool : ToolBase selectionModel.HideSelection(); } - BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { POINT pt = { x, y }; imageModel.Clamp(pt); @@ -761,7 +585,7 @@ struct TextTool : ToolBase if (::IsRectEmpty(&selectionModel.m_rc)) { quit(); - return TRUE; + return; } } @@ -796,13 +620,11 @@ struct TextTool : ToolBase textEditWindow.ValidateEditRect(&rc); textEditWindow.ShowWindow(SW_SHOWNOACTIVATE); textEditWindow.SetFocus(); - return TRUE; } void OnFinishDraw() override { - if (::IsWindowVisible(textEditWindow) && - textEditWindow.GetWindowTextLength() > 0) + if (textEditWindow.GetWindowTextLength() > 0) { imageModel.PushImageForUndo(); draw(m_hdc); @@ -888,25 +710,23 @@ struct BezierTool : ToolBase imageModel.NotifyImageChanged(); } - BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { s_pointStack[s_pointSP].x = x; s_pointStack[s_pointSP].y = y; imageModel.NotifyImageChanged(); - return TRUE; } - BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { s_pointStack[s_pointSP].x = x; s_pointStack[s_pointSP].y = y; if (s_pointSP >= 3) { OnFinishDraw(); - return TRUE; + return; } imageModel.NotifyImageChanged(); - return TRUE; } void OnCancelDraw() override @@ -922,11 +742,6 @@ struct BezierTool : ToolBase m_bDrawing = FALSE; ToolBase::OnFinishDraw(); } - - void OnSpecialTweak(BOOL bMinus) override - { - toolsModel.MakeLineThickerOrThinner(bMinus); - } }; // TOOL_RECT @@ -997,7 +812,7 @@ struct ShapeTool : ToolBase imageModel.NotifyImageChanged(); } - BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override + void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); @@ -1006,10 +821,9 @@ struct ShapeTool : ToolBase s_pointStack[s_pointSP].y = y; imageModel.NotifyImageChanged(); - return TRUE; } - BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override + void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); @@ -1018,7 +832,7 @@ struct ShapeTool : ToolBase if (nearlyEqualPoints(x, y, s_pointStack[0].x, s_pointStack[0].y)) { OnFinishDraw(); - return TRUE; + return; } else { @@ -1031,7 +845,6 @@ struct ShapeTool : ToolBase s_pointSP--; imageModel.NotifyImageChanged(); - return TRUE; } void OnCancelDraw() override @@ -1055,11 +868,6 @@ struct ShapeTool : ToolBase ToolBase::OnFinishDraw(); } - - void OnSpecialTweak(BOOL bMinus) override - { - toolsModel.MakeLineThickerOrThinner(bMinus); - } }; // TOOL_ELLIPSE diff --git a/base/applications/mspaint/palettemodel.cpp b/base/applications/mspaint/palettemodel.cpp index 6d67523bbe5..52c3b766941 100644 --- a/base/applications/mspaint/palettemodel.cpp +++ b/base/applications/mspaint/palettemodel.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Keep track of palette data, notify listeners * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/palettemodel.h b/base/applications/mspaint/palettemodel.h index 80ca5e82d04..1b3d3fa66dd 100644 --- a/base/applications/mspaint/palettemodel.h +++ b/base/applications/mspaint/palettemodel.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Keep track of palette data, notify listeners * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/registry.h b/base/applications/mspaint/registry.h index d843c7b2be6..89d3aa69420 100644 --- a/base/applications/mspaint/registry.h +++ b/base/applications/mspaint/registry.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Offering functions dealing with registry values * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/rsrc.rc b/base/applications/mspaint/rsrc.rc index 316473f9357..9d3a7890b5d 100644 --- a/base/applications/mspaint/rsrc.rc +++ b/base/applications/mspaint/rsrc.rc @@ -13,7 +13,7 @@ #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Paint" +#define REACTOS_STR_FILE_DESCRIPTION "Windivs Paint" #define REACTOS_STR_INTERNAL_NAME "mspaint" #define REACTOS_STR_ORIGINAL_FILENAME "mspaint.exe" diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index a5e81d5c41a..843979f05bd 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Keep track of selection parameters, notify listeners * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index b47a0d40821..6585088f1c1 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Keep track of selection parameters, notify listeners * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/sizebox.cpp b/base/applications/mspaint/sizebox.cpp index a389fefb980..d2509d6f8e8 100644 --- a/base/applications/mspaint/sizebox.cpp +++ b/base/applications/mspaint/sizebox.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Window procedure of the size boxes * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/textedit.h b/base/applications/mspaint/textedit.h index 884d83e8b23..78b53d4408e 100644 --- a/base/applications/mspaint/textedit.h +++ b/base/applications/mspaint/textedit.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Text editor and font chooser for the text tool * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/toolsettings.h b/base/applications/mspaint/toolsettings.h index 7b582256731..be9b09928dd 100644 --- a/base/applications/mspaint/toolsettings.h +++ b/base/applications/mspaint/toolsettings.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Window procedure of the tool settings window * COPYRIGHT: Copyright 2015 Benedikt Freisen diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index a15e6dd3d6b..ba3fbbc72a3 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Window procedure of the main window and all children apart from * hPalWin, hToolSettings and hSelection diff --git a/base/applications/mspaint/winproc.h b/base/applications/mspaint/winproc.h index fc2861b228c..749f5b5c1a2 100644 --- a/base/applications/mspaint/winproc.h +++ b/base/applications/mspaint/winproc.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Window procedure of the main window and all children apart from * hPalWin, hToolSettings and hSelection From f4d325ec0acbb57fe93b8b799f854ea5c5cfe339 Mon Sep 17 00:00:00 2001 From: jpb Date: Sat, 21 Oct 2023 08:17:08 +0100 Subject: [PATCH 33/74] Revert "[MSPAINT] Implement mouse middle button dragging (#5804)" This reverts commit c7cea546986531b4f251b6e55553ff8aa8c8378a. --- base/applications/mspaint/canvas.cpp | 36 +++---------------- base/applications/mspaint/canvas.h | 14 ++++---- base/applications/mspaint/icons/handdrag.cur | Bin 326 -> 0 bytes base/applications/mspaint/resource.h | 1 - base/applications/mspaint/rsrc.rc | 1 - 5 files changed, 11 insertions(+), 41 deletions(-) delete mode 100644 base/applications/mspaint/icons/handdrag.cur diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 4f891aa7897..3568657a21f 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -229,7 +229,7 @@ VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar) { case SB_THUMBTRACK: case SB_THUMBPOSITION: - si.nPos = (SHORT)HIWORD(wParam); + si.nPos = HIWORD(wParam); break; case SB_LINELEFT: si.nPos -= 5; @@ -244,9 +244,9 @@ VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar) si.nPos += si.nPage; break; } - si.nPos = max(min(si.nPos, si.nMax), si.nMin); SetScrollInfo(fnBar, &si); - Invalidate(); + Update(m_hWnd); + Invalidate(FALSE); // FIXME: Flicker } LRESULT CCanvasWindow::OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -265,17 +265,6 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; - m_nMouseDownMsg = nMsg; - BOOL bLeftButton = (nMsg == WM_LBUTTONDOWN); - - if (nMsg == WM_MBUTTONDOWN) - { - m_ptOrig = pt; - SetCapture(); - ::SetCursor(::LoadCursor(g_hinstExe, MAKEINTRESOURCE(IDC_HANDDRAG))); - return 0; - } - HITTEST hitSelection = SelectionHitTest(pt); if (hitSelection != HIT_NONE) { @@ -376,17 +365,6 @@ LRESULT CCanvasWindow::OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; - - if (m_nMouseDownMsg == WM_MBUTTONDOWN) - { - INT x = GetScrollPos(SB_HORZ) - (pt.x - m_ptOrig.x); - INT y = GetScrollPos(SB_VERT) - (pt.y - m_ptOrig.y); - SendMessage(WM_HSCROLL, MAKEWPARAM(SB_THUMBPOSITION, x), 0); - SendMessage(WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, y), 0); - m_ptOrig = pt; - return 0; - } - CanvasToImage(pt); if (m_hitSelection != HIT_NONE) @@ -655,12 +633,8 @@ LRESULT CCanvasWindow::OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL return OnLRButtonUp(FALSE, nMsg, wParam, lParam, bHandled); } - if (m_nMouseDownMsg == WM_MBUTTONDOWN) - { - ::SetCursor(::LoadCursor(g_hinstExe, MAKEINTRESOURCE(IDC_HANDDRAG))); - return 0; - } - +LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ POINT pt; ::GetCursorPos(&pt); ScreenToClient(&pt); diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index a27589dd044..db0e549837b 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -20,15 +20,13 @@ class CCanvasWindow : public CWindowImpl MESSAGE_HANDLER(WM_HSCROLL, OnHScroll) MESSAGE_HANDLER(WM_VSCROLL, OnVScroll) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) - MESSAGE_HANDLER(WM_LBUTTONDOWN, OnButtonDown) - MESSAGE_HANDLER(WM_RBUTTONDOWN, OnButtonDown) - MESSAGE_HANDLER(WM_MBUTTONDOWN, OnButtonDown) - MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnButtonDblClk) - MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnButtonDblClk) + MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) + MESSAGE_HANDLER(WM_RBUTTONDOWN, OnRButtonDown) + MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnLButtonDblClk) + MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnRButtonDblClk) MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) - MESSAGE_HANDLER(WM_LBUTTONUP, OnButtonUp) - MESSAGE_HANDLER(WM_RBUTTONUP, OnButtonUp) - MESSAGE_HANDLER(WM_MBUTTONUP, OnButtonUp) + MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) + MESSAGE_HANDLER(WM_RBUTTONUP, OnRButtonUp) MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) MESSAGE_HANDLER(WM_MOUSEWHEEL, OnMouseWheel) MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) diff --git a/base/applications/mspaint/icons/handdrag.cur b/base/applications/mspaint/icons/handdrag.cur deleted file mode 100644 index 74e5ba6b9c2b8e84d7696ce289ed5ba5296f4efa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZ|Ku?@m75CzchP*9;z(c+Sl4Z Date: Wed, 9 Aug 2023 08:17:07 +0900 Subject: [PATCH 34/74] [MSPAINT][ATL] Delete deprecated functions (#5542) - Rewrite CImageDx to reduce improper dependency with CImage. - Check if the filename extension is supported before saving the files. - Delete deprecated functions in CImage. CORE-19094 --- base/applications/mspaint/atlimagedx.h | 331 ++++++++++++++++++++----- base/applications/mspaint/dib.cpp | 14 +- base/applications/mspaint/precomp.h | 1 - base/applications/mspaint/winproc.cpp | 10 + sdk/lib/atl/atlimage.h | 34 +-- 5 files changed, 294 insertions(+), 96 deletions(-) diff --git a/base/applications/mspaint/atlimagedx.h b/base/applications/mspaint/atlimagedx.h index 735d4716dc7..6469e9d471b 100644 --- a/base/applications/mspaint/atlimagedx.h +++ b/base/applications/mspaint/atlimagedx.h @@ -7,135 +7,340 @@ #pragma once -class CImageDx : public CImage +#include + +namespace GPDE = Gdiplus::DllExports; + +class CImageDx { +protected: + HBITMAP m_hBitmap = NULL; + public: - CImageDx() : CImage() + CImageDx() { - GetImageHorizontalResolution = NULL; - GetImageVerticalResolution = NULL; - BitmapSetResolution = NULL; + _shared()->AddRef(); } - BOOL GetResolution(Gdiplus::GpImage *pImage, float *pxDpi, float *pyDpi) + ~CImageDx() { - *pxDpi = 96; - *pyDpi = 96; + if (m_hBitmap) + ::DeleteObject(m_hBitmap); + + _shared()->Release(); + } + + void Attach(HBITMAP hbm) + { + if (m_hBitmap) + ::DeleteObject(m_hBitmap); + m_hBitmap = hbm; + } + + HBITMAP Detach() + { + HBITMAP hbmOld = m_hBitmap; + m_hBitmap = NULL; + return hbmOld; + } - if (GetImageHorizontalResolution == NULL || GetImageVerticalResolution == NULL) + BOOL GetResolution(Gdiplus::GpImage *pImage, float *pxDpi, float *pyDpi) + { + if (!get_fn(_shared()->m_GetImageHorizontalResolution, "GdipGetImageHorizontalResolution") || + !get_fn(_shared()->m_GetImageVerticalResolution, "GdipGetImageVerticalResolution")) { - GetImageHorizontalResolution = - AddrOf("GdipGetImageHorizontalResolution"); - GetImageVerticalResolution = - AddrOf("GdipGetImageVerticalResolution"); + return FALSE; } - if (GetImageHorizontalResolution == NULL || GetImageVerticalResolution == NULL) - return FALSE; + if (pxDpi) + _shared()->m_GetImageHorizontalResolution(pImage, pxDpi); + if (pyDpi) + _shared()->m_GetImageVerticalResolution(pImage, pyDpi); - GetImageHorizontalResolution(pImage, pxDpi); - GetImageVerticalResolution(pImage, pyDpi); return TRUE; } - BOOL SetResolution(Gdiplus::GpBitmap *pBitmap, float xDpi, float yDpi) const + BOOL SetResolution(Gdiplus::GpBitmap *pBitmap, float xDpi, float yDpi) { - if (BitmapSetResolution == NULL) - BitmapSetResolution = AddrOf("GdipBitmapSetResolution"); - - if (BitmapSetResolution == NULL) + if (!get_fn(_shared()->m_BitmapSetResolution, "GdipBitmapSetResolution")) return FALSE; - BitmapSetResolution(pBitmap, xDpi, yDpi); + _shared()->m_BitmapSetResolution(pBitmap, xDpi, yDpi); return TRUE; } HRESULT LoadDx(LPCTSTR pszFileName, float *pxDpi, float *pyDpi) throw() { - // convert the file name string into Unicode - CStringW pszNameW(pszFileName); + using namespace Gdiplus; + + _shared()->AddRef(); + + if (!get_fn(_shared()->m_CreateBitmapFromFile, "GdipCreateBitmapFromFile") || + !get_fn(_shared()->m_CreateHBITMAPFromBitmap, "GdipCreateHBITMAPFromBitmap") || + !get_fn(_shared()->m_DisposeImage, "GdipDisposeImage")) + { + _shared()->Release(); + return E_FAIL; + } // create a GpBitmap object from file - using namespace Gdiplus; GpBitmap *pBitmap = NULL; - if (GetCommon().CreateBitmapFromFile(pszNameW, &pBitmap) != Ok) + if (_shared()->m_CreateBitmapFromFile(pszFileName, &pBitmap) != Ok) { + _shared()->Release(); return E_FAIL; } - // get bitmap handle + // get an HBITMAP HBITMAP hbm = NULL; Color color(0xFF, 0xFF, 0xFF); - Gdiplus::Status status; - status = GetCommon().CreateHBITMAPFromBitmap(pBitmap, &hbm, color.GetValue()); + Status status = _shared()->m_CreateHBITMAPFromBitmap(pBitmap, &hbm, color.GetValue()); // get the resolution - GetResolution((Gdiplus::GpImage*)pBitmap, pxDpi, pyDpi); + if (pxDpi || pyDpi) + GetResolution((GpImage*)pBitmap, pxDpi, pyDpi); // delete GpBitmap - GetCommon().DisposeImage(pBitmap); + _shared()->m_DisposeImage(pBitmap); // attach it if (status == Ok) Attach(hbm); + + _shared()->Release(); return (status == Ok ? S_OK : E_FAIL); } HRESULT SaveDx(LPCTSTR pszFileName, REFGUID guidFileType = GUID_NULL, - float xDpi = 0, float yDpi = 0) const throw() + float xDpi = 0, float yDpi = 0) throw() { using namespace Gdiplus; - ATLASSERT(m_hbm); - - // TODO & FIXME: set parameters (m_rgbTransColor etc.) - // convert the file name string into Unicode - CStringW pszNameW(pszFileName); + _shared()->AddRef(); - // if the file type is null, get the file type from extension - const GUID *FileType = &guidFileType; - if (::IsEqualGUID(guidFileType, GUID_NULL)) + if (!get_fn(_shared()->m_CreateBitmapFromHBITMAP, "GdipCreateBitmapFromHBITMAP") || + !get_fn(_shared()->m_SaveImageToFile, "GdipSaveImageToFile") || + !get_fn(_shared()->m_DisposeImage, "GdipDisposeImage")) { - LPCWSTR pszExt = GetFileExtension(pszNameW); - FileType = FileTypeFromExtension(pszExt); - } - - // get CLSID from file type - CLSID clsid; - if (!GetClsidFromFileType(&clsid, FileType)) + _shared()->Release(); return E_FAIL; + } // create a GpBitmap from HBITMAP GpBitmap *pBitmap = NULL; - GetCommon().CreateBitmapFromHBITMAP(m_hbm, NULL, &pBitmap); + _shared()->m_CreateBitmapFromHBITMAP(m_hBitmap, NULL, &pBitmap); // set the resolution SetResolution(pBitmap, xDpi, yDpi); + // Get encoders + UINT cEncoders = 0; + ImageCodecInfo* pEncoders = GetAllEncoders(cEncoders); + + // if the file type is null, get the file type from extension + CLSID clsid; + if (::IsEqualGUID(guidFileType, GUID_NULL)) + { + CString strExt(PathFindExtension(pszFileName)); + clsid = FindCodecForExtension(strExt, pEncoders, cEncoders); + } + else + { + clsid = FindCodecForFileType(guidFileType, pEncoders, cEncoders); + } + + delete[] pEncoders; + // save to file - Status status; - status = GetCommon().SaveImageToFile(pBitmap, pszNameW, &clsid, NULL); + Status status = _shared()->m_SaveImageToFile(pBitmap, pszFileName, &clsid, NULL); // destroy GpBitmap - GetCommon().DisposeImage(pBitmap); + _shared()->m_DisposeImage(pBitmap); + + _shared()->Release(); return (status == Ok ? S_OK : E_FAIL); } + static BOOL IsExtensionSupported(PWCHAR pchDotExt) + { + _shared()->AddRef(); + + UINT cEncoders; + Gdiplus::ImageCodecInfo* pEncoders = GetAllEncoders(cEncoders); + + CLSID clsid = FindCodecForExtension(pchDotExt, pEncoders, cEncoders); + BOOL ret = !::IsEqualGUID(clsid, CLSID_NULL); + delete[] pEncoders; + + _shared()->Release(); + return ret; + } + protected: - // get procedure address of the DLL - template - TYPE AddrOf(const char *name) const + using FN_Startup = decltype(&Gdiplus::GdiplusStartup); + using FN_Shutdown = decltype(&Gdiplus::GdiplusShutdown); + using FN_GetImageHorizontalResolution = decltype(&GPDE::GdipGetImageHorizontalResolution); + using FN_GetImageVerticalResolution = decltype(&GPDE::GdipGetImageVerticalResolution); + using FN_BitmapSetResolution = decltype(&GPDE::GdipBitmapSetResolution); + using FN_CreateBitmapFromHBITMAP = decltype(&GPDE::GdipCreateBitmapFromHBITMAP); + using FN_CreateBitmapFromFile = decltype(&GPDE::GdipCreateBitmapFromFile); + using FN_CreateHBITMAPFromBitmap = decltype(&GPDE::GdipCreateHBITMAPFromBitmap); + using FN_SaveImageToFile = decltype(&GPDE::GdipSaveImageToFile); + using FN_DisposeImage = decltype(&GPDE::GdipDisposeImage); + using FN_GetImageEncodersSize = decltype(&GPDE::GdipGetImageEncodersSize); + using FN_GetImageEncoders = decltype(&GPDE::GdipGetImageEncoders); + + struct SHARED + { + HINSTANCE m_hGdiPlus = NULL; + LONG m_cRefs = 0; + ULONG_PTR m_dwToken = 0; + FN_Shutdown m_Shutdown = NULL; + FN_GetImageHorizontalResolution m_GetImageHorizontalResolution = NULL; + FN_GetImageVerticalResolution m_GetImageVerticalResolution = NULL; + FN_BitmapSetResolution m_BitmapSetResolution = NULL; + FN_CreateBitmapFromHBITMAP m_CreateBitmapFromHBITMAP = NULL; + FN_CreateBitmapFromFile m_CreateBitmapFromFile = NULL; + FN_CreateHBITMAPFromBitmap m_CreateHBITMAPFromBitmap = NULL; + FN_SaveImageToFile m_SaveImageToFile = NULL; + FN_DisposeImage m_DisposeImage = NULL; + FN_GetImageEncodersSize m_GetImageEncodersSize = NULL; + FN_GetImageEncoders m_GetImageEncoders = NULL; + + HINSTANCE Init() + { + if (m_hGdiPlus) + return m_hGdiPlus; + + m_hGdiPlus = ::LoadLibraryW(L"gdiplus.dll"); + if (!m_hGdiPlus) + return NULL; + + FN_Startup Startup = (FN_Startup)GetProcAddress(m_hGdiPlus, "GdiplusStartup"); + m_Shutdown = (FN_Shutdown)GetProcAddress(m_hGdiPlus, "GdiplusShutdown"); + if (!Startup || !m_Shutdown) + { + ::FreeLibrary(m_hGdiPlus); + m_hGdiPlus = NULL; + return NULL; + } + + Gdiplus::GdiplusStartupInput gdiplusStartupInput; + Startup(&m_dwToken, &gdiplusStartupInput, NULL); + + return m_hGdiPlus; + } + + void Free() + { + ::FreeLibrary(m_hGdiPlus); + ZeroMemory(this, sizeof(*this)); + } + + LONG AddRef() + { + return ++m_cRefs; + } + + LONG Release() + { + if (--m_cRefs == 0) + { + Free(); + return 0; + } + return m_cRefs; + } + }; + + static SHARED* _shared() + { + static SHARED s_shared; + return &s_shared; + } + + static Gdiplus::ImageCodecInfo* GetAllEncoders(UINT& cEncoders) + { + Gdiplus::ImageCodecInfo *ret = NULL; + UINT total_size; + + if (!get_fn(_shared()->m_GetImageEncodersSize, "GdipGetImageEncodersSize") || + !get_fn(_shared()->m_GetImageEncoders, "GdipGetImageEncoders")) + { + cEncoders = 0; + return NULL; + } + + _shared()->m_GetImageEncodersSize(&cEncoders, &total_size); + if (total_size == 0) + return NULL; + + ret = new Gdiplus::ImageCodecInfo[total_size / sizeof(ret[0])]; + if (ret == NULL) + { + cEncoders = 0; + return NULL; + } + + _shared()->m_GetImageEncoders(cEncoders, total_size, ret); + + return ret; // needs delete[] + } + + template + static bool get_fn(FN_T& fn, const char *name) { - FARPROC proc = ::GetProcAddress(GetCommon().hinstGdiPlus, name); - return reinterpret_cast(proc); + if (fn) + return true; + HINSTANCE hGdiPlus = _shared()->Init(); + fn = reinterpret_cast(::GetProcAddress(hGdiPlus, name)); + return fn != NULL; } - typedef St (WINGDIPAPI *GETIMAGEHORIZONTALRESOLUTION)(Im *, float*); - typedef St (WINGDIPAPI *GETIMAGEVERTICALRESOLUTION)(Im *, float*); - typedef St (WINGDIPAPI *BITMAPSETRESOLUTION)(Bm *, float, float); + // CImage::FindCodecForExtension is private. We have to duplicate it at here... + static CLSID + FindCodecForExtension(LPCTSTR dotext, const Gdiplus::ImageCodecInfo *pCodecs, UINT nCodecs) + { + for (UINT i = 0; i < nCodecs; ++i) + { + CString strSpecs(pCodecs[i].FilenameExtension); + int ichOld = 0, ichSep; + for (;;) + { + ichSep = strSpecs.Find(TEXT(';'), ichOld); + + CString strSpec; + if (ichSep < 0) + strSpec = strSpecs.Mid(ichOld); + else + strSpec = strSpecs.Mid(ichOld, ichSep - ichOld); + + int ichDot = strSpec.ReverseFind(TEXT('.')); + if (ichDot >= 0) + strSpec = strSpec.Mid(ichDot); + + if (!dotext || strSpec.CompareNoCase(dotext) == 0) + return pCodecs[i].Clsid; + + if (ichSep < 0) + break; + + ichOld = ichSep + 1; + } + } + return CLSID_NULL; + } - GETIMAGEHORIZONTALRESOLUTION GetImageHorizontalResolution; - GETIMAGEVERTICALRESOLUTION GetImageVerticalResolution; - mutable BITMAPSETRESOLUTION BitmapSetResolution; + // CImage::FindCodecForFileType is private. We have to duplicate it at here... + static CLSID + FindCodecForFileType(REFGUID guidFileType, const Gdiplus::ImageCodecInfo *pCodecs, UINT nCodecs) + { + for (UINT iInfo = 0; iInfo < nCodecs; ++iInfo) + { + if (::IsEqualGUID(pCodecs[iInfo].FormatID, guidFileType)) + return pCodecs[iInfo].Clsid; + } + return CLSID_NULL; + } }; diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 93dc3cc4623..713e64d4648 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -262,7 +262,7 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) // load the image CImageDx img; - float xDpi, yDpi; + float xDpi = 0, yDpi = 0; HRESULT hr = img.LoadDx(name, &xDpi, &yDpi); if (FAILED(hr)) { @@ -274,12 +274,16 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) if (!fIsMainFile) return hBitmap; + if (xDpi <= 0 || yDpi <= 0) + { + HDC hDC = ::GetDC(NULL); + xDpi = ::GetDeviceCaps(hDC, LOGPIXELSX); + yDpi = ::GetDeviceCaps(hDC, LOGPIXELSY); + ::ReleaseDC(NULL, hDC); + } + g_xDpi = xDpi; g_yDpi = yDpi; - if (g_xDpi <= 0) - g_xDpi = 96; - if (g_yDpi <= 0) - g_yDpi = 96; SetBitmapAndInfo(hBitmap, name, &find, TRUE); return hBitmap; diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 368ce304461..385cc985a4f 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index ba3fbbc72a3..92ff45efdf5 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -141,6 +141,16 @@ void CMainWindow::saveImage(BOOL overwrite) { canvasWindow.finishDrawing(); + // Is the extension not supported? + PWCHAR pchDotExt = PathFindExtensionW(g_szFileName); + if (pchDotExt && *pchDotExt && !CImageDx::IsExtensionSupported(pchDotExt)) + { + // Remove the extension + PathRemoveExtensionW(g_szFileName); + // No overwrite + overwrite = FALSE; + } + if (g_isAFile && overwrite) { imageModel.SaveImage(g_szFileName); diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index 30fbb1b6c7d..a6ac73a6030 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -1055,38 +1055,18 @@ class CImage return NULL; } - struct FORMAT_ENTRY + static CLSID + FindCodecForFileType(REFGUID guidFileType, const Gdiplus::ImageCodecInfo *pCodecs, UINT nCodecs) { - GUID guid; - LPCWSTR mime; - }; - - bool GetClsidFromFileType(CLSID *clsid, const GUID *guid) const - { - static const FORMAT_ENTRY table[] = - { - {Gdiplus::ImageFormatJPEG, L"image/jpeg"}, - {Gdiplus::ImageFormatPNG, L"image/png"}, - {Gdiplus::ImageFormatBMP, L"image/bmp"}, - {Gdiplus::ImageFormatGIF, L"image/gif"}, - {Gdiplus::ImageFormatTIFF, L"image/tiff"} - }; - const size_t count = _countof(table); - for (size_t i = 0; i < count; ++i) + for (UINT iInfo = 0; iInfo < nCodecs; ++iInfo) { - if (::IsEqualGUID(table[i].guid, *guid)) - { - int num = GetEncoderClsid(table[i].mime, clsid); - if (num >= 0) - { - return true; - } - } + if (::IsEqualGUID(pCodecs[iInfo].FormatID, guidFileType)) + return pCodecs[iInfo].Clsid; } - return false; + return CLSID_NULL; } - int GetEncoderClsid(LPCWSTR mime, CLSID *clsid) const + static Gdiplus::ImageCodecInfo* _getAllEncoders(UINT& cEncoders) { UINT count = 0, total_size = 0; GetCommon().GetImageEncodersSize(&count, &total_size); From a1e62710f54e2a6e4ef312eae63c65e7737023d4 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Wed, 9 Aug 2023 23:59:34 +0900 Subject: [PATCH 35/74] [MSPAINT] Send mail with image (retry) (#5404) - Add OpenMailer function. - Add IDS_CANTSENDMAIL. - Send a mail by using mapi32!MAPISendMail/W. - Extend SaveDIBToFile function by adding a parameter. CORE-19094 --- base/applications/mspaint/common.h | 1 + base/applications/mspaint/dib.cpp | 4 +- base/applications/mspaint/dib.h | 2 +- base/applications/mspaint/lang/bg-BG.rc | 7 +- base/applications/mspaint/lang/cs-CZ.rc | 7 +- base/applications/mspaint/lang/de-DE.rc | 7 +- base/applications/mspaint/lang/en-GB.rc | 7 +- base/applications/mspaint/lang/en-US.rc | 7 +- base/applications/mspaint/lang/es-ES.rc | 7 +- base/applications/mspaint/lang/et-EE.rc | 7 +- base/applications/mspaint/lang/eu-ES.rc | 7 +- base/applications/mspaint/lang/fr-FR.rc | 7 +- base/applications/mspaint/lang/he-IL.rc | 7 +- base/applications/mspaint/lang/hu-HU.rc | 7 +- base/applications/mspaint/lang/id-ID.rc | 7 +- base/applications/mspaint/lang/it-IT.rc | 7 +- base/applications/mspaint/lang/ja-JP.rc | 1 + base/applications/mspaint/lang/nl-NL.rc | 7 +- base/applications/mspaint/lang/no-NO.rc | 7 +- base/applications/mspaint/lang/pl-PL.rc | 3 +- base/applications/mspaint/lang/pt-BR.rc | 7 +- base/applications/mspaint/lang/pt-PT.rc | 7 +- base/applications/mspaint/lang/ro-RO.rc | 3 +- base/applications/mspaint/lang/ru-RU.rc | 1 + base/applications/mspaint/lang/sk-SK.rc | 7 +- base/applications/mspaint/lang/sq-AL.rc | 7 +- base/applications/mspaint/lang/sv-SE.rc | 7 +- base/applications/mspaint/lang/tr-TR.rc | 7 +- base/applications/mspaint/lang/uk-UA.rc | 7 +- base/applications/mspaint/lang/vi-VN.rc | 7 +- base/applications/mspaint/lang/zh-CN.rc | 7 +- base/applications/mspaint/lang/zh-HK.rc | 7 +- base/applications/mspaint/lang/zh-TW.rc | 7 +- base/applications/mspaint/main.cpp | 117 ++++++++++++++++++++++++ base/applications/mspaint/resource.h | 1 + base/applications/mspaint/winproc.cpp | 7 ++ 36 files changed, 239 insertions(+), 83 deletions(-) diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index a3f3950ff7e..ee103d74911 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -47,3 +47,4 @@ BOOL zoomTo(int newZoom, int mouseX, int mouseY); BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1); void updateStartAndLast(LONG x, LONG y); void updateLast(LONG x, LONG y); +BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName); diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 713e64d4648..df63e1a139d 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -142,11 +142,11 @@ GetDIBHeight(HBITMAP hBitmap) return bm.bmHeight; } -BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile) +BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile, REFGUID guidFileType) { CImageDx img; img.Attach(hBitmap); - HRESULT hr = img.SaveDx(FileName, GUID_NULL, g_xDpi, g_yDpi); + HRESULT hr = img.SaveDx(FileName, guidFileType, g_xDpi, g_yDpi); img.Detach(); if (FAILED(hr)) diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index 0560c24481e..025d2ffff24 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -22,7 +22,7 @@ static inline HBITMAP CopyDIBImage(HBITMAP hbm, INT cx = 0, INT cy = 0) int GetDIBWidth(HBITMAP hbm); int GetDIBHeight(HBITMAP hbm); -BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile); +BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile, REFGUID guidFileType = GUID_NULL); HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile); diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index 31663fde2d3..969f8712518 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Bulgarian resource file * TRANSLATORS: Copyright 2009-2012 S. Stanev (CCTAHEB) @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint за ReactOS" + IDS_INFOTITLE "Paint за Windivs" IDS_INFOTEXT "Достъпен под GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Искате ли да запишете промените в %s?" IDS_DEFAULTFILENAME "Без име" @@ -262,5 +262,6 @@ BEGIN IDS_VERTICAL "Вертикален" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index c1d67ce1682..9aa6cbb2a5d 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Czech resource file * TRANSLATORS: Copyright 2009-2010 Radek Liška aka Black_Fox @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Malování" IDS_WINDOWTITLE "%s - Malování" - IDS_INFOTITLE "ReactOS Malování" + IDS_INFOTITLE "Windivs Malování" IDS_INFOTEXT "Dostupné pod licencí GNU Lesser General Public License (LGPL, viz. www.gnu.org)" IDS_SAVEPROMPTTEXT "Chcete uložit provedené změny v %s?" IDS_DEFAULTFILENAME "Bez názvu" @@ -262,5 +262,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index fc46fe2f042..1b4a55a5ba1 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: German resource file * TRANSLATOR: Copyright 2009 Benedikt Freisen @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint für ReactOS" + IDS_INFOTITLE "Paint für Windivs" IDS_INFOTEXT "Steht unter der GNU Lesser General Public License (LGPL, siehe www.gnu.org)" IDS_SAVEPROMPTTEXT "Möchten Sie die Änderungen an %s speichern?" IDS_DEFAULTFILENAME "Unbenannt" @@ -261,5 +261,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index c653732c4d8..3c7a87ca50f 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: English (United Kingdom) resource file * TRANSLATOR: Copyright 2009 Benedikt Freisen @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint for ReactOS" + IDS_INFOTITLE "Paint for Windivs" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Do you want to save the changes to %s?" IDS_DEFAULTFILENAME "Unnamed" @@ -261,5 +261,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d dots per inch" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 9de01a2499f..1b49d0b734d 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: English (United States) resource file * TRANSLATORS: Copyright 2009 Benedikt Freisen @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint for ReactOS" + IDS_INFOTITLE "Paint for Windivs" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Do you want to save the changes to %s?" IDS_DEFAULTFILENAME "Unnamed" @@ -262,5 +262,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d dots per inch" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index d30226ccaf7..05cd0631e08 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Spanish (Spain) resource file * TRANSLATORS: Copyright 2009 Gabriel Ilardi @@ -229,7 +229,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint para ReactOS" + IDS_INFOTITLE "Paint para Windivs" IDS_INFOTEXT "Disponible bajo los términos de la GNU Lesser General Public License (LGPL, ver www.gnu.org)" IDS_SAVEPROMPTTEXT "¿Guardar cambios a %s?" IDS_DEFAULTFILENAME "Sin título" @@ -264,5 +264,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 0c2b543cbe6..5447fcb97d2 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Estonian resource file * TRANSLATOR: Copyright 2018 Joann Mõndresku @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint ReactOS'ile" + IDS_INFOTITLE "Paint Windivs'ile" IDS_INFOTEXT "On saadaval ""GNU Lesser General Public License"" litsentsi all (LGPL, vaata www.gnu.org)" IDS_SAVEPROMPTTEXT "Kas soovid salvesta muudatusi failis %s?" IDS_DEFAULTFILENAME "Nimetu" @@ -261,5 +261,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index 273f8c9f20a..6bb39a0b11f 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Spanish (Basque) resource file * TRANSLATORS: Copyright 2009 Javier Remacha @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "ReactOS-ko Paint" + IDS_INFOTITLE "Windivs-ko Paint" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, ver www.gnu.org)" IDS_SAVEPROMPTTEXT "%s aldaketak gorde nahi duzu?" IDS_DEFAULTFILENAME "Izegabea" @@ -262,5 +262,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index aee25ef236b..e459b57e008 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: French resource file * TRANSLATORS: Copyright 2010-2014 Pierre Schweitzer @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint pour ReactOS" + IDS_INFOTITLE "Paint pour Windivs" IDS_INFOTEXT "Mis à disposition sous la Licence publique générale limitée GNU (LGPL, voir www.gnu.org)" IDS_SAVEPROMPTTEXT "Voulez-vous enregistrer les modifications de %s?" IDS_DEFAULTFILENAME "Sans titre" @@ -262,5 +262,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index e02fcea3758..0fe8d580138 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Hebrew resource file * TRANSLATOR: Copyright 2013-2018 Baruch Rutman @@ -229,7 +229,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "צייר" IDS_WINDOWTITLE "%s - צייר" - IDS_INFOTITLE "צייר עבור ReactOS" + IDS_INFOTITLE "צייר עבור Windivs" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "האם ברצונך לשמור את השינויים של %s?" IDS_DEFAULTFILENAME "ללא שם" @@ -264,5 +264,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index ff132eda6f9..8fcd0123882 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Hungarian resource file * TRANSLATORS: Copyright 2009 Gábor Balogh (xxxx00) @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "ReactOS Paint" + IDS_INFOTITLE "Windivs Paint" IDS_INFOTEXT "A GNU Lesser General Public License (LGPL) alatt érhető el (lásd www.gnu.org)" IDS_SAVEPROMPTTEXT "Kívánja menteni %s változásait?" IDS_DEFAULTFILENAME "Névtelen" @@ -262,5 +262,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index ad2d99b362a..c661bef8f74 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Indonesian resource file * TRANSLATOR: Copyright 2019 Mas Ahmad Muhammad @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint untuk ReactOS" + IDS_INFOTITLE "Paint untuk Windivs" IDS_INFOTEXT "Tersedia di bawah GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Ingin menyimpan perubahan untuk %s?" IDS_DEFAULTFILENAME "Tanpa Nama" @@ -261,5 +261,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 45ff4d842e9..5d2c9dc7774 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Italian resource file * TRANSLATORS: Copyright 2009 Gabriel Ilardi @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint per ReactOS" + IDS_INFOTITLE "Paint per Windivs" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Volete salvare le modifiche a %s?" IDS_DEFAULTFILENAME "SenzaNome" @@ -262,5 +262,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index cb190b5fbbc..70f3cb58102 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -264,4 +264,5 @@ BEGIN IDS_PRINTRES "%d x %d ピクセル/cm" IDS_CANTPASTE "クリップボードからの貼り付けに失敗しました。データ形式が間違っているか、未対応です。" IDS_SAVEERROR "次のファイルとして画像を保存するのに失敗しました:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 62ae6c4e47a..3e6381be08d 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Dutch resource file * TRANSLATOR: Copyright 2009 Wouter De Vlieger (reFly) @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint for ReactOS" + IDS_INFOTITLE "Paint for Windivs" IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "Wilt u de wijzigingen die zijn aangebracht in %s opslaan?" IDS_DEFAULTFILENAME "Naamloos" @@ -261,5 +261,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index b6014ef58e0..49835f4aa32 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Norwegian resource file * TRANSLATOR: Copyright 2009 Lars Martin Hambro (LMH1) @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint for ReactOS" + IDS_INFOTITLE "Paint for Windivs" IDS_INFOTEXT "Tilgjengelig under GNU Lesser General Public License (LGPL, se http://www.gnu.org/home.nb.html)" IDS_SAVEPROMPTTEXT "Vil du lagre endringene til %s?" IDS_DEFAULTFILENAME "Utennavn" @@ -261,5 +261,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 3506917b09d..599142b8275 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -264,5 +264,6 @@ BEGIN IDS_VERTICAL "Pionowe" IDS_PRINTRES "%d x %d piksel/cm" IDS_CANTPASTE "Nie można wkleić ze schowka. Format danych jest nieprawidłowy lub nieobsługiwany." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index 0c8442b4b35..f6c5a13ad03 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Portuguese (Brazilian) resource file * TRANSLATORS: Copyright 2009 Wagner Leandro Bueno Angelo @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint para ReactOS" + IDS_INFOTITLE "Paint para Windivs" IDS_INFOTEXT "Disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)" IDS_SAVEPROMPTTEXT "Salvar as alterações em %s?" IDS_DEFAULTFILENAME "Imagem" @@ -262,5 +262,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index e150cfa14a2..71155404f40 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Portuguese (Portugal) resource file * TRANSLATORS: Copyright 2009 Manuel D V Silva (mds) @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint para ReactOS" + IDS_INFOTITLE "Paint para Windivs" IDS_INFOTEXT "Disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)" IDS_SAVEPROMPTTEXT "Pretende guardar as alterações a %s?" IDS_DEFAULTFILENAME "Imagem" @@ -262,5 +262,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 3f6fdb07fed..00be3b56e62 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -263,5 +263,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixeli/cm" IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 654ea538794..125eadbcfdf 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -266,4 +266,5 @@ BEGIN IDS_PRINTRES "%d x %d точек/см" IDS_CANTPASTE "Не удалось вставить из буфера обмена. Формат данных либо некорректный, либо не поддерживается." IDS_SAVEERROR "Не удалось сохранить точечный рисунок в файл:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index 1fb92dbb4f6..53a813be7ef 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Slovak resource file * TRANSLATOR: Copyright 2009 Mário Kačmár aka Kario @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Skicár" IDS_WINDOWTITLE "%s - Skicár" - IDS_INFOTITLE "Skicár systému ReactOS" + IDS_INFOTITLE "Skicár systému Windivs" IDS_INFOTEXT "Dostupný za podmienok GNU Lesser General Public License (LGPL, viď www.gnu.org)" IDS_SAVEPROMPTTEXT "Chcete uložiť vykonané zmeny do %s?" IDS_DEFAULTFILENAME "Bez názvu" @@ -261,5 +261,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index b2122a03273..ab9a054bb66 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Albanian resource file * TRANSLATOR: Copyright 2013 Ardit Dani (ard1t) @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint për ReactOS" + IDS_INFOTITLE "Paint për Windivs" IDS_INFOTEXT "Ësht i disponueshme nën GNU Lesser General Public License (LGPL, see www.gnu.org)" IDS_SAVEPROMPTTEXT "A doni të ruani ndryshimet tek %s?" IDS_DEFAULTFILENAME "Unnamed" @@ -261,5 +261,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index 3d92c35f6c6..d3517cb2125 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Swedish resource file * TRANSLATORS: Copyright 2011 Michael Wu (Witch) @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint för ReactOS" + IDS_INFOTITLE "Paint för Windivs" IDS_INFOTEXT "Tillgänglig under GNU Lesser General Public License (LGPL, se www.gnu.org)" IDS_SAVEPROMPTTEXT "Vill du spara ändringarna till %s?" IDS_DEFAULTFILENAME "Namnlös" @@ -262,5 +262,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index a87fb699142..b7faf5e4a34 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Turkish resource file * TRANSLATORS: Copyright 2013-2016, 2019 Erdem Ersoy (eersoy93) @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "ReactOS için Paint" + IDS_INFOTITLE "Windivs için Paint" IDS_INFOTEXT "GNU Kısıtlı Genel Kamu Lisansı (LGPL, bakınız: www.gnu.org) altındadır." IDS_SAVEPROMPTTEXT "%s için yapılan değişiklikleri kaydetmek ister misiniz?" IDS_DEFAULTFILENAME "Adsız" @@ -262,5 +262,6 @@ BEGIN IDS_VERTICAL "Düşey" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index a998b99363a..6a5b5c35929 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Ukrainian resource file * TRANSLATORS: Copyright 2009 Artem Reznikov @@ -228,7 +228,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Paint" IDS_WINDOWTITLE "%s - Paint" - IDS_INFOTITLE "Paint для ReactOS" + IDS_INFOTITLE "Paint для Windivs" IDS_INFOTEXT "Доступний згідно з GNU Lesser General Public License (LGPL, дивіться www.gnu.org)" IDS_SAVEPROMPTTEXT "Зберегти зміни до %s?" IDS_DEFAULTFILENAME "Без_імені" @@ -263,5 +263,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index 0db569f74f3..50d1babc263 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Vietnamese (Vietnam) resource file * TRANSLATOR: Copyright 2018 Nguyễn Thanh Sơn @@ -226,7 +226,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "Vẽ" IDS_WINDOWTITLE "%s - Vẽ" - IDS_INFOTITLE "Trình Vẽ cho ReactOS" + IDS_INFOTITLE "Trình Vẽ cho Windivs" IDS_INFOTEXT "Được cung cấp theo điều lệ trong GNU Lesser General Public License (LGPL, xem www.gnu.org)" IDS_SAVEPROMPTTEXT "Bạn có muốn lưu lại những thay đổi trong %s?" IDS_DEFAULTFILENAME "Khongten" @@ -261,5 +261,6 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index d40e2390b77..d43e7ed9aa2 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Chinese (Simplified) resource file * TRANSLATORS: Copyright 2011 Song Fuchang (0xfc) @@ -229,7 +229,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "画图" IDS_WINDOWTITLE "%s - 画图" - IDS_INFOTITLE "ReactOS 画图" + IDS_INFOTITLE "Windivs 画图" IDS_INFOTEXT "GNU LGPL 许可证下发布的（详见 www.gnu.org）" IDS_SAVEPROMPTTEXT "您想把改变保存到 %s 吗？" IDS_DEFAULTFILENAME "未命名" @@ -264,5 +264,6 @@ BEGIN IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index 85dd5341843..241b82d7ba9 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Chinese (Hong Kong) resource file * TRANSLATORS: Copyright 2021 Chan Chilung @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "小畫家" IDS_WINDOWTITLE "%s - 小畫家" - IDS_INFOTITLE "ReactOS 小畫家" + IDS_INFOTITLE "Windivs 小畫家" IDS_INFOTEXT "GNU LGPL 下發佈的（詳見 www.gnu.org）" IDS_SAVEPROMPTTEXT "您想將變更儲存到 %s 嗎？" IDS_DEFAULTFILENAME "未命名" @@ -262,5 +262,6 @@ BEGIN IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index b044da06910..3f9cdb9faa5 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: PAINT for Windivs * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Chinese (Traditional) resource file * TRANSLATORS: Copyright 2011 Elton Chung @@ -227,7 +227,7 @@ STRINGTABLE BEGIN IDS_PROGRAMNAME "小畫家" IDS_WINDOWTITLE "%s - 小畫家" - IDS_INFOTITLE "ReactOS 小畫家" + IDS_INFOTITLE "Windivs 小畫家" IDS_INFOTEXT "以 GNU LGPL 條款發布（詳見 www.gnu.org）" IDS_SAVEPROMPTTEXT "您想把變更儲存到 %s 嗎？" IDS_DEFAULTFILENAME "未命名" @@ -262,5 +262,6 @@ BEGIN IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save an image as the following file:\n\n%s" + IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" + IDS_CANTSENDMAIL "Failed to send a mail." END diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index d80249afdfe..bcd7e42b0e5 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -7,10 +7,14 @@ #include "precomp.h" +#include +#include + POINT g_ptStart, g_ptEnd; BOOL g_askBeforeEnlarging = FALSE; // TODO: initialize from registry HINSTANCE g_hinstExe = NULL; TCHAR g_szFileName[MAX_LONG_PATH] = { 0 }; +WCHAR g_szMailTempFile[MAX_LONG_PATH] = { 0 }; BOOL g_isAFile = FALSE; BOOL g_imageSaved = FALSE; BOOL g_showGrid = FALSE; @@ -69,6 +73,116 @@ OFNHookProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; } +typedef ULONG (WINAPI *FN_MAPISendMail)(LHANDLE, ULONG_PTR, lpMapiMessage, FLAGS, ULONG); +typedef ULONG (WINAPI *FN_MAPISendMailW)(LHANDLE, ULONG_PTR, lpMapiMessageW, FLAGS, ULONG); + +BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName) +{ + // Delete the temporary file if any + if (g_szMailTempFile[0]) + { + ::DeleteFileW(g_szMailTempFile); + g_szMailTempFile[0] = UNICODE_NULL; + } + + CStringW strFileTitle; + if (PathFileExistsW(pszPathName) && imageModel.IsImageSaved()) + { + strFileTitle = PathFindFileNameW(pszPathName); + } + else // Not existing or not saved + { + // Get the name of a temporary file + WCHAR szTempDir[MAX_PATH]; + ::GetTempPathW(_countof(szTempDir), szTempDir); + if (!::GetTempFileNameW(szTempDir, L"afx", 0, g_szMailTempFile)) + return FALSE; // Failure + + if (PathFileExistsW(g_szFileName)) + { + // Set file title + strFileTitle = PathFindFileNameW(g_szFileName); + + // Copy to the temporary file + if (!::CopyFileW(g_szFileName, g_szMailTempFile, FALSE)) + { + g_szMailTempFile[0] = UNICODE_NULL; + return FALSE; // Failure + } + } + else + { + // Set file title + strFileTitle.LoadString(IDS_DEFAULTFILENAME); + strFileTitle += L".png"; + + // Save it to the temporary file + HBITMAP hbm = imageModel.CopyBitmap(); + BOOL ret = SaveDIBToFile(hbm, g_szMailTempFile, FALSE, Gdiplus::ImageFormatPNG); + ::DeleteObject(hbm); + if (!ret) + { + g_szMailTempFile[0] = UNICODE_NULL; + return FALSE; // Failure + } + } + + // Use the temporary file + pszPathName = g_szMailTempFile; + } + + // Load "mapi32.dll" + HINSTANCE hMAPI = LoadLibraryW(L"mapi32.dll"); + if (!hMAPI) + return FALSE; // Failure + + // Attachment + MapiFileDescW attachmentW = { 0 }; + attachmentW.nPosition = (ULONG)-1; + attachmentW.lpszPathName = (LPWSTR)pszPathName; + attachmentW.lpszFileName = (LPWSTR)(LPCWSTR)strFileTitle; + + // Message with attachment + MapiMessageW messageW = { 0 }; + messageW.lpszSubject = NULL; + messageW.nFileCount = 1; + messageW.lpFiles = &attachmentW; + + // First, try to open the mailer by the function of Unicode version + FN_MAPISendMailW pMAPISendMailW = (FN_MAPISendMailW)::GetProcAddress(hMAPI, "MAPISendMailW"); + if (pMAPISendMailW) + { + pMAPISendMailW(0, (ULONG_PTR)hWnd, &messageW, MAPI_DIALOG | MAPI_LOGON_UI, 0); + ::FreeLibrary(hMAPI); + return TRUE; // MAPISendMailW will show an error message on failure + } + + // Convert to ANSI strings + CStringA szPathNameA(pszPathName), szFileTitleA(strFileTitle); + + MapiFileDesc attachment = { 0 }; + attachment.nPosition = (ULONG)-1; + attachment.lpszPathName = (LPSTR)(LPCSTR)szPathNameA; + attachment.lpszFileName = (LPSTR)(LPCSTR)szFileTitleA; + + MapiMessage message = { 0 }; + message.lpszSubject = NULL; + message.nFileCount = 1; + message.lpFiles = &attachment; + + // Try again but in ANSI version + FN_MAPISendMail pMAPISendMail = (FN_MAPISendMail)::GetProcAddress(hMAPI, "MAPISendMail"); + if (pMAPISendMail) + { + pMAPISendMail(0, (ULONG_PTR)hWnd, &message, MAPI_DIALOG | MAPI_LOGON_UI, 0); + ::FreeLibrary(hMAPI); + return TRUE; // MAPISendMail will show an error message on failure + } + + ::FreeLibrary(hMAPI); + return FALSE; // Failure +} + BOOL CMainWindow::GetOpenFileName(IN OUT LPTSTR pszFile, INT cchMaxFile) { static OPENFILENAME ofn = { 0 }; @@ -238,6 +352,9 @@ _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, INT nC // Write back settings to registry registrySettings.Store(); + if (g_szMailTempFile[0]) + ::DeleteFileW(g_szMailTempFile); + // Return the value that PostQuitMessage() gave return (INT)msg.wParam; } diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index 1e34232d3c1..4ec9f9a0f98 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -221,3 +221,4 @@ #define IDS_PRINTRES 939 #define IDS_CANTPASTE 940 #define IDS_SAVEERROR 941 +#define IDS_CANTSENDMAIL 942 diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 92ff45efdf5..9eb5cd1b9f7 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -667,6 +667,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH if (pd.hDevNames) GlobalFree(pd.hDevNames); break; + case IDM_FILESEND: + canvasWindow.finishDrawing(); + if (!OpenMailer(m_hWnd, g_szFileName)) + { + ShowError(IDS_CANTSENDMAIL); + } + break; case IDM_FILEASWALLPAPERPLANE: RegistrySettings::SetWallpaper(g_szFileName, RegistrySettings::TILED); break; From 67e5983ca371c72490f45fea9179219074c70c6a Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Thu, 10 Aug 2023 08:20:55 +0900 Subject: [PATCH 36/74] [MSPAINT] Fix focus and radiobuttons of some dialogs (#5537) - Return TRUE on WM_INITDIALOG handling to set focus. - Check if the radiobutton is checked on the radiobutton action (considering BN_SETFOCUS etc.). CORE-18011 --- base/applications/mspaint/dialogs.cpp | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index 9c9fad3e567..7ec302dfe7f 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -42,7 +42,7 @@ LRESULT CMirrorRotateDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lPara { CheckDlgButton(IDD_MIRRORROTATERB1, BST_CHECKED); CheckDlgButton(IDD_MIRRORROTATERB4, BST_CHECKED); - return 0; + return TRUE; } LRESULT CMirrorRotateDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -74,6 +74,9 @@ LRESULT CMirrorRotateDialog::OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, LRESULT CMirrorRotateDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_MIRRORROTATERB3) != BST_CHECKED) + return 0; + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB4), TRUE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB5), TRUE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB6), TRUE); @@ -82,6 +85,12 @@ LRESULT CMirrorRotateDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWn LRESULT CMirrorRotateDialog::OnRadioButton12(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_MIRRORROTATERB1) != BST_CHECKED && + IsDlgButtonChecked(IDD_MIRRORROTATERB2) != BST_CHECKED) + { + return 0; + } + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB4), FALSE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB5), FALSE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB6), FALSE); @@ -122,7 +131,7 @@ LRESULT CAttributesDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, strRes.Format(IDS_PRINTRES, ROUND(PpcmFromDpi(g_xDpi)), ROUND(PpcmFromDpi(g_yDpi))); SetDlgItemText(IDD_ATTRIBUTESTEXT8, strRes); - return 0; + return TRUE; } LRESULT CAttributesDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -156,6 +165,9 @@ LRESULT CAttributesDialog::OnDefault(WORD wNotifyCode, WORD wID, HWND hWndCtl, B LRESULT CAttributesDialog::OnRadioButton1(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB1) != BST_CHECKED) + return 0; + CString strNum; strNum.Format(_T("%.3lf"), newWidth / g_xDpi); SetDlgItemText(IDD_ATTRIBUTESEDIT1, strNum); @@ -166,6 +178,9 @@ LRESULT CAttributesDialog::OnRadioButton1(WORD wNotifyCode, WORD wID, HWND hWndC LRESULT CAttributesDialog::OnRadioButton2(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB2) != BST_CHECKED) + return 0; + CString strNum; strNum.Format(_T("%.3lf"), newWidth / PpcmFromDpi(g_xDpi)); SetDlgItemText(IDD_ATTRIBUTESEDIT1, strNum); @@ -176,6 +191,9 @@ LRESULT CAttributesDialog::OnRadioButton2(WORD wNotifyCode, WORD wID, HWND hWndC LRESULT CAttributesDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB3) != BST_CHECKED) + return 0; + SetDlgItemInt(IDD_ATTRIBUTESEDIT1, newWidth, FALSE); SetDlgItemInt(IDD_ATTRIBUTESEDIT2, newHeight, FALSE); return 0; @@ -239,7 +257,7 @@ LRESULT CStretchSkewDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam SetDlgItemInt(IDD_STRETCHSKEWEDITVSTRETCH, 100, FALSE); SetDlgItemInt(IDD_STRETCHSKEWEDITHSKEW, 0, FALSE); SetDlgItemInt(IDD_STRETCHSKEWEDITVSKEW, 0, FALSE); - return 0; + return TRUE; } LRESULT CStretchSkewDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) From 1965de0a2d79469e483e00c2c356fdf3594b1ee5 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Fri, 11 Aug 2023 20:27:12 +0900 Subject: [PATCH 37/74] [MSPAINT] Support converting to black and white (#5554) - Add ImageModel::IsBlackAndWhite and ImageModel::PushBlackAndWhite helper functions. - Add CAttributesDialog::m_bBlackAndWhite. - If IDD_ATTRIBUTESRB4 is checked, then make the bitmap black and white. - Add IDS_LOSECOLOR to show message. CORE-19094 --- base/applications/mspaint/dialogs.cpp | 7 +++- base/applications/mspaint/dialogs.h | 1 + base/applications/mspaint/history.cpp | 44 +++++++++++++++++++++++++ base/applications/mspaint/history.h | 2 ++ base/applications/mspaint/lang/bg-BG.rc | 1 + base/applications/mspaint/lang/cs-CZ.rc | 1 + base/applications/mspaint/lang/de-DE.rc | 1 + base/applications/mspaint/lang/en-GB.rc | 1 + base/applications/mspaint/lang/en-US.rc | 1 + base/applications/mspaint/lang/es-ES.rc | 1 + base/applications/mspaint/lang/et-EE.rc | 1 + base/applications/mspaint/lang/eu-ES.rc | 1 + base/applications/mspaint/lang/fr-FR.rc | 1 + base/applications/mspaint/lang/he-IL.rc | 1 + base/applications/mspaint/lang/hu-HU.rc | 1 + base/applications/mspaint/lang/id-ID.rc | 1 + base/applications/mspaint/lang/it-IT.rc | 1 + base/applications/mspaint/lang/ja-JP.rc | 1 + base/applications/mspaint/lang/nl-NL.rc | 1 + base/applications/mspaint/lang/no-NO.rc | 1 + base/applications/mspaint/lang/pl-PL.rc | 1 + base/applications/mspaint/lang/pt-BR.rc | 1 + base/applications/mspaint/lang/pt-PT.rc | 1 + base/applications/mspaint/lang/ro-RO.rc | 1 + base/applications/mspaint/lang/ru-RU.rc | 1 + base/applications/mspaint/lang/sk-SK.rc | 1 + base/applications/mspaint/lang/sq-AL.rc | 1 + base/applications/mspaint/lang/sv-SE.rc | 1 + base/applications/mspaint/lang/tr-TR.rc | 1 + base/applications/mspaint/lang/uk-UA.rc | 1 + base/applications/mspaint/lang/vi-VN.rc | 1 + base/applications/mspaint/lang/zh-CN.rc | 1 + base/applications/mspaint/lang/zh-HK.rc | 1 + base/applications/mspaint/lang/zh-TW.rc | 1 + base/applications/mspaint/resource.h | 1 + base/applications/mspaint/winproc.cpp | 17 +++++++++- 36 files changed, 100 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index 7ec302dfe7f..9cda67b3d72 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -103,10 +103,14 @@ LRESULT CAttributesDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, newHeight = imageModel.GetHeight(); CheckDlgButton(IDD_ATTRIBUTESRB3, BST_CHECKED); - CheckDlgButton(IDD_ATTRIBUTESRB5, BST_CHECKED); SetDlgItemInt(IDD_ATTRIBUTESEDIT1, newWidth, FALSE); SetDlgItemInt(IDD_ATTRIBUTESEDIT2, newHeight, FALSE); + if (imageModel.IsBlackAndWhite()) + CheckRadioButton(IDD_ATTRIBUTESRB4, IDD_ATTRIBUTESRB5, IDD_ATTRIBUTESRB4); + else + CheckRadioButton(IDD_ATTRIBUTESRB4, IDD_ATTRIBUTESRB5, IDD_ATTRIBUTESRB5); + if (g_isAFile) { TCHAR date[100]; @@ -142,6 +146,7 @@ LRESULT CAttributesDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL LRESULT CAttributesDialog::OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + m_bBlackAndWhite = (IsDlgButtonChecked(IDD_ATTRIBUTESRB4) == BST_CHECKED); EndDialog(1); return 0; } diff --git a/base/applications/mspaint/dialogs.h b/base/applications/mspaint/dialogs.h index d760c59d556..f4354de11fe 100644 --- a/base/applications/mspaint/dialogs.h +++ b/base/applications/mspaint/dialogs.h @@ -64,6 +64,7 @@ class CAttributesDialog : public CDialogImpl public: int newWidth; int newHeight; + BOOL m_bBlackAndWhite; }; class CStretchSkewDialog : public CDialogImpl diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 3f1878ad3d3..8867a53025a 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -267,3 +267,47 @@ HBITMAP ImageModel::CopyBitmap() m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select return ret; } + +BOOL ImageModel::IsBlackAndWhite() +{ + LONG cxWidth = GetWidth(), cyHeight = GetHeight(); + for (LONG y = 0; y < cyHeight; ++y) + { + for (LONG x = 0; x < cxWidth; ++x) + { + COLORREF rgbColor = ::GetPixel(m_hDrawingDC, x, y); + if (rgbColor != RGB(0, 0, 0) && rgbColor != RGB(255, 255, 255)) + return FALSE; + } + } + return TRUE; +} + +void ImageModel::PushBlackAndWhite() +{ + HBITMAP hNewBitmap = CopyBitmap(); + if (!hNewBitmap) + return; + + HDC hdc2 = ::CreateCompatibleDC(NULL); + HGDIOBJ hbm2Old = ::SelectObject(hdc2, hNewBitmap); + LONG cxWidth = GetWidth(), cyHeight = GetHeight(); + for (LONG y = 0; y < cyHeight; ++y) + { + for (LONG x = 0; x < cxWidth; ++x) + { + COLORREF rgbColor = ::GetPixel(m_hDrawingDC, x, y); + BYTE Red = GetRValue(rgbColor); + BYTE Green = GetGValue(rgbColor); + BYTE Blue = GetBValue(rgbColor); + if ((Red + Green + Blue) / 3 >= 255 / 2) + ::SetPixelV(hdc2, x, y, RGB(255, 255, 255)); // White + else + ::SetPixelV(hdc2, x, y, RGB(0, 0, 0)); // Black + } + } + ::SelectObject(hdc2, hbm2Old); + ::DeleteDC(hdc2); + + PushImageForUndo(hNewBitmap); +} diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index f9d63625b1f..768114aa9e8 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -37,6 +37,8 @@ class ImageModel void RotateNTimes90Degrees(int iN); void Clamp(POINT& pt) const; void NotifyImageChanged(); + BOOL IsBlackAndWhite(); + void PushBlackAndWhite(); protected: HDC m_hDrawingDC; // The device context for this class diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index 969f8712518..d9b9d6800d8 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index 9aa6cbb2a5d..d1b7c9bb8d2 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 1b4a55a5ba1..b9acaa6b1a2 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index 3c7a87ca50f..5b6258181b3 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 1b49d0b734d..270f191f7b8 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 05cd0631e08..222889abb46 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -266,4 +266,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 5447fcb97d2..14ac1e909da 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index 6bb39a0b11f..ff727c1adb6 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index e459b57e008..93d4c0ca819 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 0fe8d580138..5bc8e6209e6 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -266,4 +266,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index 8fcd0123882..c0d95630210 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index c661bef8f74..29e33375f26 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 5d2c9dc7774..2bdba963bbb 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index 70f3cb58102..a5295fe73af 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -265,4 +265,5 @@ BEGIN IDS_CANTPASTE "クリップボードからの貼り付けに失敗しました。データ形式が間違っているか、未対応です。" IDS_SAVEERROR "次のファイルとして画像を保存するのに失敗しました:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 3e6381be08d..5c579b3b22c 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 49835f4aa32..98d4107ad26 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 599142b8275..3d9aa9afa18 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -266,4 +266,5 @@ BEGIN IDS_CANTPASTE "Nie można wkleić ze schowka. Format danych jest nieprawidłowy lub nieobsługiwany." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index f6c5a13ad03..2c0fb9722b2 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 71155404f40..950f71d19a9 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 00be3b56e62..8458bec1e5b 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -265,4 +265,5 @@ BEGIN IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 125eadbcfdf..94e187feb63 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -267,4 +267,5 @@ BEGIN IDS_CANTPASTE "Не удалось вставить из буфера обмена. Формат данных либо некорректный, либо не поддерживается." IDS_SAVEERROR "Не удалось сохранить точечный рисунок в файл:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index 53a813be7ef..f5150612597 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index ab9a054bb66..a04d10f84e8 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index d3517cb2125..df1c8b41538 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index b7faf5e4a34..f64046c155a 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index 6a5b5c35929..8c95ebe04e5 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -265,4 +265,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index 50d1babc263..3ac1d0790b7 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index d43e7ed9aa2..490332372c6 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -266,4 +266,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index 241b82d7ba9..e76671f10fe 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 3f9cdb9faa5..26c7baaf71f 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index 4ec9f9a0f98..310554de200 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -222,3 +222,4 @@ #define IDS_CANTPASTE 940 #define IDS_SAVEERROR 941 #define IDS_CANTSENDMAIL 942 +#define IDS_LOSECOLOR 943 diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 9eb5cd1b9f7..1763f128ac1 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -950,7 +950,22 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { if (attributesDialog.DoModal(mainWindow.m_hWnd)) { - imageModel.Crop(attributesDialog.newWidth, attributesDialog.newHeight, 0, 0); + if (attributesDialog.m_bBlackAndWhite && !imageModel.IsBlackAndWhite()) + { + CString strText(MAKEINTRESOURCE(IDS_LOSECOLOR)); + CString strTitle(MAKEINTRESOURCE(IDS_PROGRAMNAME)); + INT id = MessageBox(strText, strTitle, MB_ICONINFORMATION | MB_YESNOCANCEL); + if (id != IDYES) + break; + + imageModel.PushBlackAndWhite(); + } + + if (imageModel.GetWidth() != attributesDialog.newWidth || + imageModel.GetHeight() != attributesDialog.newHeight) + { + imageModel.Crop(attributesDialog.newWidth, attributesDialog.newHeight); + } } break; } From 18fb7dc70adb6285c5fd31aface0874994c16af5 Mon Sep 17 00:00:00 2001 From: Stanislav Motylkov Date: Fri, 11 Aug 2023 15:52:46 +0300 Subject: [PATCH 38/74] [MSPAINT] Update Russian (ru-RU) translation Addendum to ba53f72a87f and e6c23361a12. --- base/applications/mspaint/lang/ru-RU.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 94e187feb63..05bfa15efc9 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -266,6 +266,6 @@ BEGIN IDS_PRINTRES "%d x %d точек/см" IDS_CANTPASTE "Не удалось вставить из буфера обмена. Формат данных либо некорректный, либо не поддерживается." IDS_SAVEERROR "Не удалось сохранить точечный рисунок в файл:\n\n%s" - IDS_CANTSENDMAIL "Failed to send a mail." - IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" + IDS_CANTSENDMAIL "Не удалось отправить письмо." + IDS_LOSECOLOR "В результате этой операции сведения о цвете будут потеряны. Продолжить?" END From 2e123c914d2096bfa214a08cb72c811fd8902153 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Sun, 13 Aug 2023 10:09:18 +0900 Subject: [PATCH 39/74] [MSPAINT] Update Japanese (ja-JP) translation CORE-18706 --- base/applications/mspaint/lang/ja-JP.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index a5295fe73af..5d6d286fd81 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -264,6 +264,6 @@ BEGIN IDS_PRINTRES "%d x %d ピクセル/cm" IDS_CANTPASTE "クリップボードからの貼り付けに失敗しました。データ形式が間違っているか、未対応です。" IDS_SAVEERROR "次のファイルとして画像を保存するのに失敗しました:\n\n%s" - IDS_CANTSENDMAIL "Failed to send a mail." - IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" + IDS_CANTSENDMAIL "メール送信に失敗しました。" + IDS_LOSECOLOR "この操作を行うと色情報が失われます。続行しますか？" END From eb0513931ab0ca1c5c4b679ff3deb68d89ff9321 Mon Sep 17 00:00:00 2001 From: Andrei Miloiu Date: Fri, 18 Aug 2023 13:04:31 +0300 Subject: [PATCH 40/74] [MSPAINT] Update Romanian (ro-RO) translation (#5564) --- base/applications/mspaint/lang/ro-RO.rc | 30 ++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 8458bec1e5b..9058ad2e25f 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -4,7 +4,7 @@ * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2009 Petru Dimitriu * Copyright 2011-2018 Ștefan Fulea - * Copyright 2022 Andrei Miloiu + * Copyright 2022-2023 Andrei Miloiu */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -105,18 +105,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Dec&upează\tCtrl+X", IDM_EDITCUT + MENUITEM "Copia&ză\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Lipește\tCtrl+V", IDM_EDITPASTE + MENUITEM "Șt&erge selecția\tDel", IDM_EDITDELETESELECTION + MENUITEM "Selectea&ză tot\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "C&opiere în...", IDM_EDITCOPYTO + MENUITEM "Lipire &din...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Rotire/Oglindire...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Întindere/În&clinare...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inversează culorile\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -214,7 +214,7 @@ BEGIN END IDD_FONTS DIALOG 0, 0, 225, 25 -CAPTION "Fonts" +CAPTION "Fonturi" STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" @@ -263,7 +263,7 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixeli/cm" IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" - IDS_CANTSENDMAIL "Failed to send a mail." - IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" + IDS_SAVEERROR "Eșec în păstrarea imaginii bitmap („hartă de biți”) în fișierul:\n\n%s" + IDS_CANTSENDMAIL "Eșec în trimiterea unei scrisori." + IDS_LOSECOLOR "În această operațiune informațiile legate de culoare vor fi pierdute. Sigur veți continua?" END From b39040e6487b4399011a634afcefc709c39b879e Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Sun, 20 Aug 2023 16:46:18 +0900 Subject: [PATCH 41/74] [MSPAINT] Speed up for black and white (#5563) Follow-up to #5554. - Speed up ImageModel::PushBlackAndWhite by using GetDIBits and SetDIBits. CORE-19094 --- base/applications/mspaint/dib.cpp | 93 +++++++++++++++++++++++++++ base/applications/mspaint/dib.h | 2 + base/applications/mspaint/history.cpp | 44 +++---------- 3 files changed, 104 insertions(+), 35 deletions(-) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index df63e1a139d..d0bea3f7b2b 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -13,6 +13,13 @@ float g_xDpi = 96; float g_yDpi = 96; SYSTEMTIME g_fileTime; +#define WIDTHBYTES(i) (((i) + 31) / 32 * 4) + +struct BITMAPINFOEX : BITMAPINFO +{ + RGBQUAD bmiColorsExtra[256 - 1]; +}; + /* FUNCTIONS ********************************************************/ // Convert DPI (dots per inch) into PPCM (pixels per centimeter) @@ -519,3 +526,89 @@ HBITMAP BitmapFromHEMF(HENHMETAFILE hEMF) return hbm; } + +BOOL IsBitmapBlackAndWhite(HBITMAP hbm) +{ + BITMAP bm; + if (!::GetObjectW(hbm, sizeof(bm), &bm)) + return FALSE; + + if (bm.bmBitsPixel == 1) + return TRUE; + + BITMAPINFOEX bmi; + ZeroMemory(&bmi, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biWidth = bm.bmWidth; + bmi.bmiHeader.biHeight = bm.bmHeight; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 24; + + DWORD widthbytes = WIDTHBYTES(24 * bm.bmWidth); + DWORD cbBits = widthbytes * bm.bmHeight; + LPBYTE pbBits = new BYTE[cbBits]; + + HDC hdc = ::CreateCompatibleDC(NULL); + ::GetDIBits(hdc, hbm, 0, bm.bmHeight, pbBits, &bmi, DIB_RGB_COLORS); + ::DeleteDC(hdc); + + BOOL bBlackAndWhite = TRUE; + for (LONG y = 0; y < bm.bmHeight; ++y) + { + LPBYTE pbLine = &pbBits[widthbytes * y]; + for (LONG x = 0; x < bm.bmWidth; ++x) + { + BYTE Blue = *pbLine++; + BYTE Green = *pbLine++; + BYTE Red = *pbLine++; + COLORREF rgbColor = RGB(Red, Green, Blue); + if (rgbColor != RGB(0, 0, 0) && rgbColor != RGB(255, 255, 255)) + { + bBlackAndWhite = FALSE; + goto Finish; + } + } + } + +Finish: + delete[] pbBits; + + return bBlackAndWhite; +} + +HBITMAP ConvertToBlackAndWhite(HBITMAP hbm) +{ + BITMAP bm; + if (!::GetObject(hbm, sizeof(bm), &bm)) + return NULL; + + BITMAPINFOEX bmi; + ZeroMemory(&bmi, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biWidth = bm.bmWidth; + bmi.bmiHeader.biHeight = bm.bmHeight; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 1; + bmi.bmiColors[1].rgbBlue = 255; + bmi.bmiColors[1].rgbGreen = 255; + bmi.bmiColors[1].rgbRed = 255; + HDC hdc = ::CreateCompatibleDC(NULL); + LPVOID pvMonoBits; + HBITMAP hMonoBitmap = ::CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, &pvMonoBits, NULL, 0); + if (!hMonoBitmap) + { + ::DeleteDC(hdc); + return NULL; + } + + HBITMAP hNewBitmap = CreateDIBWithProperties(bm.bmWidth, bm.bmHeight); + if (hNewBitmap) + { + ::GetDIBits(hdc, hbm, 0, bm.bmHeight, pvMonoBits, &bmi, DIB_RGB_COLORS); + ::SetDIBits(hdc, hNewBitmap, 0, bm.bmHeight, pvMonoBits, &bmi, DIB_RGB_COLORS); + } + ::DeleteObject(hMonoBitmap); + ::DeleteDC(hdc); + + return hNewBitmap; +} diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index 025d2ffff24..23ac7a9ea04 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -7,10 +7,12 @@ #pragma once +BOOL IsBitmapBlackAndWhite(HBITMAP hbm); HBITMAP CreateDIBWithProperties(int width, int height); HBITMAP CreateMonoBitmap(int width, int height, BOOL bWhite); HBITMAP CreateColorDIB(int width, int height, COLORREF rgb); HBITMAP CachedBufferDIB(HBITMAP hbm, int minimalWidth, int minimalHeight); +HBITMAP ConvertToBlackAndWhite(HBITMAP hbm); HBITMAP CopyMonoImage(HBITMAP hbm, INT cx = 0, INT cy = 0); diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 8867a53025a..4451b06f927 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -270,44 +270,18 @@ HBITMAP ImageModel::CopyBitmap() BOOL ImageModel::IsBlackAndWhite() { - LONG cxWidth = GetWidth(), cyHeight = GetHeight(); - for (LONG y = 0; y < cyHeight; ++y) - { - for (LONG x = 0; x < cxWidth; ++x) - { - COLORREF rgbColor = ::GetPixel(m_hDrawingDC, x, y); - if (rgbColor != RGB(0, 0, 0) && rgbColor != RGB(255, 255, 255)) - return FALSE; - } - } - return TRUE; + ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select + BOOL bBlackAndWhite = IsBitmapBlackAndWhite(m_hBms[m_currInd]); + m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select + return bBlackAndWhite; } void ImageModel::PushBlackAndWhite() { - HBITMAP hNewBitmap = CopyBitmap(); - if (!hNewBitmap) - return; - - HDC hdc2 = ::CreateCompatibleDC(NULL); - HGDIOBJ hbm2Old = ::SelectObject(hdc2, hNewBitmap); - LONG cxWidth = GetWidth(), cyHeight = GetHeight(); - for (LONG y = 0; y < cyHeight; ++y) - { - for (LONG x = 0; x < cxWidth; ++x) - { - COLORREF rgbColor = ::GetPixel(m_hDrawingDC, x, y); - BYTE Red = GetRValue(rgbColor); - BYTE Green = GetGValue(rgbColor); - BYTE Blue = GetBValue(rgbColor); - if ((Red + Green + Blue) / 3 >= 255 / 2) - ::SetPixelV(hdc2, x, y, RGB(255, 255, 255)); // White - else - ::SetPixelV(hdc2, x, y, RGB(0, 0, 0)); // Black - } - } - ::SelectObject(hdc2, hbm2Old); - ::DeleteDC(hdc2); + ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select + HBITMAP hNewBitmap = ConvertToBlackAndWhite(m_hBms[m_currInd]); + m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select - PushImageForUndo(hNewBitmap); + if (hNewBitmap) + PushImageForUndo(hNewBitmap); } From fd5a27f19c9542d1b17d78302223eb591cf26eff Mon Sep 17 00:00:00 2001 From: Stanislav Motylkov Date: Sun, 20 Aug 2023 12:06:04 +0300 Subject: [PATCH 42/74] [MSPAINT] Sync translations between the main and popup menus Also some minor corrections and fixes for mnemonic keys. --- base/applications/mspaint/lang/bg-BG.rc | 54 ++++++++++++------------- base/applications/mspaint/lang/cs-CZ.rc | 50 +++++++++++------------ base/applications/mspaint/lang/de-DE.rc | 52 ++++++++++++------------ base/applications/mspaint/lang/en-GB.rc | 8 ++-- base/applications/mspaint/lang/en-US.rc | 8 ++-- base/applications/mspaint/lang/es-ES.rc | 54 ++++++++++++------------- base/applications/mspaint/lang/et-EE.rc | 26 ++++++------ base/applications/mspaint/lang/eu-ES.rc | 54 ++++++++++++------------- base/applications/mspaint/lang/fr-FR.rc | 54 ++++++++++++------------- base/applications/mspaint/lang/he-IL.rc | 20 ++++----- base/applications/mspaint/lang/hu-HU.rc | 54 ++++++++++++------------- base/applications/mspaint/lang/id-ID.rc | 20 ++++----- base/applications/mspaint/lang/it-IT.rc | 52 ++++++++++++------------ base/applications/mspaint/lang/ja-JP.rc | 4 +- base/applications/mspaint/lang/nl-NL.rc | 52 ++++++++++++------------ base/applications/mspaint/lang/no-NO.rc | 54 ++++++++++++------------- base/applications/mspaint/lang/pl-PL.rc | 2 +- base/applications/mspaint/lang/pt-BR.rc | 22 +++++----- base/applications/mspaint/lang/pt-PT.rc | 20 ++++----- base/applications/mspaint/lang/ro-RO.rc | 36 ++++++++--------- base/applications/mspaint/lang/sk-SK.rc | 50 +++++++++++------------ base/applications/mspaint/lang/sq-AL.rc | 38 ++++++++--------- base/applications/mspaint/lang/sv-SE.rc | 50 +++++++++++------------ base/applications/mspaint/lang/tr-TR.rc | 20 ++++----- base/applications/mspaint/lang/uk-UA.rc | 50 +++++++++++------------ base/applications/mspaint/lang/vi-VN.rc | 30 +++++++------- base/applications/mspaint/lang/zh-CN.rc | 24 +++++------ base/applications/mspaint/lang/zh-HK.rc | 24 +++++------ base/applications/mspaint/lang/zh-TW.rc | 24 +++++------ 29 files changed, 503 insertions(+), 503 deletions(-) diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index d9b9d6800d8..c12e35b6c8f 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Обработка" BEGIN - MENUITEM "Назад\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Напред\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Назад\tCtrl+Z", IDM_EDITUNDO + MENUITEM "Н&апред\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Отрязване\tCtrl+X", IDM_EDITCUT - MENUITEM "Копиране\tCtrl+C", IDM_EDITCOPY - MENUITEM "Поставяне\tCtrl+V", IDM_EDITPASTE - MENUITEM "Изтриване на избраното\tDel", IDM_EDITDELETESELECTION - MENUITEM "Обръщане на избора", IDM_EDITINVERTSELECTION - MENUITEM "Избиране на всичко\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "От&рязване\tCtrl+X", IDM_EDITCUT + MENUITEM "&Запомняне\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Поставяне\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Изтриване на избраното\tDel", IDM_EDITDELETESELECTION + MENUITEM "О&бръщане на избора", IDM_EDITINVERTSELECTION + MENUITEM "Избиране на &всичко\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Запомняне в...", IDM_EDITCOPYTO - MENUITEM "Поставяне в...", IDM_EDITPASTEFROM + MENUITEM "Запо&мняне в...", IDM_EDITCOPYTO + MENUITEM "По&ставяне в...", IDM_EDITPASTEFROM END POPUP "Из&глед" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "Из&ображение" BEGIN - MENUITEM "Завъртане\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Разпъване/Изкривяване\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Изрязване", IDM_IMAGECROP - MENUITEM "Обръщане на цветовете\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Принадлежности\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Изтриване на изображението\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Непрозрачно изчертаване", IDM_IMAGEDRAWOPAQUE + MENUITEM "З&авъртане...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Разпъва&не/Изкривяване...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Из&рязване", IDM_IMAGECROP + MENUITEM "&Обръщане на цветовете\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Принадлежности\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Изтриване на изображението\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Непрозра&чно изчертаване", IDM_IMAGEDRAWOPAQUE END POPUP "&Цветове" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "От&рязване\tCtrl+X", IDM_EDITCUT + MENUITEM "&Запомняне\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Поставяне\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Изтриване на избраното\tDel", IDM_EDITDELETESELECTION + MENUITEM "Избиране на &всичко\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Запо&мняне в...", IDM_EDITCOPYTO + MENUITEM "По&ставяне в...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "З&авъртане...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Разпъва&не/Изкривяване...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Обръщане на цветовете\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index d1b7c9bb8d2..b08cf04b616 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "Úpr&avy" BEGIN - MENUITEM "Zpět\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Znovu\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Zpět\tCtrl+Z", IDM_EDITUNDO + MENUITEM "Z&novu\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Vyjmout\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopírovat\tCtrl+C", IDM_EDITCOPY - MENUITEM "Vložit\tCtrl+V", IDM_EDITPASTE - MENUITEM "Vymazat výběr\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invertovat výběr", IDM_EDITINVERTSELECTION + MENUITEM "Vyjmou&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopírovat\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Vložit\tCtrl+V", IDM_EDITPASTE + MENUITEM "Vy&mazat výběr\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invertovat výběr", IDM_EDITINVERTSELECTION MENUITEM "Vybrat v&še\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopírovat do...", IDM_EDITCOPYTO - MENUITEM "Vložit z...", IDM_EDITPASTEFROM + MENUITEM "Kopírovat &do...", IDM_EDITCOPYTO + MENUITEM "V&ložit z...", IDM_EDITPASTEFROM END POPUP "&Zobrazit" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Obrázek" BEGIN - MENUITEM "Překlopit nebo otočit...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Oříznout", IDM_IMAGECROP - MENUITEM "Inverovat barvy\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Atributy...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Vymazat obrázek", IDM_IMAGEDELETEIMAGE - MENUITEM "Kreslit neprůhledně", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Překlopit nebo otočit...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Oříznout", IDM_IMAGECROP + MENUITEM "&Inverovat barvy\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atributy...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Vy&mazat obrázek", IDM_IMAGEDELETEIMAGE + MENUITEM "&Kreslit neprůhledně", IDM_IMAGEDRAWOPAQUE END POPUP "&Barvy" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Vyjmou&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopírovat\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Vložit\tCtrl+V", IDM_EDITPASTE + MENUITEM "Vy&mazat výběr\tDel", IDM_EDITDELETESELECTION + MENUITEM "Vybrat v&še\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopírovat &do...", IDM_EDITCOPYTO + MENUITEM "V&ložit z...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Překlopit nebo otočit...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Inverovat barvy\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index b9acaa6b1a2..02198b8feab 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "&Bearbeiten" BEGIN - MENUITEM "Rückgängig\tStrg+Z", IDM_EDITUNDO - MENUITEM "Wiederholen\tStrg+Y", IDM_EDITREDO + MENUITEM "&Rückgängig\tStrg+Z", IDM_EDITUNDO + MENUITEM "&Wiederholen\tStrg+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Ausschneiden\tStrg+X", IDM_EDITCUT - MENUITEM "Kopieren\tStrg+C", IDM_EDITCOPY - MENUITEM "Einfügen\tStrg+V", IDM_EDITPASTE - MENUITEM "Auswahl löschen\tEntf", IDM_EDITDELETESELECTION - MENUITEM "Markierung umkehren", IDM_EDITINVERTSELECTION + MENUITEM "&Ausschneiden\tStrg+X", IDM_EDITCUT + MENUITEM "&Kopieren\tStrg+C", IDM_EDITCOPY + MENUITEM "&Einfügen\tStrg+V", IDM_EDITPASTE + MENUITEM "Auswahl &löschen\tEntf", IDM_EDITDELETESELECTION + MENUITEM "Markierung &umkehren", IDM_EDITINVERTSELECTION MENUITEM "Alles &markieren\tStrg+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopieren nach...", IDM_EDITCOPYTO - MENUITEM "Einfügen aus...", IDM_EDITPASTEFROM + MENUITEM "Kopieren &nach...", IDM_EDITCOPYTO + MENUITEM "Einfügen au&s...", IDM_EDITPASTEFROM END POPUP "&Ansicht" BEGIN @@ -76,13 +76,13 @@ BEGIN END POPUP "B&ild" BEGIN - MENUITEM "Drehen/Spiegeln...\tStrg+D", IDM_IMAGEROTATEMIRROR - MENUITEM "Strecken/Zerren...\tStrg+K", IDM_IMAGESTRETCHSKEW - MENUITEM "Zuschneiden", IDM_IMAGECROP - MENUITEM "Farben umkehren\tStrg+U", IDM_IMAGEINVERTCOLORS - MENUITEM "Attribute...\tStrg+E", IDM_IMAGEATTRIBUTES - MENUITEM "Bild löschen\tStrg+Umschalt+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Deckend zeichnen", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Drehen/Spiegeln...\tStrg+D", IDM_IMAGEROTATEMIRROR + MENUITEM "Strecken/&Zerren...\tStrg+K", IDM_IMAGESTRETCHSKEW + MENUITEM "Zu&schneiden", IDM_IMAGECROP + MENUITEM "Farben &umkehren\tStrg+U", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attribute...\tStrg+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Bild löschen\tStrg+Umschalt+N", IDM_IMAGEDELETEIMAGE + MENUITEM "D&eckend zeichnen", IDM_IMAGEDRAWOPAQUE END POPUP "&Farben" BEGIN @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Ausschneiden\tStrg+X", IDM_EDITCUT + MENUITEM "&Kopieren\tStrg+C", IDM_EDITCOPY + MENUITEM "&Einfügen\tStrg+V", IDM_EDITPASTE + MENUITEM "Auswahl &löschen\tEntf", IDM_EDITDELETESELECTION + MENUITEM "Alles &markieren\tStrg+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopieren &nach...", IDM_EDITCOPYTO + MENUITEM "Einfügen au&s...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Drehen/Spiegeln...\tStrg+D", IDM_IMAGEROTATEMIRROR + MENUITEM "Strecken/&Zerren...\tStrg+K", IDM_IMAGESTRETCHSKEW + MENUITEM "Farben &umkehren\tStrg+U", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index 5b6258181b3..172591e663c 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -78,10 +78,10 @@ BEGIN BEGIN MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Crop", IDM_IMAGECROP + MENUITEM "C&rop", IDM_IMAGECROP MENUITEM "&Invert colours\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Attributes...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Delete image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Clear image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Draw opaque", IDM_IMAGEDRAWOPAQUE END POPUP "&Colours" @@ -103,8 +103,8 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "Cu&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copy\tCtrl+C", IDM_EDITCOPY MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 270f191f7b8..5e2a61a67c9 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -79,10 +79,10 @@ BEGIN BEGIN MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Crop", IDM_IMAGECROP + MENUITEM "C&rop", IDM_IMAGECROP MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Attributes...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Delete image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Clear image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Draw opaque", IDM_IMAGEDRAWOPAQUE END POPUP "&Colors" @@ -104,8 +104,8 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "Cu&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copy\tCtrl+C", IDM_EDITCOPY MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 222889abb46..3a4dbcaa98e 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -39,18 +39,18 @@ BEGIN END POPUP "&Edición" BEGIN - MENUITEM "Deshacer\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Rehacer\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Deshacer\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Rehacer\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Cortar\tCtrl+X", IDM_EDITCUT - MENUITEM "Copiar\tCtrl+C", IDM_EDITCOPY - MENUITEM "Pegar\tCtrl+V", IDM_EDITPASTE - MENUITEM "Borrar selección\tSupr", IDM_EDITDELETESELECTION - MENUITEM "Invertir selección", IDM_EDITINVERTSELECTION - MENUITEM "Seleccionar todo\tCtrl+E", IDM_EDITSELECTALL + MENUITEM "Cor&tar\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Pegar\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Borrar selección\tSupr", IDM_EDITDELETESELECTION + MENUITEM "&Invertir selección", IDM_EDITINVERTSELECTION + MENUITEM "Seleccionar t&odo\tCtrl+E", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Copiar a...", IDM_EDITCOPYTO - MENUITEM "Pegar desde...", IDM_EDITPASTEFROM + MENUITEM "Copiar &a...", IDM_EDITCOPYTO + MENUITEM "Pegar d&esde...", IDM_EDITPASTEFROM END POPUP "&Ver" BEGIN @@ -79,13 +79,13 @@ BEGIN END POPUP "&Imagen" BEGIN - MENUITEM "Rotar/Invertir...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Estirar/Inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Recortar", IDM_IMAGECROP - MENUITEM "Invertir colores\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Atributos...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Borrar imagen\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Dibujar figuras opacas", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Rotar/Invertir...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "E&stirar/Inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Re&cortar", IDM_IMAGECROP + MENUITEM "&Invertir colores\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atributos...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Borrar imagen\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Dibujar figuras &opacas", IDM_IMAGEDRAWOPAQUE END POPUP "&Colores" BEGIN @@ -106,18 +106,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Cor&tar\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Pegar\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Borrar selección\tSupr", IDM_EDITDELETESELECTION + MENUITEM "Seleccionar t&odo\tCtrl+E", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Copiar &a...", IDM_EDITCOPYTO + MENUITEM "Pegar d&esde...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Rotar/Invertir...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "E&stirar/Inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invertir colores\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 14ac1e909da..c95f246d9fd 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -41,7 +41,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Lõika\tCtrl+X", IDM_EDITCUT MENUITEM "&Kopeeri\tCtrl+C", IDM_EDITCOPY - MENUITEM "K&leebi\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kl&eebi\tCtrl+V", IDM_EDITPASTE MENUITEM "Kustuta &valik\tDel", IDM_EDITDELETESELECTION MENUITEM "&Pööra valikut", IDM_EDITINVERTSELECTION MENUITEM "Vali k&õik\tCtrl+A", IDM_EDITSELECTALL @@ -76,12 +76,12 @@ BEGIN END POPUP "&Pilt" BEGIN - MENUITEM "Pööra/&Peegelda...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Pööra/Pee&gelda...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Venita/Kalluta...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "&Kärbi", IDM_IMAGECROP MENUITEM "&Pööra värvid\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Atribuudid...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Kustuta pilt\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Ku&stuta pilt\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Joonista läbipaistmatult", IDM_IMAGEDRAWOPAQUE END POPUP "&Värvid" @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Lõika\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopeeri\tCtrl+C", IDM_EDITCOPY + MENUITEM "Kl&eebi\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kustuta &valik\tDel", IDM_EDITDELETESELECTION + MENUITEM "Vali k&õik\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopee&ri asukohta...", IDM_EDITCOPYTO + MENUITEM "Klee&bi asukohast...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Pööra/Pee&gelda...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Venita/Kalluta...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Pööra värvid\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index ff727c1adb6..d7f2664ba4d 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Editatu" BEGIN - MENUITEM "Desegin\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Errepikatu\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Desegin\tCtrl+Z", IDM_EDITUNDO + MENUITEM "E&rrepikatu\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Ebaki\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopiatu\tCtrl+C", IDM_EDITCOPY - MENUITEM "Itsasti\tCtrl+V", IDM_EDITPASTE - MENUITEM "Selekzioa ezabatu\tDel", IDM_EDITDELETESELECTION - MENUITEM "selekzioa alderantzikatu", IDM_EDITINVERTSELECTION - MENUITEM "Huatatu dena\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "E&baki\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopiatu\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Itsasti\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selekzioa &ezabatu\tDel", IDM_EDITDELETESELECTION + MENUITEM "Selekzioa &alderantzikatu", IDM_EDITINVERTSELECTION + MENUITEM "&Huatatu dena\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopiatu hona...", IDM_EDITCOPYTO - MENUITEM "Itsasti hemendik...", IDM_EDITPASTEFROM + MENUITEM "Kopiatu h&ona...", IDM_EDITCOPYTO + MENUITEM "Itsasti he&mendik...", IDM_EDITPASTEFROM END POPUP "&Ikusi" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "I&rudia" BEGIN - MENUITEM "Irauli/biratu...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Hedatu/Zeharkatu...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Moztu", IDM_IMAGECROP - MENUITEM "Alderantzikatu koloreak\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Atributuak...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Garbitu irudia\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Marraztu opako", IDM_IMAGEDRAWOPAQUE + MENUITEM "I&rauli/biratu...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "He&datu/Zeharkatu...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Moztu", IDM_IMAGECROP + MENUITEM "A&lderantzikatu koloreak\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atributuak...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Garbitu irudia\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Marraztu &opako", IDM_IMAGEDRAWOPAQUE END POPUP "&Koloreak" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "E&baki\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopiatu\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Itsasti\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selekzioa &ezabatu\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Huatatu dena\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopiatu h&ona...", IDM_EDITCOPYTO + MENUITEM "Itsasti he&mendik...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "I&rauli/biratu...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "He&datu/Zeharkatu...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "A&lderantzikatu koloreak\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 93d4c0ca819..98c9f2c0190 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Edition" BEGIN - MENUITEM "Annuler\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Rétablir\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Annuler\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Rétablir\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Couper\tCtrl+X", IDM_EDITCUT - MENUITEM "Copier\tCtrl+C", IDM_EDITCOPY - MENUITEM "Coller\tCtrl+V", IDM_EDITPASTE - MENUITEM "Effacer la sélection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Inverser la sélection", IDM_EDITINVERTSELECTION - MENUITEM "Sélectionner tout\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Co&uper\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copier\tCtrl+C", IDM_EDITCOPY + MENUITEM "C&oller\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Effacer la sélection\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Inverser la sélection", IDM_EDITINVERTSELECTION + MENUITEM "&Sélectionner tout\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Copier vers...", IDM_EDITCOPYTO - MENUITEM "Coller à partir de...", IDM_EDITPASTEFROM + MENUITEM "Copier &vers...", IDM_EDITCOPYTO + MENUITEM "Coller à &partir de...", IDM_EDITPASTEFROM END POPUP "&Affichage" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Image" BEGIN - MENUITEM "Retourner/Faire pivoter...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Agrandir/Pencher...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Rogner", IDM_IMAGECROP - MENUITEM "Inverser les couleurs\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attributs...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Effacer l'image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Dessiner opaque", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Retourner/Faire pivoter...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Agrandir/Pencher...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Ro&gner", IDM_IMAGECROP + MENUITEM "&Inverser les couleurs\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attributs...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Effacer l'image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Dessiner &opaque", IDM_IMAGEDRAWOPAQUE END POPUP "&Couleurs" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Co&uper\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copier\tCtrl+C", IDM_EDITCOPY + MENUITEM "C&oller\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Effacer la sélection\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Sélectionner tout\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Copier &vers...", IDM_EDITCOPYTO + MENUITEM "Coller à &partir de...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Retourner/Faire pivoter...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Agrandir/Pencher...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverser les couleurs\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 5bc8e6209e6..d725a2b1193 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -77,7 +77,7 @@ BEGIN POPUP "ת&מונה" BEGIN MENUITEM "סובב/הפוך...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "חתוך", IDM_IMAGECROP MENUITEM "הפוך צבעים\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "תכונות...\tCtrl+E", IDM_IMAGEATTRIBUTES @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "גזור\tCtrl+X", IDM_EDITCUT + MENUITEM "העתק\tCtrl+C", IDM_EDITCOPY + MENUITEM "הדבק\tCtrl+V", IDM_EDITPASTE + MENUITEM "מחק בחירה\tDel", IDM_EDITDELETESELECTION + MENUITEM "בחר הכל\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "העתק ל...", IDM_EDITCOPYTO + MENUITEM "הדבק מ...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "סובב/הפוך...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "הפוך צבעים\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index c0d95630210..68235d94782 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "S&zerkesztés" BEGIN - MENUITEM "Visszavonás\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Ismét\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Visszavonás\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Ismét\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Kivágás\tCtrl+X", IDM_EDITCUT - MENUITEM "Másolás\tCtrl+C", IDM_EDITCOPY - MENUITEM "Beillesztés\tCtrl+V", IDM_EDITPASTE - MENUITEM "Kijelölés törlése\tDel", IDM_EDITDELETESELECTION - MENUITEM "Kijelölés megfordítása", IDM_EDITINVERTSELECTION - MENUITEM "Mindent kijelöl\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Kivá&gás\tCtrl+X", IDM_EDITCUT + MENUITEM "&Másolás\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Beillesztés\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kijelölés &törlése\tDel", IDM_EDITDELETESELECTION + MENUITEM "Kijelölés megf&ordítása", IDM_EDITINVERTSELECTION + MENUITEM "Mindent &kijelöl\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Másolás fájlba...", IDM_EDITCOPYTO - MENUITEM "Fájl beillesztése...", IDM_EDITPASTEFROM + MENUITEM "Másolás &fájlba...", IDM_EDITCOPYTO + MENUITEM "Fájl b&eillesztése...", IDM_EDITPASTEFROM END POPUP "&Nézet" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Kép" BEGIN - MENUITEM "Forgatás/Tükrözés...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Nyújtás/Döntés...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Vágás", IDM_IMAGECROP - MENUITEM "Színek megfordítása\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attribútumok...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Kép törlése\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Nem átlátszó", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Forgatás/Tükrözés...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Nyújtás/&Döntés...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Vágás", IDM_IMAGECROP + MENUITEM "&Színek megfordítása\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attribútumok...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Kép törlése\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Nem átlátszó", IDM_IMAGEDRAWOPAQUE END POPUP "Szín&ek" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Kivá&gás\tCtrl+X", IDM_EDITCUT + MENUITEM "&Másolás\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Beillesztés\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kijelölés &törlése\tDel", IDM_EDITDELETESELECTION + MENUITEM "Mindent &kijelöl\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Másolás &fájlba...", IDM_EDITCOPYTO + MENUITEM "Fájl b&eillesztése...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Forgatás/Tükrözés...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Nyújtás/&Döntés...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Színek megfordítása\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 29e33375f26..907731a2168 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Gunting\tCtrl+X", IDM_EDITCUT + MENUITEM "&Salin\tCtrl+C", IDM_EDITCOPY + MENUITEM "Te&mpel\tCtrl+V", IDM_EDITPASTE + MENUITEM "Hapus &Pilihan\tDel", IDM_EDITDELETESELECTION + MENUITEM "Pilih S&emua\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Salin &ke...", IDM_EDITCOPYTO + MENUITEM "Tempel da&ri...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Putar/&Cermin...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Perluas/Condongkan...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Balikkan warna\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 2bdba963bbb..2d36efa32eb 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Modifica" BEGIN - MENUITEM "Annulla\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Ripeti\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Annulla\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Ripeti\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Taglia\tCtrl+X", IDM_EDITCUT - MENUITEM "Copia\tCtrl+C", IDM_EDITCOPY - MENUITEM "Incolla\tCtrl+V", IDM_EDITPASTE - MENUITEM "Cancella area selezionata\tCanc", IDM_EDITDELETESELECTION - MENUITEM "Inverte selezione", IDM_EDITINVERTSELECTION + MENUITEM "&Taglia\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copia\tCtrl+C", IDM_EDITCOPY + MENUITEM "I&ncolla\tCtrl+V", IDM_EDITPASTE + MENUITEM "Cance&lla area selezionata\tCanc", IDM_EDITDELETESELECTION + MENUITEM "&Inverte selezione", IDM_EDITINVERTSELECTION MENUITEM "Sele&ziona tutto\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Copia su...", IDM_EDITCOPYTO - MENUITEM "Incolla da...", IDM_EDITPASTEFROM + MENUITEM "Copia &su...", IDM_EDITCOPYTO + MENUITEM "Incolla &da...", IDM_EDITPASTEFROM END POPUP "&Visualizza" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Immagine" BEGIN - MENUITEM "Capovolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Ritaglia", IDM_IMAGECROP - MENUITEM "Inverti colori\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attributi...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Cancella immagine\tCtrl+Maiusc+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Opaco", IDM_IMAGEDRAWOPAQUE + MENUITEM "Ca&povolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Ritaglia", IDM_IMAGECROP + MENUITEM "&Inverti colori\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attributi...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Cancella immagine\tCtrl+Maiusc+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Opaco", IDM_IMAGEDRAWOPAQUE END POPUP "&Colori" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Taglia\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copia\tCtrl+C", IDM_EDITCOPY + MENUITEM "I&ncolla\tCtrl+V", IDM_EDITPASTE + MENUITEM "Cance&lla area selezionata\tCanc", IDM_EDITDELETESELECTION + MENUITEM "Sele&ziona tutto\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Copia &su...", IDM_EDITCOPYTO + MENUITEM "Incolla &da...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Ca&povolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "S&tretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverti colori\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index 5d6d286fd81..ce58149c3a4 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -80,10 +80,10 @@ BEGIN BEGIN MENUITEM "回転と反転(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "伸縮と傾斜(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "切り取り(&C)", IDM_IMAGECROP + MENUITEM "切り取り(&R)", IDM_IMAGECROP MENUITEM "色の反転(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "画像の属性(&A)\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "画像の削除\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "画像の削除(&C)\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "不透明色を描画する(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "色(&C)" diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 5c579b3b22c..556a8bb1a78 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "Be&werken" BEGIN - MENUITEM "Ongedaan maken\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Opnieuw\tCtrl+Y", IDM_EDITREDO + MENUITEM "On&gedaan maken\tCtrl+Z", IDM_EDITUNDO + MENUITEM "Opni&euw\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Knippen\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopiëren\tCtrl+C", IDM_EDITCOPY - MENUITEM "Plakken\tCtrl+V", IDM_EDITPASTE - MENUITEM "Selectie wissen\tDel", IDM_EDITDELETESELECTION - MENUITEM "Selectie omkeren", IDM_EDITINVERTSELECTION + MENUITEM "&Knippen\tCtrl+X", IDM_EDITCUT + MENUITEM "K&opiëren\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Plakken\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selectie &wissen\tDel", IDM_EDITDELETESELECTION + MENUITEM "Selectie o&mkeren", IDM_EDITINVERTSELECTION MENUITEM "&Alles selecteren\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopiëren naar...", IDM_EDITCOPYTO - MENUITEM "Plakken uit...", IDM_EDITPASTEFROM + MENUITEM "Kopiëren &naar...", IDM_EDITCOPYTO + MENUITEM "Plakken &uit...", IDM_EDITPASTEFROM END POPUP "Beel&d" BEGIN @@ -76,13 +76,13 @@ BEGIN END POPUP "&Afbeelding" BEGIN - MENUITEM "Spiegelen/draaien...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Bijsnijden", IDM_IMAGECROP - MENUITEM "Negatief\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Kenmerken...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Afbeelding wissen", IDM_IMAGEDELETEIMAGE - MENUITEM "Ondoorzichtig tekenen", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Spiegelen/draaien...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "S&tretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Bijsnijden", IDM_IMAGECROP + MENUITEM "Negat&ief\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "K&enmerken...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Afbeelding wissen", IDM_IMAGEDELETEIMAGE + MENUITEM "&Ondoorzichtig tekenen", IDM_IMAGEDRAWOPAQUE END POPUP "&Kleuren" BEGIN @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Knippen\tCtrl+X", IDM_EDITCUT + MENUITEM "K&opiëren\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Plakken\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selectie &wissen\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Alles selecteren\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopiëren &naar...", IDM_EDITCOPYTO + MENUITEM "Plakken &uit...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Spiegelen/draaien...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "S&tretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Negat&ief\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 98d4107ad26..186db5cb4dc 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "&Rediger" BEGIN - MENUITEM "Angre\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Gjenopprett\tCtrl+Y", IDM_EDITREDO + MENUITEM "A&ngre\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Gjenopprett\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Klipp ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopier\tCtrl+C", IDM_EDITCOPY - MENUITEM "Lim inn\tCtrl+V", IDM_EDITPASTE - MENUITEM "Slett valgt\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invertere valg", IDM_EDITINVERTSELECTION - MENUITEM "Velg alt\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Klipp &ut\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopier\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Lim inn\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Slett valgt\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invertere valg", IDM_EDITINVERTSELECTION + MENUITEM "Velg &alt\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopier til...", IDM_EDITCOPYTO - MENUITEM "Lim inn fra...", IDM_EDITPASTEFROM + MENUITEM "Kopier &til...", IDM_EDITCOPYTO + MENUITEM "Lim inn &fra...", IDM_EDITPASTEFROM END POPUP "&Vis" BEGIN @@ -76,13 +76,13 @@ BEGIN END POPUP "&Bilde" BEGIN - MENUITEM "Roter/speile...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Beskjær", IDM_IMAGECROP - MENUITEM "Invertere farger\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attributter...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Fjern bilde\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Gjør ugjennomsiktig", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Roter/speile...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Beskjær", IDM_IMAGECROP + MENUITEM "&Invertere farger\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attributter...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Fjern bilde\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Gjør &ugjennomsiktig", IDM_IMAGEDRAWOPAQUE END POPUP "&Farger" BEGIN @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Klipp &ut\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopier\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Lim inn\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Slett valgt\tDel", IDM_EDITDELETESELECTION + MENUITEM "Velg &alt\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopier &til...", IDM_EDITCOPYTO + MENUITEM "Lim inn &fra...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Roter/speile...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Str&etch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invertere farger\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 3d9aa9afa18..fdad831e316 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -107,7 +107,7 @@ BEGIN POPUP "Popup #0" BEGIN MENUITEM "&Wytnij\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopiuj\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Kopiuj\tCtrl+C", IDM_EDITCOPY MENUITEM "Wkl&ej\tCtrl+V", IDM_EDITPASTE MENUITEM "Wyczyść z&aznaczenie\tDel", IDM_EDITDELETESELECTION MENUITEM "&Zaznacz wszystko\tCtrl+A", IDM_EDITSELECTALL diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index 2c0fb9722b2..846fbcf023d 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -79,7 +79,7 @@ BEGIN BEGIN MENUITEM "Inverter/&girar...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Alongar/inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Cortar", IDM_IMAGECROP + MENUITEM "&Cortar", IDM_IMAGECROP MENUITEM "&Inverter cores\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "A&tributos...\tCtrl+E", IDM_IMAGEATTRIBUTES MENUITEM "&Limpar imagem\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Recortar\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY + MENUITEM "C&olar\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Limpar seleção\tDel", IDM_EDITDELETESELECTION + MENUITEM "Selecionar &tudo\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Copiar ¶...", IDM_EDITCOPYTO + MENUITEM "Colar &de...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Inverter/&girar...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Alongar/inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverter cores\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 950f71d19a9..c4f226537a0 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Cor&tar\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY + MENUITEM "Co&lar\tCtrl+V", IDM_EDITPASTE + MENUITEM "Limpar &selecção\tDel", IDM_EDITDELETESELECTION + MENUITEM "Seleccionar &tudo\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "C&opiar para...", IDM_EDITCOPYTO + MENUITEM "Colar &de...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "I&nverter/rodar...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Redimensionar/Torcer...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverter cores\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 9058ad2e25f..51e278720e6 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -16,17 +16,17 @@ BEGIN POPUP "&Fișier" BEGIN MENUITEM "&Nou\tCtrl+N", IDM_FILENEW - MENUITEM "&Deschidere…\tCtrl+O", IDM_FILEOPEN + MENUITEM "&Deschidere...\tCtrl+O", IDM_FILEOPEN MENUITEM "&Păstrează\tCtrl+S", IDM_FILESAVE - MENUITEM "Păst&rare în…", IDM_FILESAVEAS + MENUITEM "Păst&rare în...", IDM_FILESAVEAS MENUITEM SEPARATOR - MENUITEM "Din aparat media…", IDM_FILEFROMSCANNERORCAMERA + MENUITEM "Din aparat media...", IDM_FILEFROMSCANNERORCAMERA MENUITEM SEPARATOR MENUITEM "Pre&vizionează pagina", IDM_FILEPAGEVIEW - MENUITEM "C&onfigurare pagină…", IDM_FILEPAGESETUP - MENUITEM "I&mprimă…\tCtrl+P", IDM_FILEPRINT + MENUITEM "C&onfigurare pagină...", IDM_FILEPAGESETUP + MENUITEM "I&mprimă...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR - MENUITEM "Transmite…", IDM_FILESEND + MENUITEM "Transmite...", IDM_FILESEND MENUITEM SEPARATOR MENUITEM "Decor de birou (în c&arou)", IDM_FILEASWALLPAPERPLANE MENUITEM "Decor de birou (¢rat)", IDM_FILEASWALLPAPERCENTERED @@ -48,8 +48,8 @@ BEGIN MENUITEM "In&versează selecția", IDM_EDITINVERTSELECTION MENUITEM "Selecte&ază tot\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opiere în…", IDM_EDITCOPYTO - MENUITEM "Lipire di&n…", IDM_EDITPASTEFROM + MENUITEM "C&opiere în...", IDM_EDITCOPYTO + MENUITEM "Lipire di&n...", IDM_EDITPASTEFROM END POPUP "&Afișare" BEGIN @@ -78,26 +78,26 @@ BEGIN END POPUP "I&magine" BEGIN - MENUITEM "&Rotire/Oglindire…\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Întin&dere/Înclinare…\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Rotire/Oglindire...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Întin&dere/Înclinare...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "Recoltea&ză", IDM_IMAGECROP MENUITEM "In&versează culorile\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "&Atribute…\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Atribute...\tCtrl+E", IDM_IMAGEATTRIBUTES MENUITEM "Șt&erge imaginea", IDM_IMAGEDELETEIMAGE MENUITEM "Mod &opac", IDM_IMAGEDRAWOPAQUE END POPUP "&Culori" BEGIN - MENUITEM "&Editare paletă…", IDM_COLORSEDITPALETTE + MENUITEM "&Editare paletă...", IDM_COLORSEDITPALETTE MENUITEM SEPARATOR MENUITEM "Paletă &modernă", IDM_COLORSMODERNPALETTE MENUITEM "Paletă &veche", IDM_COLORSOLDPALETTE END POPUP "Aj&utor" BEGIN - MENUITEM "&Manual…", IDM_HELPHELPTOPICS + MENUITEM "&Manual...", IDM_HELPHELPTOPICS MENUITEM SEPARATOR - MENUITEM "&Despre…", IDM_HELPINFO + MENUITEM "&Despre...", IDM_HELPINFO END END @@ -105,14 +105,14 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "Dec&upează\tCtrl+X", IDM_EDITCUT - MENUITEM "Copia&ză\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Decupează\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiază\tCtrl+C", IDM_EDITCOPY MENUITEM "&Lipește\tCtrl+V", IDM_EDITPASTE MENUITEM "Șt&erge selecția\tDel", IDM_EDITDELETESELECTION - MENUITEM "Selectea&ză tot\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Selecte&ază tot\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR MENUITEM "C&opiere în...", IDM_EDITCOPYTO - MENUITEM "Lipire &din...", IDM_EDITPASTEFROM + MENUITEM "Lipire di&n...", IDM_EDITPASTEFROM MENUITEM SEPARATOR MENUITEM "&Rotire/Oglindire...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "Întindere/În&clinare...\tCtrl+W", IDM_IMAGESTRETCHSKEW diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index f5150612597..da902a67b84 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "&Upraviť" BEGIN - MENUITEM "Späť\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Znova\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Späť\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Znova\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Vystrihnúť\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopírovať\tCtrl+C", IDM_EDITCOPY - MENUITEM "Prilepiť\tCtrl+V", IDM_EDITPASTE - MENUITEM "Vymazať výber\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invertovať výber", IDM_EDITINVERTSELECTION + MENUITEM "&Vystrihnúť\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopírovať\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Prilepiť\tCtrl+V", IDM_EDITPASTE + MENUITEM "Vy&mazať výber\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invertovať výber", IDM_EDITINVERTSELECTION MENUITEM "Vy&brať všetko\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopírovať do...", IDM_EDITCOPYTO - MENUITEM "Prilepiť z...", IDM_EDITPASTEFROM + MENUITEM "K&opírovať do...", IDM_EDITCOPYTO + MENUITEM "P&rilepiť z...", IDM_EDITPASTEFROM END POPUP "&Zobraziť" BEGIN @@ -76,13 +76,13 @@ BEGIN END POPUP "&Obrázok" BEGIN - MENUITEM "Prevrátiť alebo otočiť...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Orezať", IDM_IMAGECROP - MENUITEM "Invertovať farby\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Atribúty...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Vymazať obrázok\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Kresliť nepriesvitne", IDM_IMAGEDRAWOPAQUE + MENUITEM "Pr&evrátiť alebo otočiť...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Orezať", IDM_IMAGECROP + MENUITEM "&Invertovať farby\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atribúty...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Vy&mazať obrázok\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Kresliť nepriesvitne", IDM_IMAGEDRAWOPAQUE END POPUP "&Farby" BEGIN @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Vystrihnúť\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopírovať\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Prilepiť\tCtrl+V", IDM_EDITPASTE + MENUITEM "Vy&mazať výber\tDel", IDM_EDITDELETESELECTION + MENUITEM "Vy&brať všetko\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "K&opírovať do...", IDM_EDITCOPYTO + MENUITEM "P&rilepiť z...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Pr&evrátiť alebo otočiť...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Invertovať farby\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index a04d10f84e8..05e49622c36 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "&Modifiko" BEGIN - MENUITEM "&v\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Undo\tCtrl+Z", IDM_EDITUNDO MENUITEM "&Perserit\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Prej\tCtrl+X", IDM_EDITCUT + MENUITEM "Pre&j\tCtrl+X", IDM_EDITCUT MENUITEM "&Kopjo\tCtrl+C", IDM_EDITCOPY MENUITEM "&Ngjit\tCtrl+V", IDM_EDITPASTE - MENUITEM "Fshi perzgjedhjen\tDel", IDM_EDITDELETESELECTION - MENUITEM "Kthe perzgjedhjen", IDM_EDITINVERTSELECTION - MENUITEM "Perzgjedh te gjitha\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Fshi perzgjedhjen\tDel", IDM_EDITDELETESELECTION + MENUITEM "Kth&e perzgjedhjen", IDM_EDITINVERTSELECTION + MENUITEM "Perzgjedh te gjith&a\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopjo tek...", IDM_EDITCOPYTO - MENUITEM "Ngjit nga...", IDM_EDITPASTEFROM + MENUITEM "K&opjo tek...", IDM_EDITCOPYTO + MENUITEM "N&gjit nga...", IDM_EDITPASTEFROM END POPUP "Shiko" BEGIN @@ -77,11 +77,11 @@ BEGIN POPUP "&Imazhe" BEGIN MENUITEM "Rrotullu/&Pamjen...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&&Streq/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Streq/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "&Copto", IDM_IMAGECROP MENUITEM "&Inverto ngjyrat\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Atributet...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Fshi foton\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Fshi foton\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "Vizato errët", IDM_IMAGEDRAWOPAQUE END POPUP "Ngjyrat" @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Pre&j\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopjo\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Ngjit\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Fshi perzgjedhjen\tDel", IDM_EDITDELETESELECTION + MENUITEM "Perzgjedh te gjith&a\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "K&opjo tek...", IDM_EDITCOPYTO + MENUITEM "N&gjit nga...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Rrotullu/&Pamjen...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Streq/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverto ngjyrat\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index df1c8b41538..4b750a67126 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Redigera" BEGIN - MENUITEM "Ångra\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Göra om\tCtrl+Y", IDM_EDITREDO + MENUITEM "Å&ngra\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Göra om\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Klipp ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopiera\tCtrl+C", IDM_EDITCOPY - MENUITEM "Klistra in\tCtrl+V", IDM_EDITPASTE - MENUITEM "Ta bort\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invertera val", IDM_EDITINVERTSELECTION + MENUITEM "Klipp &ut\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopiera\tCtrl+C", IDM_EDITCOPY + MENUITEM "K&listra in\tCtrl+V", IDM_EDITPASTE + MENUITEM "Ta &bort\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invertera val", IDM_EDITINVERTSELECTION MENUITEM "&Markera allt\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopiera till...", IDM_EDITCOPYTO - MENUITEM "Klistra från...", IDM_EDITPASTEFROM + MENUITEM "Ko&piera till...", IDM_EDITCOPYTO + MENUITEM "Klistra &från...", IDM_EDITPASTEFROM END POPUP "&Visa" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Bild" BEGIN - MENUITEM "Rotera/Spegelvänd...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Beskära", IDM_IMAGECROP - MENUITEM "Invertera färger\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attribut...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Radera bild\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "???Draw opaque", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Rotera/Spegelvänd...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Beskära", IDM_IMAGECROP + MENUITEM "&Invertera färger\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attribut...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Ra&dera bild\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Draw &opaque", IDM_IMAGEDRAWOPAQUE END POPUP "&Färger" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Klipp &ut\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopiera\tCtrl+C", IDM_EDITCOPY + MENUITEM "K&listra in\tCtrl+V", IDM_EDITPASTE + MENUITEM "Ta &bort\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Markera allt\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Ko&piera till...", IDM_EDITCOPYTO + MENUITEM "Klistra &från...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Rotera/Spegelvänd...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Invertera färger\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index f64046c155a..fc7ad3858a8 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Kes\tCtrl+X", IDM_EDITCUT + MENUITEM "K&opyala\tCtrl+C", IDM_EDITCOPY + MENUITEM "Y&apıştır\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Seçimi Sil\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Tümünü Seç\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Ş&uraya Kopyala...", IDM_EDITCOPYTO + MENUITEM "Şu&radan Yapıştır...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Döndür ya da Yansıt...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Yeniden Boyutlandır veya Eğ...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Re&nkleri Tersine Çevir\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index 8c95ebe04e5..9ca30e696ad 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -38,18 +38,18 @@ BEGIN END POPUP "&Редагування" BEGIN - MENUITEM "Скасувати\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Повторити\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Скасувати\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Повторити\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Вирізати\tCtrl+X", IDM_EDITCUT - MENUITEM "Копіювати\tCtrl+C", IDM_EDITCOPY - MENUITEM "Вставити\tCtrl+V", IDM_EDITPASTE - MENUITEM "Видалити виділення\tDel", IDM_EDITDELETESELECTION - MENUITEM "Обернути виділення", IDM_EDITINVERTSELECTION + MENUITEM "&Вирізати\tCtrl+X", IDM_EDITCUT + MENUITEM "&Копіювати\tCtrl+C", IDM_EDITCOPY + MENUITEM "Вс&тавити\tCtrl+V", IDM_EDITPASTE + MENUITEM "Ви&далити виділення\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Обернути виділення", IDM_EDITINVERTSELECTION MENUITEM "Виді&лити все\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Копіювати до файлу...", IDM_EDITCOPYTO - MENUITEM "Вставити з файлу...", IDM_EDITPASTEFROM + MENUITEM "Ко&піювати до файлу...", IDM_EDITCOPYTO + MENUITEM "Вставити з &файлу...", IDM_EDITPASTEFROM END POPUP "В&игляд" BEGIN @@ -78,13 +78,13 @@ BEGIN END POPUP "&Зображення" BEGIN - MENUITEM "Відобразити/повернути...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Обітнути", IDM_IMAGECROP - MENUITEM "Обернути кольори\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Атрибути...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Видалити малюнок\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Непрозоре тло", IDM_IMAGEDRAWOPAQUE + MENUITEM "Відо&бразити/повернути...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Обі&тнути", IDM_IMAGECROP + MENUITEM "&Обернути кольори\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Атрибути...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Ви&далити малюнок\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Не&прозоре тло", IDM_IMAGEDRAWOPAQUE END POPUP "&Кольори" BEGIN @@ -105,18 +105,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Вирізати\tCtrl+X", IDM_EDITCUT + MENUITEM "&Копіювати\tCtrl+C", IDM_EDITCOPY + MENUITEM "Вс&тавити\tCtrl+V", IDM_EDITPASTE + MENUITEM "Ви&далити виділення\tDel", IDM_EDITDELETESELECTION + MENUITEM "Виді&лити все\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Ко&піювати до файлу...", IDM_EDITCOPYTO + MENUITEM "Вставити з &файлу...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Відо&бразити/повернути...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Обернути кольори\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index 3ac1d0790b7..3ec89295bda 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -37,17 +37,17 @@ BEGIN POPUP "&Chỉnh sửa" BEGIN MENUITEM "&Quay về trạng thái trước\tCtrl+Z", IDM_EDITUNDO - MENUITEM "&Quay về trạng thái sau đó\tCtrl+Y", IDM_EDITREDO + MENUITEM "Qua&y về trạng thái sau đó\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR MENUITEM "Cắ&t\tCtrl+X", IDM_EDITCUT MENUITEM "&Sao chép\tCtrl+C", IDM_EDITCOPY MENUITEM "&Dán\tCtrl+V", IDM_EDITPASTE MENUITEM "Xó&a phần đã chọn\tDel", IDM_EDITDELETESELECTION MENUITEM "&Nghịch đảo phần chọn", IDM_EDITINVERTSELECTION - MENUITEM "Chọn &Tất cả\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "C&họn Tất cả\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "S&ao chép đến...", IDM_EDITCOPYTO - MENUITEM "Dán &từ...", IDM_EDITPASTEFROM + MENUITEM "Sa&o chép đến...", IDM_EDITCOPYTO + MENUITEM "Dán t&ừ...", IDM_EDITPASTEFROM END POPUP "&Xem" BEGIN @@ -81,7 +81,7 @@ BEGIN MENUITEM "&Cắt hình ảnh", IDM_IMAGECROP MENUITEM "&Nghịch đảo màu sắc (âm bản)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Thuộc tính...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Xóa hình ảnh\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Xóa hình ảnh\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Vẽ nét mờ", IDM_IMAGEDRAWOPAQUE END POPUP "&Màu sắc" @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Cắ&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Sao chép\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Dán\tCtrl+V", IDM_EDITPASTE + MENUITEM "Xó&a phần đã chọn\tDel", IDM_EDITDELETESELECTION + MENUITEM "C&họn Tất cả\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "S&ao chép đến...", IDM_EDITCOPYTO + MENUITEM "Dán t&ừ...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Xoay/&Lật hình ảnh...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Kéo dãn/Nghiêng...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Nghịch đảo màu sắc (âm bản)\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 490332372c6..5f1f7539de0 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -81,10 +81,10 @@ BEGIN BEGIN MENUITEM "旋转/镜像...(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "拉伸/倾斜...(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "剪裁(&C)", IDM_IMAGECROP + MENUITEM "剪裁(&R)", IDM_IMAGECROP MENUITEM "反色(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "属性(&A)...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "删除图像\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "删除图像(&C)\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "不透明处理(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "颜色(&C)" @@ -106,18 +106,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "剪切(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "复制(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "粘贴(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "删除选中区域(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "全部选择(&A)\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "复制到(&O)...", IDM_EDITCOPYTO + MENUITEM "从...粘贴(&F)", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "旋转/镜像...(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "拉伸/倾斜...(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "反色(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index e76671f10fe..74c82dbb39b 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -79,10 +79,10 @@ BEGIN BEGIN MENUITEM "旋轉／翻轉(&M)...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "拉伸／傾斜(&S)...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "剪裁(&C)", IDM_IMAGECROP + MENUITEM "剪裁(&R)", IDM_IMAGECROP MENUITEM "顏色反轉(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "屬性(&A)...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "刪除圖像\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "刪除圖像(&C)\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "不透明處理(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "顏色(&C)" @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "剪下(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "複製(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "貼上(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "刪除選中區域(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "全選(&A)\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "複製到(&O)...", IDM_EDITCOPYTO + MENUITEM "從...貼上(&F)", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "旋轉／翻轉(&M)...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "拉伸／傾斜(&S)...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "顏色反轉(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 26c7baaf71f..d79105f4696 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -79,10 +79,10 @@ BEGIN BEGIN MENUITEM "旋轉／翻轉(&M)...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "拉伸／傾斜(&S)...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "剪裁(&C)", IDM_IMAGECROP + MENUITEM "剪裁(&R)", IDM_IMAGECROP MENUITEM "顏色反轉(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "屬性(&A)...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "刪除圖像\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "刪除圖像(&C)\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "不透明處理(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "顏色(&C)" @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "剪下(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "複製(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "貼上(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "刪除選中區域(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "全選(&A)\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "複製到(&O)...", IDM_EDITCOPYTO + MENUITEM "從...貼上(&F)", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "旋轉／翻轉(&M)...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "拉伸／傾斜(&S)...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "顏色反轉(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS END END From 738846d4d8e28357dfaff11c4839055fbf475129 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Sun, 10 Sep 2023 22:28:28 +0900 Subject: [PATCH 43/74] [MSPAINT] Use wait cursor (#5660) - Implement CWaitCursor class in newly-added "waitcursor.h". - Use CWaitCursor to manage the wait cursor. - Improve WM_SETCURSOR handlings. CORE-19094 --- base/applications/mspaint/canvas.cpp | 6 +++ base/applications/mspaint/dib.cpp | 16 ++++++ base/applications/mspaint/precomp.h | 1 + base/applications/mspaint/textedit.cpp | 6 +++ base/applications/mspaint/waitcursor.h | 54 +++++++++++++++++++++ base/applications/mspaint/winproc.cpp | 67 ++++++++++++++------------ 6 files changed, 119 insertions(+), 31 deletions(-) create mode 100644 base/applications/mspaint/waitcursor.h diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 3568657a21f..186b88dc044 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -635,6 +635,12 @@ LRESULT CCanvasWindow::OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + if (CWaitCursor::IsWaiting()) + { + bHandled = FALSE; + return 0; + } + POINT pt; ::GetCursorPos(&pt); ScreenToClient(&pt); diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index d0bea3f7b2b..9793ee64a44 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -151,6 +151,8 @@ GetDIBHeight(HBITMAP hBitmap) BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile, REFGUID guidFileType) { + CWaitCursor waitCursor; + CImageDx img; img.Attach(hBitmap); HRESULT hr = img.SaveDx(FileName, guidFileType, g_xDpi, g_yDpi); @@ -250,6 +252,8 @@ HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCWSTR name, LPWIN32_FIND_DATAW pFoun HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) { + CWaitCursor waitCursor; + // find the file WIN32_FIND_DATA find; HANDLE hFind = ::FindFirstFileW(name, &find); @@ -341,6 +345,8 @@ HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight, BOOL bMono) HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical, BOOL bMono) { + CWaitCursor waitCursor; + if (nDegree == 0) return CopyDIBImage(hbm); @@ -402,6 +408,8 @@ struct BITMAPINFODX : BITMAPINFO HGLOBAL BitmapToClipboardDIB(HBITMAP hBitmap) { + CWaitCursor waitCursor; + BITMAP bm; if (!GetObject(hBitmap, sizeof(BITMAP), &bm)) return NULL; @@ -463,6 +471,8 @@ HGLOBAL BitmapToClipboardDIB(HBITMAP hBitmap) HBITMAP BitmapFromClipboardDIB(HGLOBAL hGlobal) { + CWaitCursor waitCursor; + LPBYTE pb = (LPBYTE)GlobalLock(hGlobal); if (!pb) return NULL; @@ -508,6 +518,8 @@ HBITMAP BitmapFromClipboardDIB(HGLOBAL hGlobal) HBITMAP BitmapFromHEMF(HENHMETAFILE hEMF) { + CWaitCursor waitCursor; + ENHMETAHEADER header; if (!GetEnhMetaFileHeader(hEMF, sizeof(header), &header)) return NULL; @@ -529,6 +541,8 @@ HBITMAP BitmapFromHEMF(HENHMETAFILE hEMF) BOOL IsBitmapBlackAndWhite(HBITMAP hbm) { + CWaitCursor waitCursor; + BITMAP bm; if (!::GetObjectW(hbm, sizeof(bm), &bm)) return FALSE; @@ -578,6 +592,8 @@ BOOL IsBitmapBlackAndWhite(HBITMAP hbm) HBITMAP ConvertToBlackAndWhite(HBITMAP hbm) { + CWaitCursor waitCursor; + BITMAP bm; if (!::GetObject(hbm, sizeof(bm), &bm)) return NULL; diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 385cc985a4f..0c1d6b33ba8 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -50,6 +50,7 @@ #include "toolsmodel.h" #include "winproc.h" #include "dialogs.h" +#include "waitcursor.h" #include "globalvar.h" #endif /* _MSPAINT_H */ diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index e5b51aa3de3..376b1214045 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -187,6 +187,12 @@ LRESULT CTextEditWindow::OnNCHitTest(UINT nMsg, WPARAM wParam, LPARAM lParam, BO LRESULT CTextEditWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + if (CWaitCursor::IsWaiting()) + { + bHandled = FALSE; + return 0; + } + UINT nHitTest = LOWORD(lParam); if (nHitTest == HTCAPTION) { diff --git a/base/applications/mspaint/waitcursor.h b/base/applications/mspaint/waitcursor.h new file mode 100644 index 00000000000..20269ed16eb --- /dev/null +++ b/base/applications/mspaint/waitcursor.h @@ -0,0 +1,54 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Wait cursor management + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ + */ + +#pragma once + +class CWaitCursor +{ +public: + CWaitCursor() + { + if (s_nLock++ == 0) + { + if (!s_hWaitCursor) + s_hWaitCursor = ::LoadCursor(NULL, IDC_WAIT); + s_hOldCursor = ::SetCursor(s_hWaitCursor); + } + else + { + ::SetCursor(s_hWaitCursor); + } + } + ~CWaitCursor() + { + if (--s_nLock == 0) + { + ::SetCursor(s_hOldCursor); + s_hOldCursor = NULL; + } + } + CWaitCursor(const CWaitCursor&) = delete; + CWaitCursor& operator=(const CWaitCursor&) = delete; + + static BOOL IsWaiting() + { + return s_nLock > 0; + } + static void KeepWait() + { + ::SetCursor(s_hWaitCursor); + } + +protected: + static LONG s_nLock; + static HCURSOR s_hOldCursor; + static HCURSOR s_hWaitCursor; +}; + +DECLSPEC_SELECTANY LONG CWaitCursor::s_nLock = 0; +DECLSPEC_SELECTANY HCURSOR CWaitCursor::s_hOldCursor = NULL; +DECLSPEC_SELECTANY HCURSOR CWaitCursor::s_hWaitCursor = NULL; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 1763f128ac1..f888cedfd0c 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -912,44 +912,48 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH imageModel.NotifyImageChanged(); break; case IDM_IMAGEROTATEMIRROR: - switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) { - case 1: /* flip horizontally */ - if (selectionModel.m_bShow) - selectionModel.FlipHorizontally(); - else - imageModel.FlipHorizontally(); - break; - case 2: /* flip vertically */ - if (selectionModel.m_bShow) - selectionModel.FlipVertically(); - else - imageModel.FlipVertically(); - break; - case 3: /* rotate 90 degrees */ - if (selectionModel.m_bShow) - selectionModel.RotateNTimes90Degrees(1); - else - imageModel.RotateNTimes90Degrees(1); - break; - case 4: /* rotate 180 degrees */ - if (selectionModel.m_bShow) - selectionModel.RotateNTimes90Degrees(2); - else - imageModel.RotateNTimes90Degrees(2); - break; - case 5: /* rotate 270 degrees */ - if (selectionModel.m_bShow) - selectionModel.RotateNTimes90Degrees(3); - else - imageModel.RotateNTimes90Degrees(3); - break; + CWaitCursor waitCursor; + switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) + { + case 1: /* flip horizontally */ + if (selectionModel.m_bShow) + selectionModel.FlipHorizontally(); + else + imageModel.FlipHorizontally(); + break; + case 2: /* flip vertically */ + if (selectionModel.m_bShow) + selectionModel.FlipVertically(); + else + imageModel.FlipVertically(); + break; + case 3: /* rotate 90 degrees */ + if (selectionModel.m_bShow) + selectionModel.RotateNTimes90Degrees(1); + else + imageModel.RotateNTimes90Degrees(1); + break; + case 4: /* rotate 180 degrees */ + if (selectionModel.m_bShow) + selectionModel.RotateNTimes90Degrees(2); + else + imageModel.RotateNTimes90Degrees(2); + break; + case 5: /* rotate 270 degrees */ + if (selectionModel.m_bShow) + selectionModel.RotateNTimes90Degrees(3); + else + imageModel.RotateNTimes90Degrees(3); + break; + } } break; case IDM_IMAGEATTRIBUTES: { if (attributesDialog.DoModal(mainWindow.m_hWnd)) { + CWaitCursor waitCursor; if (attributesDialog.m_bBlackAndWhite && !imageModel.IsBlackAndWhite()) { CString strText(MAKEINTRESOURCE(IDS_LOSECOLOR)); @@ -973,6 +977,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { if (stretchSkewDialog.DoModal(mainWindow.m_hWnd)) { + CWaitCursor waitCursor; if (selectionModel.m_bShow) { selectionModel.StretchSkew(stretchSkewDialog.percentage.x, stretchSkewDialog.percentage.y, From f45c2e5fcce9683057423c4bf341461a48a47896 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Mon, 11 Sep 2023 07:44:39 +0900 Subject: [PATCH 44/74] [MSPAINT] IDM_IMAGEROTATEMIRROR: Fix indent Follow-up to #5660. CORE-19094 --- base/applications/mspaint/winproc.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index f888cedfd0c..863cf0c93a4 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -917,35 +917,45 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) { case 1: /* flip horizontally */ + { if (selectionModel.m_bShow) selectionModel.FlipHorizontally(); else imageModel.FlipHorizontally(); break; + } case 2: /* flip vertically */ + { if (selectionModel.m_bShow) selectionModel.FlipVertically(); else imageModel.FlipVertically(); break; + } case 3: /* rotate 90 degrees */ + { if (selectionModel.m_bShow) selectionModel.RotateNTimes90Degrees(1); else imageModel.RotateNTimes90Degrees(1); break; + } case 4: /* rotate 180 degrees */ + { if (selectionModel.m_bShow) selectionModel.RotateNTimes90Degrees(2); else imageModel.RotateNTimes90Degrees(2); break; + } case 5: /* rotate 270 degrees */ + { if (selectionModel.m_bShow) selectionModel.RotateNTimes90Degrees(3); else imageModel.RotateNTimes90Degrees(3); break; + } } } break; From 81db5239fa3e23f23e6a7a923f0f5cca3a4716d6 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Tue, 12 Sep 2023 05:39:08 +0900 Subject: [PATCH 45/74] [MSPAINT][SDK] Add (#5680) CORE-19094 --- base/applications/mspaint/precomp.h | 2 +- .../waitcursor.h => sdk/include/reactos/ui/CWaitCursor.h | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) rename base/applications/mspaint/waitcursor.h => sdk/include/reactos/ui/CWaitCursor.h (89%) diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 0c1d6b33ba8..51413a4ed6c 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -50,7 +50,7 @@ #include "toolsmodel.h" #include "winproc.h" #include "dialogs.h" -#include "waitcursor.h" +#include #include "globalvar.h" #endif /* _MSPAINT_H */ diff --git a/base/applications/mspaint/waitcursor.h b/sdk/include/reactos/ui/CWaitCursor.h similarity index 89% rename from base/applications/mspaint/waitcursor.h rename to sdk/include/reactos/ui/CWaitCursor.h index 20269ed16eb..38bc74d614d 100644 --- a/base/applications/mspaint/waitcursor.h +++ b/sdk/include/reactos/ui/CWaitCursor.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: ReactOS headers * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Wait cursor management * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ @@ -31,14 +31,18 @@ class CWaitCursor s_hOldCursor = NULL; } } + CWaitCursor(const CWaitCursor&) = delete; CWaitCursor& operator=(const CWaitCursor&) = delete; + void *operator new(size_t) = delete; + void operator delete(void*) = delete; static BOOL IsWaiting() { return s_nLock > 0; } - static void KeepWait() + + static void Restore() { ::SetCursor(s_hWaitCursor); } From 55b87eb24ea51ec862cbcf8a891153efd92ddb18 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Fri, 22 Sep 2023 07:35:03 +0900 Subject: [PATCH 46/74] [MSPAINT] Don't copy bits on resizing (#5716) - Fix the graphical glitches on resizing and moving toolbars. - Add SWP_NOCOPYBITS flag on positioning controls on resizing of main window. CORE-19137 --- base/applications/mspaint/winproc.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 863cf0c93a4..21f5f50b2ef 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -77,6 +77,7 @@ void CMainWindow::alignChildrenToMainWindow() RECT clientRect, rc; GetClientRect(&clientRect); RECT rcSpace = clientRect; + const UINT uFlags = (SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION | SWP_NOCOPYBITS); if (::IsWindowVisible(g_hStatusBar)) { @@ -93,7 +94,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, toolBoxContainer, NULL, rcSpace.right - CX_TOOLBAR, rcSpace.top, CX_TOOLBAR, rcSpace.bottom - rcSpace.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.right -= CX_TOOLBAR; } else @@ -101,7 +102,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, toolBoxContainer, NULL, rcSpace.left, rcSpace.top, CX_TOOLBAR, rcSpace.bottom - rcSpace.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.left += CX_TOOLBAR; } } @@ -113,7 +114,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, paletteWindow, NULL, rcSpace.left, rcSpace.bottom - CY_PALETTE, rcSpace.right - rcSpace.left, CY_PALETTE, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.bottom -= CY_PALETTE; } else @@ -121,7 +122,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, paletteWindow, NULL, rcSpace.left, rcSpace.top, rcSpace.right - rcSpace.left, CY_PALETTE, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.top += CY_PALETTE; } } @@ -131,7 +132,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, canvasWindow, NULL, rcSpace.left, rcSpace.top, rcSpace.right - rcSpace.left, rcSpace.bottom - rcSpace.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); } ::EndDeferWindowPos(hDWP); From 088a79ac18329be91d19e756f133d8bbb4ed5d09 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Fri, 22 Sep 2023 10:48:13 +0900 Subject: [PATCH 47/74] [MSPAINT] Don't show error message twice (#5715) - Reduce display of error message on IDM_EDITCOPYTO and IDM_EDITPASTEFROM. - Introduce LockBitmap/UnlockBitmap mechanism for ImageModel and SelectionModel. CORE-19181, CORE-19182 --- base/applications/mspaint/history.cpp | 34 ++++++++++++++------ base/applications/mspaint/history.h | 2 ++ base/applications/mspaint/main.cpp | 6 ++-- base/applications/mspaint/selectionmodel.cpp | 12 +++++++ base/applications/mspaint/selectionmodel.h | 2 ++ base/applications/mspaint/winproc.cpp | 18 ++++------- 6 files changed, 50 insertions(+), 24 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 4451b06f927..e44eca7dc4d 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -261,27 +261,41 @@ void ImageModel::Clamp(POINT& pt) const HBITMAP ImageModel::CopyBitmap() { - // NOTE: An app cannot select a bitmap into more than one device context at a time. - ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select - HBITMAP ret = CopyDIBImage(m_hBms[m_currInd]); - m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select + HBITMAP hBitmap = LockBitmap(); + HBITMAP ret = CopyDIBImage(hBitmap); + UnlockBitmap(hBitmap); return ret; } BOOL ImageModel::IsBlackAndWhite() { - ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select - BOOL bBlackAndWhite = IsBitmapBlackAndWhite(m_hBms[m_currInd]); - m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select + HBITMAP hBitmap = LockBitmap(); + BOOL bBlackAndWhite = IsBitmapBlackAndWhite(hBitmap); + UnlockBitmap(hBitmap); return bBlackAndWhite; } void ImageModel::PushBlackAndWhite() { - ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select - HBITMAP hNewBitmap = ConvertToBlackAndWhite(m_hBms[m_currInd]); - m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select + HBITMAP hBitmap = LockBitmap(); + HBITMAP hNewBitmap = ConvertToBlackAndWhite(hBitmap); + UnlockBitmap(hBitmap); if (hNewBitmap) PushImageForUndo(hNewBitmap); } + +HBITMAP ImageModel::LockBitmap() +{ + // NOTE: An app cannot select a bitmap into more than one device context at a time. + ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select + HBITMAP hbmLocked = m_hBms[m_currInd]; + m_hBms[m_currInd] = NULL; + return hbmLocked; +} + +void ImageModel::UnlockBitmap(HBITMAP hbmLocked) +{ + m_hBms[m_currInd] = hbmLocked; + m_hbmOld = ::SelectObject(m_hDrawingDC, hbmLocked); // Re-select +} diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 768114aa9e8..12b5056bdce 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -31,6 +31,8 @@ class ImageModel int GetWidth() const; int GetHeight() const; HBITMAP CopyBitmap(); + HBITMAP LockBitmap(); + void UnlockBitmap(HBITMAP hbmLocked); void InvertColors(); void FlipHorizontally(); void FlipVertically(); diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index bcd7e42b0e5..bc72dd35a3b 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -117,9 +117,9 @@ BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName) strFileTitle += L".png"; // Save it to the temporary file - HBITMAP hbm = imageModel.CopyBitmap(); - BOOL ret = SaveDIBToFile(hbm, g_szMailTempFile, FALSE, Gdiplus::ImageFormatPNG); - ::DeleteObject(hbm); + HBITMAP hbmLocked = imageModel.LockBitmap(); + BOOL ret = SaveDIBToFile(hbmLocked, g_szMailTempFile, FALSE, Gdiplus::ImageFormatPNG); + imageModel.UnlockBitmap(hbmLocked); if (!ret) { g_szMailTempFile[0] = UNICODE_NULL; diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 843979f05bd..ec0817d24ec 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -528,3 +528,15 @@ void SelectionModel::SwapWidthAndHeight() m_rc.right = m_rc.left + cy; m_rc.bottom = m_rc.top + cx; } + +HBITMAP SelectionModel::LockBitmap() +{ + HBITMAP hbm = m_hbmColor; + m_hbmColor = NULL; + return hbm; +} + +void SelectionModel::UnlockBitmap(HBITMAP hbmLocked) +{ + m_hbmColor = hbmLocked; +} diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index 6585088f1c1..eb8d6210ac7 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -40,6 +40,8 @@ class SelectionModel void DeleteSelection(); HBITMAP CopyBitmap(); + HBITMAP LockBitmap(); + void UnlockBitmap(HBITMAP hbmLocked); void GetSelectionContents(HDC hDCImage); void DrawFramePoly(HDC hDCImage); void DrawBackground(HDC hDCImage); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 21f5f50b2ef..b4072db6aaf 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -742,13 +742,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH selectionModel.TakeOff(); { - HBITMAP hbm = selectionModel.CopyBitmap(); - if (hbm) + HBITMAP hbmLocked = selectionModel.LockBitmap(); + if (hbmLocked) { - HGLOBAL hGlobal = BitmapToClipboardDIB(hbm); + HGLOBAL hGlobal = BitmapToClipboardDIB(hbmLocked); if (hGlobal) ::SetClipboardData(CF_DIB, hGlobal); - ::DeleteObject(hbm); + selectionModel.UnlockBitmap(hbmLocked); } } @@ -866,10 +866,9 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH WCHAR szFileName[MAX_LONG_PATH] = L"*.png"; if (GetSaveFileName(szFileName, _countof(szFileName))) { - HBITMAP hbm = selectionModel.CopyBitmap(); - if (!SaveDIBToFile(hbm, szFileName, FALSE)) - ShowError(IDS_SAVEERROR, szFileName); - ::DeleteObject(hbm); + HBITMAP hbmLocked = selectionModel.LockBitmap(); + SaveDIBToFile(hbmLocked, szFileName, FALSE); + selectionModel.UnlockBitmap(hbmLocked); } break; } @@ -881,8 +880,6 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH HBITMAP hbmNew = DoLoadImageFile(m_hWnd, szFileName, FALSE); if (hbmNew) InsertSelectionFromHBITMAP(hbmNew, m_hWnd); - else - ShowError(IDS_LOADERRORTEXT, szFileName); } break; } @@ -1009,7 +1006,6 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH imageModel.PushImageForUndo(selectionModel.CopyBitmap()); selectionModel.HideSelection(); break; - case IDM_VIEWTOOLBOX: registrySettings.ShowToolBox = !toolBoxContainer.IsWindowVisible(); toolBoxContainer.ShowWindow(registrySettings.ShowToolBox ? SW_SHOWNOACTIVATE : SW_HIDE); From 2d1b2632217273150f708258988f0d3f7a6e74e5 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Sat, 23 Sep 2023 09:26:11 +0900 Subject: [PATCH 48/74] [MSPAINT] Introduce Ctrl+Plus / Ctrl+Minus (#5717) - Add Ctrl+Plus and Ctrl+Minus accelerators. - Add IDM_CTRL_PLUS and IDM_CTRL_MINUS commands. - Stretch the selection area on IDM_CTRL_PLUS and IDM_CTRL_MINUS actions. CORE-19094 --- base/applications/mspaint/canvas.cpp | 4 +- base/applications/mspaint/lang/bg-BG.rc | 4 ++ base/applications/mspaint/lang/cs-CZ.rc | 4 ++ base/applications/mspaint/lang/de-DE.rc | 4 ++ base/applications/mspaint/lang/en-GB.rc | 4 ++ base/applications/mspaint/lang/en-US.rc | 4 ++ base/applications/mspaint/lang/es-ES.rc | 4 ++ base/applications/mspaint/lang/et-EE.rc | 4 ++ base/applications/mspaint/lang/eu-ES.rc | 4 ++ base/applications/mspaint/lang/fr-FR.rc | 4 ++ base/applications/mspaint/lang/he-IL.rc | 4 ++ base/applications/mspaint/lang/hu-HU.rc | 4 ++ base/applications/mspaint/lang/id-ID.rc | 4 ++ base/applications/mspaint/lang/it-IT.rc | 4 ++ base/applications/mspaint/lang/ja-JP.rc | 4 ++ base/applications/mspaint/lang/nl-NL.rc | 4 ++ base/applications/mspaint/lang/no-NO.rc | 4 ++ base/applications/mspaint/lang/pl-PL.rc | 4 ++ base/applications/mspaint/lang/pt-BR.rc | 4 ++ base/applications/mspaint/lang/pt-PT.rc | 4 ++ base/applications/mspaint/lang/ro-RO.rc | 4 ++ base/applications/mspaint/lang/ru-RU.rc | 4 ++ base/applications/mspaint/lang/sk-SK.rc | 4 ++ base/applications/mspaint/lang/sq-AL.rc | 4 ++ base/applications/mspaint/lang/sv-SE.rc | 4 ++ base/applications/mspaint/lang/tr-TR.rc | 4 ++ base/applications/mspaint/lang/uk-UA.rc | 4 ++ base/applications/mspaint/lang/vi-VN.rc | 4 ++ base/applications/mspaint/lang/zh-CN.rc | 4 ++ base/applications/mspaint/lang/zh-HK.rc | 4 ++ base/applications/mspaint/lang/zh-TW.rc | 4 ++ base/applications/mspaint/mouse.cpp | 10 ++++ base/applications/mspaint/resource.h | 3 ++ base/applications/mspaint/selectionmodel.cpp | 48 ++++++++++++++++---- base/applications/mspaint/selectionmodel.h | 6 ++- base/applications/mspaint/toolsmodel.cpp | 5 ++ base/applications/mspaint/toolsmodel.h | 4 ++ base/applications/mspaint/winproc.cpp | 7 +++ 38 files changed, 193 insertions(+), 14 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 186b88dc044..a403c8bd456 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -750,8 +750,8 @@ LRESULT CCanvasWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH VOID CCanvasWindow::cancelDrawing() { - selectionModel.ClearColor(); - selectionModel.ClearMask(); + selectionModel.ClearColorImage(); + selectionModel.ClearMaskImage(); m_hitSelection = HIT_NONE; m_drawing = FALSE; toolsModel.OnCancelDraw(); diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index c12e35b6c8f..99a58a4e7dd 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index b08cf04b616..95a1ccd214b 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 02198b8feab..9bd6f5f4659 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -139,6 +139,10 @@ BEGIN "^U", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index 172591e663c..3fac271a16f 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 5e2a61a67c9..657d2f0d1df 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 3a4dbcaa98e..fc0dc317f25 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -142,6 +142,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index c95f246d9fd..916b07d715c 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index d7f2664ba4d..da0995761fc 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 98c9f2c0190..bf9ff02aed0 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index d725a2b1193..f91400ed00a 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index 68235d94782..a36e37472fe 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 907731a2168..886e9900a76 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 2d36efa32eb..1882ea97532 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index ce58149c3a4..e78ca07f8df 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -141,6 +141,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 556a8bb1a78..b8f706e7dd7 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 186db5cb4dc..c0d2acb0761 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index fdad831e316..1707fa0b251 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -142,6 +142,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index 846fbcf023d..b37e0f517a3 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index c4f226537a0..1fae0b88f9c 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 51e278720e6..93581727a4a 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -141,6 +141,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 05bfa15efc9..964453968e6 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -143,6 +143,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index da902a67b84..ecd5d49bc25 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index 05e49622c36..70c64d99dad 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index 4b750a67126..a046aac5276 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index fc7ad3858a8..dd79bd24c4f 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index 9ca30e696ad..647679c6a5c 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -141,6 +141,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index 3ec89295bda..87280814bb3 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 5f1f7539de0..ee9e02562ab 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -142,6 +142,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index 74c82dbb39b..6c4681475cd 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index d79105f4696..21ba5ed365f 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index f6cb9e2ac22..f896ccd84f3 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -199,6 +199,11 @@ struct FreeSelTool : ToolBase selectionModel.HideSelection(); ToolBase::OnCancelDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + selectionModel.StretchSelection(bMinus); + } }; // TOOL_RECTSEL @@ -280,6 +285,11 @@ struct RectSelTool : ToolBase selectionModel.HideSelection(); ToolBase::OnCancelDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + selectionModel.StretchSelection(bMinus); + } }; struct TwoPointDrawTool : ToolBase diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index 310554de200..b41486cee4d 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -102,6 +102,9 @@ #define IDM_UNDERLINE 282 #define IDM_VERTICAL 283 +#define IDM_CTRL_PLUS 290 +#define IDM_CTRL_MINUS 291 + /* the following 16 numbers need to be in order, increasing by 1 */ #define ID_FREESEL 600 #define ID_RECTSEL 601 diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index ec0817d24ec..313c516f46d 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -28,8 +28,8 @@ SelectionModel::SelectionModel() SelectionModel::~SelectionModel() { - ClearColor(); - ClearMask(); + ClearColorImage(); + ClearMaskImage(); ResetPtStack(); } @@ -85,7 +85,7 @@ void SelectionModel::BuildMaskFromPtStack() m_rc = m_rcOld = rc; - ClearMask(); + ClearMaskImage(); ShiftPtStack(-m_rcOld.left, -m_rcOld.top); @@ -154,7 +154,7 @@ void SelectionModel::DrawSelection(HDC hDCImage, COLORREF crBg, BOOL bBgTranspar void SelectionModel::GetSelectionContents(HDC hDCImage) { - ClearColor(); + ClearColorImage(); HDC hMemDC = ::CreateCompatibleDC(NULL); m_hbmColor = CreateColorDIB(m_rc.Width(), m_rc.Height(), RGB(255, 255, 255)); @@ -174,12 +174,17 @@ BOOL SelectionModel::TakeOff() if (!IsLanded() || ::IsRectEmpty(&m_rc)) return FALSE; + // The background color is needed for transparency of selection m_rgbBack = paletteModel.GetBgColor(); + + // Get the contents of the selection area GetSelectionContents(imageModel.GetDC()); + // RectSel doesn't need the mask image if (toolsModel.GetActiveTool() == TOOL_RECTSEL) - ClearMask(); + ClearMaskImage(); + // Save the selection area m_rcOld = m_rc; imageModel.NotifyImageChanged(); @@ -225,7 +230,7 @@ void SelectionModel::InsertFromHBITMAP(HBITMAP hbmColor, INT x, INT y, HBITMAP h } else { - ClearMask(); + ClearMaskImage(); } NotifyContentChanged(); @@ -458,7 +463,7 @@ void SelectionModel::Dragging(HITTEST hit, POINT pt) m_ptHit = pt; } -void SelectionModel::ClearMask() +void SelectionModel::ClearMaskImage() { if (m_hbmMask) { @@ -467,7 +472,7 @@ void SelectionModel::ClearMask() } } -void SelectionModel::ClearColor() +void SelectionModel::ClearColorImage() { if (m_hbmColor) { @@ -479,8 +484,8 @@ void SelectionModel::ClearColor() void SelectionModel::HideSelection() { m_bShow = m_bContentChanged = FALSE; - ClearColor(); - ClearMask(); + ClearColorImage(); + ClearMaskImage(); ::SetRectEmpty(&m_rc); ::SetRectEmpty(&m_rcOld); imageModel.NotifyImageChanged(); @@ -540,3 +545,26 @@ void SelectionModel::UnlockBitmap(HBITMAP hbmLocked) { m_hbmColor = hbmLocked; } + +void SelectionModel::StretchSelection(BOOL bShrink) +{ + if (!m_bShow) + return; + + TakeOff(); + + INT cx = m_rc.Width(), cy = m_rc.Height(); + + if (bShrink) + m_rc.InflateRect(-cx / 4, -cy / 4); + else + m_rc.InflateRect(+cx / 2, +cy / 2); + + // The selection area must exist there + if (m_rc.Width() <= 0) + m_rc.right = m_rc.left + 1; + if (m_rc.Height() <= 0) + m_rc.bottom = m_rc.top + 1; + + imageModel.NotifyImageChanged(); +} diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index eb8d6210ac7..662b2bdd19a 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -58,10 +58,12 @@ class SelectionModel void InvertSelection(); void Dragging(HITTEST hit, POINT pt); - void ClearMask(); - void ClearColor(); + void ClearMaskImage(); + void ClearColorImage(); void NotifyContentChanged(); + void StretchSelection(BOOL bShrink); + private: SelectionModel(const SelectionModel&); SelectionModel& operator=(const SelectionModel&); diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 604d4bead54..b9a5ac2e4b6 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -248,3 +248,8 @@ void ToolsModel::selectAll() OnMouseMove(TRUE, imageModel.GetWidth(), imageModel.GetHeight()); OnButtonUp(TRUE, imageModel.GetWidth(), imageModel.GetHeight()); } + +void ToolsModel::SpecialTweak(BOOL bMinus) +{ + m_pToolObject->OnSpecialTweak(bMinus); +} diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index a00e8682a5f..33335c07ffd 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -51,6 +51,8 @@ struct ToolBase virtual void OnDrawOverlayOnImage(HDC hdc) { } virtual void OnDrawOverlayOnCanvas(HDC hdc) { } + virtual void OnSpecialTweak(BOOL bMinus) { } + void beginEvent(); void endEvent(); void reset(); @@ -115,6 +117,8 @@ class ToolsModel void NotifyToolChanged(); void NotifyToolSettingsChanged(); void NotifyZoomChanged(); + + void SpecialTweak(BOOL bMinus); }; extern ToolsModel toolsModel; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index b4072db6aaf..2160d841ad1 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -1070,6 +1070,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH fullscreenWindow.DoCreate(); fullscreenWindow.ShowWindow(SW_SHOWMAXIMIZED); break; + + case IDM_CTRL_PLUS: + toolsModel.SpecialTweak(FALSE); + break; + case IDM_CTRL_MINUS: + toolsModel.SpecialTweak(TRUE); + break; } return 0; } From 452c192d26ca81c01d96f9b78257d1cf463b762e Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Tue, 26 Sep 2023 22:47:23 +0900 Subject: [PATCH 49/74] [MSPAINT] Restrict drawing direction on Shift key (#5726) - While holding down the Shift key, drawing lines with the pen/brush is limited to either of 8 directions (horizontal/vertical/diagonal). - s/abs/labs/ CORE-19094 --- base/applications/mspaint/common.h | 5 +- base/applications/mspaint/dib.cpp | 5 - base/applications/mspaint/drawing.cpp | 6 +- base/applications/mspaint/mouse.cpp | 215 ++++++++++++++++++----- base/applications/mspaint/precomp.h | 2 + base/applications/mspaint/toolsmodel.cpp | 17 +- base/applications/mspaint/toolsmodel.h | 4 +- 7 files changed, 189 insertions(+), 65 deletions(-) diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index ee103d74911..d2e862b0114 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -45,6 +45,7 @@ enum HITTEST // hit BOOL zoomTo(int newZoom, int mouseX, int mouseY); BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1); -void updateStartAndLast(LONG x, LONG y); -void updateLast(LONG x, LONG y); BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName); + +#define DEG2RAD(degree) (((degree) * M_PI) / 180) +#define RAD2DEG(radian) ((LONG)(((radian) * 180) / M_PI)) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 9793ee64a44..4e04b9abc90 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -6,7 +6,6 @@ */ #include "precomp.h" -#include INT g_fileSize = 0; float g_xDpi = 96; @@ -339,10 +338,6 @@ HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight, BOOL bMono) return hbm2; } -#ifndef M_PI - #define M_PI 3.14159265 -#endif - HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical, BOOL bMono) { CWaitCursor waitCursor; diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index dc5e8c433c0..638e78396e2 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -115,7 +115,7 @@ Fill(HDC hdc, LONG x, LONG y, COLORREF color) void Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius) { - LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + LONG b = max(1, max(labs(x2 - x1), labs(y2 - y1))); HBRUSH hbr = ::CreateSolidBrush(color); for (LONG a = 0; a <= b; a++) @@ -132,7 +132,7 @@ Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius) void Replace(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LONG radius) { - LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + LONG b = max(1, max(labs(x2 - x1), labs(y2 - y1))); for (LONG a = 0; a <= b; a++) { @@ -169,7 +169,7 @@ Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style) HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, color)); HBRUSH oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(color)); LONG a, b; - b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + b = max(1, max(labs(x2 - x1), labs(y2 - y1))); switch (style) { case 0: diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index f896ccd84f3..d8e3585c252 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -18,28 +18,28 @@ POINT ToolBase::s_pointStack[256] = { { 0 } }; void regularize(LONG x0, LONG y0, LONG& x1, LONG& y1) { - if (abs(x1 - x0) >= abs(y1 - y0)) - y1 = y0 + (y1 > y0 ? abs(x1 - x0) : -abs(x1 - x0)); + if (labs(x1 - x0) >= labs(y1 - y0)) + y1 = y0 + (y1 > y0 ? labs(x1 - x0) : -labs(x1 - x0)); else - x1 = x0 + (x1 > x0 ? abs(y1 - y0) : -abs(y1 - y0)); + x1 = x0 + (x1 > x0 ? labs(y1 - y0) : -labs(y1 - y0)); } void roundTo8Directions(LONG x0, LONG y0, LONG& x1, LONG& y1) { - if (abs(x1 - x0) >= abs(y1 - y0)) + if (labs(x1 - x0) >= labs(y1 - y0)) { - if (abs(y1 - y0) * 5 < abs(x1 - x0) * 2) + if (labs(y1 - y0) * 5 < labs(x1 - x0) * 2) y1 = y0; else - y1 = y0 + (y1 > y0 ? abs(x1 - x0) : -abs(x1 - x0)); + y1 = y0 + (y1 > y0 ? labs(x1 - x0) : -labs(x1 - x0)); } else { - if (abs(x1 - x0) * 5 < abs(y1 - y0) * 2) + if (labs(x1 - x0) * 5 < labs(y1 - y0) * 2) x1 = x0; else - x1 = x0 + (x1 > x0 ? abs(y1 - y0) : -abs(y1 - y0)); + x1 = x0 + (x1 > x0 ? labs(y1 - y0) : -labs(y1 - y0)); } } @@ -50,18 +50,6 @@ BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1) return (abs(x1 - x0) <= cxThreshold) && (abs(y1 - y0) <= cyThreshold); } -void updateStartAndLast(LONG x, LONG y) -{ - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; -} - -void updateLast(LONG x, LONG y) -{ - g_ptEnd.x = x; - g_ptEnd.y = y; -} - void ToolBase::reset() { s_pointSP = 0; @@ -153,7 +141,7 @@ struct FreeSelTool : ToolBase m_bLeftButton = bLeftButton; } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { if (bLeftButton) { @@ -162,9 +150,10 @@ struct FreeSelTool : ToolBase selectionModel.PushToPtStack(pt); imageModel.NotifyImageChanged(); } + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { if (bLeftButton) { @@ -186,6 +175,7 @@ struct FreeSelTool : ToolBase canvasWindow.ClientToScreen(&pt); mainWindow.TrackPopupMenu(pt, 0); } + return TRUE; } void OnFinishDraw() override @@ -246,7 +236,7 @@ struct RectSelTool : ToolBase m_bLeftButton = bLeftButton; } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { if (bLeftButton) { @@ -255,9 +245,10 @@ struct RectSelTool : ToolBase selectionModel.SetRectFromPoints(g_ptStart, pt); imageModel.NotifyImageChanged(); } + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { POINT pt = { x, y }; if (bLeftButton) @@ -272,6 +263,7 @@ struct RectSelTool : ToolBase canvasWindow.ClientToScreen(&pt); mainWindow.TrackPopupMenu(pt, 0); } + return TRUE; } void OnFinishDraw() override @@ -305,26 +297,22 @@ struct TwoPointDrawTool : ToolBase { m_bLeftButton = bLeftButton; m_bDrawing = TRUE; - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { - g_ptEnd.x = x; - g_ptEnd.y = y; imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { - g_ptEnd.x = x; - g_ptEnd.y = y; imageModel.PushImageForUndo(); OnDrawOverlayOnImage(m_hdc); m_bDrawing = FALSE; imageModel.NotifyImageChanged(); + return TRUE; } void OnFinishDraw() override @@ -340,8 +328,101 @@ struct TwoPointDrawTool : ToolBase } }; +typedef enum DIRECTION +{ + NO_DIRECTION = -1, + DIRECTION_HORIZONTAL, + DIRECTION_VERTICAL, + DIRECTION_DIAGONAL_RIGHT_DOWN, + DIRECTION_DIAGONAL_RIGHT_UP, +} DIRECTION; + +#define THRESHOULD_DEG 15 + +static DIRECTION +GetDirection(LONG x0, LONG y0, LONG x1, LONG y1) +{ + LONG dx = x1 - x0, dy = y1 - y0; + + if (labs(dx) <= 8 && labs(dy) <= 8) + return NO_DIRECTION; + + double radian = atan2((double)dy, (double)dx); + if (radian < DEG2RAD(-180 + THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_HORIZONTAL; + } + if (radian < DEG2RAD(-90 - THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_DOWN: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_DOWN; + } + if (radian < DEG2RAD(-90 + THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_VERTICAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_VERTICAL; + } + if (radian < DEG2RAD(-THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_UP: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_UP; + } + if (radian < DEG2RAD(+THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_HORIZONTAL; + } + if (radian < DEG2RAD(+90 - THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_DOWN: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_DOWN; + } + if (radian < DEG2RAD(+90 + THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_VERTICAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_VERTICAL; + } + if (radian < DEG2RAD(+180 - THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_UP: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_UP; + } + ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_HORIZONTAL; +} + +static void +RestrictDrawDirection(DIRECTION dir, LONG x0, LONG y0, LONG& x1, LONG& y1) +{ + switch (dir) + { + case NO_DIRECTION: + default: + return; + + case DIRECTION_HORIZONTAL: + y1 = y0; + break; + + case DIRECTION_VERTICAL: + x1 = x0; + break; + + case DIRECTION_DIAGONAL_RIGHT_DOWN: + y1 = y0 + (x1 - x0); + break; + + case DIRECTION_DIAGONAL_RIGHT_UP: + x1 = x0 - (y1 - y0); + break; + } +} + struct SmoothDrawTool : ToolBase { + DIRECTION m_direction = NO_DIRECTION; + SmoothDrawTool(TOOLTYPE type) : ToolBase(type) { } @@ -350,22 +431,51 @@ struct SmoothDrawTool : ToolBase void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { + m_direction = NO_DIRECTION; imageModel.PushImageForUndo(); - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { + if (::GetKeyState(VK_SHIFT) < 0) // Shift key is pressed + { + if (m_direction == NO_DIRECTION) + { + m_direction = GetDirection(g_ptStart.x, g_ptStart.y, x, y); + if (m_direction == NO_DIRECTION) + return FALSE; + } + + RestrictDrawDirection(m_direction, g_ptStart.x, g_ptStart.y, x, y); + } + else + { + if (m_direction != NO_DIRECTION) + { + m_direction = NO_DIRECTION; + draw(bLeftButton, x, y); + g_ptStart.x = g_ptEnd.x = x; + g_ptStart.y = g_ptEnd.y = y; + return TRUE; + } + } + draw(bLeftButton, x, y); imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { + if (m_direction != NO_DIRECTION) + { + RestrictDrawDirection(m_direction, g_ptStart.x, g_ptStart.y, x, y); + } + draw(bLeftButton, x, y); OnFinishDraw(); + return TRUE; } void OnFinishDraw() override @@ -375,7 +485,8 @@ struct SmoothDrawTool : ToolBase void OnCancelDraw() override { - OnButtonUp(FALSE, 0, 0); + LONG x = 0, y = 0; + OnButtonUp(FALSE, x, y); imageModel.Undo(TRUE); ToolBase::OnCancelDraw(); } @@ -435,15 +546,17 @@ struct ColorTool : ToolBase paletteModel.SetBgColor(rgbColor); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { fetchColor(bLeftButton, x, y); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { fetchColor(bLeftButton, x, y); toolsModel.SetActiveTool(toolsModel.GetOldActiveTool()); + return TRUE; } }; @@ -550,9 +663,10 @@ struct TextTool : ToolBase UpdatePoint(x, y); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { UpdatePoint(x, y); + return TRUE; } void draw(HDC hdc) @@ -578,7 +692,7 @@ struct TextTool : ToolBase selectionModel.HideSelection(); } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { POINT pt = { x, y }; imageModel.Clamp(pt); @@ -595,7 +709,7 @@ struct TextTool : ToolBase if (::IsRectEmpty(&selectionModel.m_rc)) { quit(); - return; + return TRUE; } } @@ -630,6 +744,7 @@ struct TextTool : ToolBase textEditWindow.ValidateEditRect(&rc); textEditWindow.ShowWindow(SW_SHOWNOACTIVATE); textEditWindow.SetFocus(); + return TRUE; } void OnFinishDraw() override @@ -720,23 +835,25 @@ struct BezierTool : ToolBase imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { s_pointStack[s_pointSP].x = x; s_pointStack[s_pointSP].y = y; imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { s_pointStack[s_pointSP].x = x; s_pointStack[s_pointSP].y = y; if (s_pointSP >= 3) { OnFinishDraw(); - return; + return TRUE; } imageModel.NotifyImageChanged(); + return TRUE; } void OnCancelDraw() override @@ -822,7 +939,7 @@ struct ShapeTool : ToolBase imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); @@ -831,9 +948,10 @@ struct ShapeTool : ToolBase s_pointStack[s_pointSP].y = y; imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); @@ -842,7 +960,7 @@ struct ShapeTool : ToolBase if (nearlyEqualPoints(x, y, s_pointStack[0].x, s_pointStack[0].y)) { OnFinishDraw(); - return; + return TRUE; } else { @@ -855,6 +973,7 @@ struct ShapeTool : ToolBase s_pointSP--; imageModel.NotifyImageChanged(); + return TRUE; } void OnCancelDraw() override diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 51413a4ed6c..09775b0cb72 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -21,6 +21,8 @@ #include #include #include +#define _USE_MATH_DEFINES /* for M_PI */ +#include #include #include #include "atlimagedx.h" diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index b9a5ac2e4b6..b787e6d591e 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -189,24 +189,31 @@ void ToolsModel::NotifyZoomChanged() void ToolsModel::OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { m_pToolObject->beginEvent(); - updateStartAndLast(x, y); m_pToolObject->OnButtonDown(bLeftButton, x, y, bDoubleClick); + g_ptStart.x = g_ptEnd.x = x; + g_ptStart.y = g_ptEnd.y = y; m_pToolObject->endEvent(); } void ToolsModel::OnMouseMove(BOOL bLeftButton, LONG x, LONG y) { m_pToolObject->beginEvent(); - m_pToolObject->OnMouseMove(bLeftButton, x, y); - updateLast(x, y); + if (m_pToolObject->OnMouseMove(bLeftButton, x, y)) + { + g_ptEnd.x = x; + g_ptEnd.y = y; + } m_pToolObject->endEvent(); } void ToolsModel::OnButtonUp(BOOL bLeftButton, LONG x, LONG y) { m_pToolObject->beginEvent(); - m_pToolObject->OnButtonUp(bLeftButton, x, y); - updateLast(x, y); + if (m_pToolObject->OnButtonUp(bLeftButton, x, y)) + { + g_ptEnd.x = x; + g_ptEnd.y = y; + } m_pToolObject->endEvent(); } diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index 33335c07ffd..09f48672a01 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -42,8 +42,8 @@ struct ToolBase virtual ~ToolBase() { } virtual void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { } - virtual void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) { } - virtual void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) { } + virtual BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) { return TRUE; } + virtual BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) { return TRUE; } virtual void OnCancelDraw(); virtual void OnFinishDraw(); From 345c7b6c2ca2a84f98637805a4bdbee5e6ae0857 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Thu, 28 Sep 2023 07:34:25 +0900 Subject: [PATCH 50/74] [MSPAINT] "Selection Clone" and "Selection Brush" (#5734) - Stamp the image of the selection when the user clicks on the selection while holding down the Ctrl key. - Draw the image of the selection continuously when the user starts dragging the selection while holding down the Shift key. CORE-19094 --- base/applications/mspaint/canvas.cpp | 15 +++++++++++++++ base/applications/mspaint/history.cpp | 13 +++++++++++++ base/applications/mspaint/history.h | 1 + base/applications/mspaint/mouse.cpp | 6 ------ base/applications/mspaint/selectionmodel.cpp | 11 +++++++++++ base/applications/mspaint/selectionmodel.h | 1 + base/applications/mspaint/winproc.cpp | 10 ++++++++++ 7 files changed, 51 insertions(+), 6 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index a403c8bd456..d62779f39a6 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -268,9 +268,18 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam HITTEST hitSelection = SelectionHitTest(pt); if (hitSelection != HIT_NONE) { + selectionModel.m_nSelectionBrush = 0; // Selection Brush is OFF if (bLeftButton) { CanvasToImage(pt); + if (::GetKeyState(VK_CONTROL) < 0) // Ctrl+Click is Selection Clone + { + imageModel.SelectionClone(); + } + else if (::GetKeyState(VK_SHIFT) < 0) // Shift+Dragging is Selection Brush + { + selectionModel.m_nSelectionBrush = 1; // Selection Brush is ON + } StartSelectionDrag(hitSelection, pt); } else @@ -790,6 +799,12 @@ VOID CCanvasWindow::StartSelectionDrag(HITTEST hit, POINT ptImage) VOID CCanvasWindow::SelectionDragging(POINT ptImage) { + if (selectionModel.m_nSelectionBrush) + { + imageModel.SelectionClone(selectionModel.m_nSelectionBrush == 1); + selectionModel.m_nSelectionBrush = 2; // Selection Brush is ON and drawn + } + selectionModel.Dragging(m_hitSelection, ptImage); Invalidate(FALSE); } diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index e44eca7dc4d..9e924b9e3db 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -299,3 +299,16 @@ void ImageModel::UnlockBitmap(HBITMAP hbmLocked) m_hBms[m_currInd] = hbmLocked; m_hbmOld = ::SelectObject(m_hDrawingDC, hbmLocked); // Re-select } + +void ImageModel::SelectionClone(BOOL bUndoable) +{ + if (!selectionModel.m_bShow || ::IsRectEmpty(&selectionModel.m_rc)) + return; + + if (bUndoable) + PushImageForUndo(CopyBitmap()); + + selectionModel.DrawSelection(m_hDrawingDC, paletteModel.GetBgColor(), + toolsModel.IsBackgroundTransparent()); + NotifyImageChanged(); +} diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 12b5056bdce..efacd91e167 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -41,6 +41,7 @@ class ImageModel void NotifyImageChanged(); BOOL IsBlackAndWhite(); void PushBlackAndWhite(); + void SelectionClone(BOOL bUndoable = TRUE); protected: HDC m_hDrawingDC; // The device context for this class diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index d8e3585c252..70247293361 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -112,10 +112,7 @@ struct FreeSelTool : ToolBase void OnDrawOverlayOnImage(HDC hdc) override { if (!selectionModel.IsLanded()) - { - selectionModel.DrawBackgroundPoly(hdc, selectionModel.m_rgbBack); selectionModel.DrawSelection(hdc, paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); - } if (canvasWindow.m_drawing) { @@ -208,10 +205,7 @@ struct RectSelTool : ToolBase void OnDrawOverlayOnImage(HDC hdc) override { if (!selectionModel.IsLanded()) - { - selectionModel.DrawBackgroundRect(hdc, selectionModel.m_rgbBack); selectionModel.DrawSelection(hdc, paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); - } if (canvasWindow.m_drawing) { diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 313c516f46d..5657f824ed2 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -187,6 +187,17 @@ BOOL SelectionModel::TakeOff() // Save the selection area m_rcOld = m_rc; + if (toolsModel.GetActiveTool() == TOOL_RECTSEL) + { + imageModel.PushImageForUndo(); + selectionModel.DrawBackgroundRect(imageModel.GetDC(), selectionModel.m_rgbBack); + } + else if (toolsModel.GetActiveTool() == TOOL_FREESEL) + { + imageModel.PushImageForUndo(); + selectionModel.DrawBackgroundPoly(imageModel.GetDC(), selectionModel.m_rgbBack); + } + imageModel.NotifyImageChanged(); return TRUE; } diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index 662b2bdd19a..7e927564758 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -23,6 +23,7 @@ class SelectionModel CRect m_rc; // in image pixel coordinates POINT m_ptHit; // in image pixel coordinates CRect m_rcOld; // in image pixel coordinates + INT m_nSelectionBrush = 0; SelectionModel(); ~SelectionModel(); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 2160d841ad1..643d0aedb61 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -705,6 +705,16 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH if (toolsModel.IsSelection()) { canvasWindow.cancelDrawing(); + if (toolsModel.GetActiveTool() == TOOL_FREESEL || + toolsModel.GetActiveTool() == TOOL_RECTSEL) + { + imageModel.Undo(); + if (selectionModel.m_nSelectionBrush == 2) // Selection Brush is drawn + { + imageModel.Undo(); + selectionModel.m_nSelectionBrush = 0; + } + } break; } } From 22b633bd401240e54d7b4d17bf0ae675e03bad4e Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Thu, 28 Sep 2023 16:32:36 +0900 Subject: [PATCH 51/74] [MSPAINT] Larger/smaller pen nib on Ctrl+Plus/Minus (#5738) - Introduce the concept of pen width (not line width) to the tools model. - Enable changing pen/line width by Ctrl+Plus/Minus key combination in TOOL_PEN, TOOL_LINE, TOOL_BEZIER, TOOL_RECT, TOOL_SHAPE, TOO_ELLIPSE, and TOOL_RRECT tools. CORE-19094 --- base/applications/mspaint/drawing.cpp | 1 + base/applications/mspaint/mouse.cpp | 34 ++++++++++++---- base/applications/mspaint/toolbox.cpp | 17 ++++---- base/applications/mspaint/toolbox.h | 4 -- base/applications/mspaint/toolsmodel.cpp | 52 +++++++++++++++++++++--- base/applications/mspaint/toolsmodel.h | 8 ++++ 6 files changed, 89 insertions(+), 27 deletions(-) diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index 638e78396e2..96064fff229 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -17,6 +17,7 @@ Line(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, int thickness) HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, thickness, color)); MoveToEx(hdc, x1, y1, NULL); LineTo(hdc, x2, y2); + SetPixelV(hdc, x2, y2, color); DeleteObject(SelectObject(hdc, oldPen)); } diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 70247293361..04e749db88b 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -320,6 +320,11 @@ struct TwoPointDrawTool : ToolBase m_bDrawing = FALSE; ToolBase::OnCancelDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeLineThickerOrThinner(bMinus); + } }; typedef enum DIRECTION @@ -499,8 +504,6 @@ struct RubberTool : SmoothDrawTool Erase(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, m_bg, toolsModel.GetRubberRadius()); else Replace(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, m_fg, m_bg, toolsModel.GetRubberRadius()); - g_ptEnd.x = x; - g_ptEnd.y = y; } }; @@ -587,10 +590,12 @@ struct PenTool : SmoothDrawTool void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; - Line(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, 1); - ::SetPixelV(m_hdc, x, y, rgb); - g_ptEnd.x = x; - g_ptEnd.y = y; + Line(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetPenWidth()); + } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakePenThickerOrThinner(bMinus); } }; @@ -605,8 +610,11 @@ struct BrushTool : SmoothDrawTool { COLORREF rgb = bLeftButton ? m_fg : m_bg; Brush(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetBrushStyle()); - g_ptEnd.x = x; - g_ptEnd.y = y; + } + + void OnSpecialTweak(BOOL bMinus) override + { + // TODO: } }; @@ -863,6 +871,11 @@ struct BezierTool : ToolBase m_bDrawing = FALSE; ToolBase::OnFinishDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeLineThickerOrThinner(bMinus); + } }; // TOOL_RECT @@ -991,6 +1004,11 @@ struct ShapeTool : ToolBase ToolBase::OnFinishDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeLineThickerOrThinner(bMinus); + } }; // TOOL_ELLIPSE diff --git a/base/applications/mspaint/toolbox.cpp b/base/applications/mspaint/toolbox.cpp index b02d4fb99b8..54d5bd8c2a4 100644 --- a/base/applications/mspaint/toolbox.cpp +++ b/base/applications/mspaint/toolbox.cpp @@ -20,8 +20,13 @@ CPaintToolBar::ToolBarWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam { // We have to detect clicking on toolbar even if no change of pressed button POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; - INT id = (INT)SendMessage(hwnd, TB_HITTEST, 0, (LPARAM)&pt); - ::PostMessage(::GetParent(hwnd), WM_TOOLBARHIT, id, 0); + INT index = (INT)::SendMessage(hwnd, TB_HITTEST, 0, (LPARAM)&pt); + if (index >= 0) + { + TBBUTTON button; + if (::SendMessage(hwnd, TB_GETBUTTON, index, (LPARAM)&button)) + ::PostMessage(::GetParent(hwnd), WM_COMMAND, button.idCommand, 0); + } } return ::CallWindowProc(oldWndProc, hwnd, uMsg, wParam, lParam); } @@ -112,6 +117,7 @@ static const COMMAND_TO_TOOL CommandToToolMapping[] = { ID_ELLIPSE, TOOL_ELLIPSE }, { ID_RRECT, TOOL_RRECT }, }; +static_assert(_countof(CommandToToolMapping) == TOOL_MAX, "Logical error"); LRESULT CToolBox::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { @@ -183,10 +189,3 @@ LRESULT CToolBox::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa ::ReleaseCapture(); return 0; } - -LRESULT CToolBox::OnToolBarHit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - // See also: CPaintToolBar::ToolBarWndProc - selectionModel.Landing(); - return 0; -} diff --git a/base/applications/mspaint/toolbox.h b/base/applications/mspaint/toolbox.h index 859493407a4..291032c1fcf 100644 --- a/base/applications/mspaint/toolbox.h +++ b/base/applications/mspaint/toolbox.h @@ -14,8 +14,6 @@ #define CX_TOOLBAR (TOOLBAR_COLUMNS * CXY_TB_BUTTON) #define CY_TOOLBAR (TOOLBAR_ROWS * CXY_TB_BUTTON) -#define WM_TOOLBARHIT (WM_APP + 1) - class CPaintToolBar : public CWindow { public: @@ -36,7 +34,6 @@ class CToolBox : public CWindowImpl MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) MESSAGE_HANDLER(WM_TOOLSMODELTOOLCHANGED, OnToolsModelToolChanged) - MESSAGE_HANDLER(WM_TOOLBARHIT, OnToolBarHit) END_MSG_MAP() BOOL DoCreate(HWND hwndParent); @@ -51,5 +48,4 @@ class CToolBox : public CWindowImpl LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnToolBarHit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index b787e6d591e..6b5e41d483a 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -13,7 +13,7 @@ ToolsModel toolsModel; ToolsModel::ToolsModel() { - m_lineWidth = 1; + m_lineWidth = m_penWidth = 1; m_shapeStyle = 0; m_brushStyle = 0; m_oldActiveTool = m_activeTool = TOOL_PEN; @@ -53,6 +53,31 @@ void ToolsModel::SetLineWidth(int nLineWidth) { m_lineWidth = nLineWidth; NotifyToolSettingsChanged(); + imageModel.NotifyImageChanged(); +} + +INT ToolsModel::GetPenWidth() const +{ + return m_penWidth; +} + +void ToolsModel::SetPenWidth(INT nPenWidth) +{ + m_penWidth = nPenWidth; + NotifyToolSettingsChanged(); + imageModel.NotifyImageChanged(); +} + +void ToolsModel::MakeLineThickerOrThinner(BOOL bThinner) +{ + INT thickness = GetLineWidth(); + SetLineWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); +} + +void ToolsModel::MakePenThickerOrThinner(BOOL bThinner) +{ + INT thickness = GetPenWidth(); + SetPenWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); } int ToolsModel::GetShapeStyle() const @@ -91,23 +116,38 @@ void ToolsModel::SetActiveTool(TOOLTYPE nActiveTool) { OnFinishDraw(); + selectionModel.Landing(); + + m_activeTool = nActiveTool; + switch (m_activeTool) { case TOOL_FREESEL: case TOOL_RECTSEL: - case TOOL_RUBBER: case TOOL_COLOR: case TOOL_ZOOM: case TOOL_TEXT: + // The active tool is not an actually drawing tool break; - default: - m_oldActiveTool = m_activeTool; + case TOOL_LINE: + case TOOL_BEZIER: + case TOOL_RECT: + case TOOL_SHAPE: + case TOOL_ELLIPSE: + case TOOL_FILL: + case TOOL_AIRBRUSH: + case TOOL_RRECT: + case TOOL_RUBBER: + case TOOL_BRUSH: + case TOOL_PEN: + // The active tool is an actually drawing tool. Save it for TOOL_COLOR to restore + m_oldActiveTool = nActiveTool; break; } - m_activeTool = nActiveTool; m_pToolObject = GetOrCreateTool(m_activeTool); + NotifyToolChanged(); } @@ -189,9 +229,9 @@ void ToolsModel::NotifyZoomChanged() void ToolsModel::OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { m_pToolObject->beginEvent(); - m_pToolObject->OnButtonDown(bLeftButton, x, y, bDoubleClick); g_ptStart.x = g_ptEnd.x = x; g_ptStart.y = g_ptEnd.y = y; + m_pToolObject->OnButtonDown(bLeftButton, x, y, bDoubleClick); m_pToolObject->endEvent(); } diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index 09f48672a01..efb63b09022 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -67,6 +67,7 @@ class ToolsModel { private: int m_lineWidth; + INT m_penWidth; int m_shapeStyle; int m_brushStyle; TOOLTYPE m_activeTool; @@ -85,8 +86,15 @@ class ToolsModel ~ToolsModel(); BOOL IsSelection() const; + int GetLineWidth() const; void SetLineWidth(int nLineWidth); + void MakeLineThickerOrThinner(BOOL bThinner); + + INT GetPenWidth() const; + void SetPenWidth(INT nPenWidth); + void MakePenThickerOrThinner(BOOL bThinner); + int GetShapeStyle() const; void SetShapeStyle(int nShapeStyle); int GetBrushStyle() const; From 27b9e5a4590b74c00e53e6f569d22b13146d1f9f Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Thu, 28 Sep 2023 21:30:34 +0900 Subject: [PATCH 52/74] [MSPAINT] Larger/smaller brush nib on Ctrl+Plus/Minus (#5739) - Introduce the concept of "brush width" to the tools model. - Enable changing the brush width by Ctrl+Plus/Minus key combination in TOOL_BRUSH. - Re-define brush styles. CORE-19094 --- base/applications/mspaint/drawing.cpp | 117 ++++++++++----------- base/applications/mspaint/drawing.h | 2 +- base/applications/mspaint/mouse.cpp | 5 +- base/applications/mspaint/toolsettings.cpp | 34 +++++- base/applications/mspaint/toolsmodel.cpp | 25 ++++- base/applications/mspaint/toolsmodel.h | 25 ++++- 6 files changed, 132 insertions(+), 76 deletions(-) diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index 96064fff229..3b7579196ce 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -165,73 +165,66 @@ Airbrush(HDC hdc, LONG x, LONG y, COLORREF color, LONG r) } void -Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style) +Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style, INT thickness) { HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, color)); HBRUSH oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(color)); - LONG a, b; - b = max(1, max(labs(x2 - x1), labs(y2 - y1))); - switch (style) + + if (thickness <= 1) + { + Line(hdc, x1, y1, x2, y2, color, thickness); + } + else { - case 0: - for(a = 0; a <= b; a++) - Ellipse(hdc, (x1 * (b - a) + x2 * a) / b - 3, (y1 * (b - a) + y2 * a) / b - 3, - (x1 * (b - a) + x2 * a) / b + 4, (y1 * (b - a) + y2 * a) / b + 4); - break; - case 1: - for(a = 0; a <= b; a++) - Ellipse(hdc, - (x1 * (b - a) + x2 * a) / b - 2, - (y1 * (b - a) + y2 * a) / b - 2, - (x1 * (b - a) + x2 * a) / b + 2, - (y1 * (b - a) + y2 * a) / b + 2); - break; - case 2: - MoveToEx(hdc, x1, y1, NULL); - LineTo(hdc, x2, y2); - ::SetPixelV(hdc, x2, y2, color); - break; - case 3: - for(a = 0; a <= b; a++) - Rectangle(hdc, - (x1 * (b - a) + x2 * a) / b - 4, - (y1 * (b - a) + y2 * a) / b - 4, - (x1 * (b - a) + x2 * a) / b + 4, - (y1 * (b - a) + y2 * a) / b + 4); - break; - case 4: - for(a = 0; a <= b; a++) - Rectangle(hdc, (x1 * (b - a) + x2 * a) / b - 2, (y1 * (b - a) + y2 * a) / b - 2, - (x1 * (b - a) + x2 * a) / b + 3, (y1 * (b - a) + y2 * a) / b + 3); - break; - case 5: - for(a = 0; a <= b; a++) - Rectangle(hdc, (x1 * (b - a) + x2 * a) / b - 1, (y1 * (b - a) + y2 * a) / b - 1, - (x1 * (b - a) + x2 * a) / b + 1, (y1 * (b - a) + y2 * a) / b + 1); - break; - case 6: - case 7: - case 8: - case 9: - case 10: - case 11: + LONG a, b = max(1, max(labs(x2 - x1), labs(y2 - y1))); + switch ((BrushStyle)style) { - POINT offsTop[] = {{3, -3}, {2, -2}, {0, 0}, - {-4, -4}, {-2, -2}, {-1, 0}}; - POINT offsBtm[] = {{-3, 3}, {-2, 2}, {-1, 1}, - {3, 3}, {2, 2}, {0, 1}}; - LONG idx = style - 6; - POINT pts[4]; - pts[0].x = x1 + offsTop[idx].x; - pts[0].y = y1 + offsTop[idx].y; - pts[1].x = x1 + offsBtm[idx].x; - pts[1].y = y1 + offsBtm[idx].y; - pts[2].x = x2 + offsBtm[idx].x; - pts[2].y = y2 + offsBtm[idx].y; - pts[3].x = x2 + offsTop[idx].x; - pts[3].y = y2 + offsTop[idx].y; - Polygon(hdc, pts, 4); - break; + case BrushStyleRound: + for (a = 0; a <= b; a++) + { + Ellipse(hdc, + (x1 * (b - a) + x2 * a) / b - (thickness / 2), + (y1 * (b - a) + y2 * a) / b - (thickness / 2), + (x1 * (b - a) + x2 * a) / b + (thickness / 2), + (y1 * (b - a) + y2 * a) / b + (thickness / 2)); + } + break; + + case BrushStyleSquare: + for (a = 0; a <= b; a++) + { + Rectangle(hdc, + (x1 * (b - a) + x2 * a) / b - (thickness / 2), + (y1 * (b - a) + y2 * a) / b - (thickness / 2), + (x1 * (b - a) + x2 * a) / b + (thickness / 2), + (y1 * (b - a) + y2 * a) / b + (thickness / 2)); + } + break; + + case BrushStyleForeSlash: + case BrushStyleBackSlash: + { + POINT offsetTop, offsetBottom; + if ((BrushStyle)style == BrushStyleForeSlash) + { + offsetTop = { (thickness - 1) / 2, -(thickness - 1) / 2 }; + offsetBottom = { -thickness / 2, thickness / 2 }; + } + else + { + offsetTop = { -thickness / 2, -thickness / 2 }; + offsetBottom = { (thickness - 1) / 2, (thickness - 1) / 2 }; + } + POINT points[4] = + { + { x1 + offsetTop.x, y1 + offsetTop.y }, + { x1 + offsetBottom.x, y1 + offsetBottom.y }, + { x2 + offsetBottom.x, y2 + offsetBottom.y }, + { x2 + offsetTop.x, y2 + offsetTop.y }, + }; + Polygon(hdc, points, _countof(points)); + break; + } } } DeleteObject(SelectObject(hdc, oldBrush)); diff --git a/base/applications/mspaint/drawing.h b/base/applications/mspaint/drawing.h index 950bfdd6974..44936f08503 100644 --- a/base/applications/mspaint/drawing.h +++ b/base/applications/mspaint/drawing.h @@ -27,7 +27,7 @@ void Replace(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF void Airbrush(HDC hdc, LONG x, LONG y, COLORREF color, LONG r); -void Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style); +void Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style, INT thickness); void RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2); diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 04e749db88b..fc4b1792bec 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -609,12 +609,13 @@ struct BrushTool : SmoothDrawTool void draw(BOOL bLeftButton, LONG x, LONG y) override { COLORREF rgb = bLeftButton ? m_fg : m_bg; - Brush(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetBrushStyle()); + Brush(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, rgb, toolsModel.GetBrushStyle(), + toolsModel.GetBrushWidth()); } void OnSpecialTweak(BOOL bMinus) override { - // TODO: + toolsModel.MakeBrushThickerOrThinner(bMinus); } }; diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index 4d9f63ae0f6..555f5aa92f9 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -112,23 +112,43 @@ static inline INT getBrushRects(RECT rects[12], LPCRECT prc, LPPOINT ppt = NULL) return getSplitRects(rects, 3, 4, prc, ppt); } +struct BrushStyleAndWidth +{ + BrushStyle style; + INT width; +}; + +static const BrushStyleAndWidth c_BrushPresets[] = +{ + { BrushStyleRound, 7 }, { BrushStyleRound, 4 }, { BrushStyleRound, 1 }, + { BrushStyleSquare, 8 }, { BrushStyleSquare, 5 }, { BrushStyleSquare, 2 }, + { BrushStyleForeSlash, 8 }, { BrushStyleForeSlash, 5 }, { BrushStyleForeSlash, 2 }, + { BrushStyleBackSlash, 8 }, { BrushStyleBackSlash, 5 }, { BrushStyleBackSlash, 2 }, +}; + VOID CToolSettingsWindow::drawBrush(HDC hdc, LPCRECT prc) { RECT rects[12]; getBrushRects(rects, prc); - ::FillRect(hdc, &rects[toolsModel.GetBrushStyle()], (HBRUSH)(COLOR_HIGHLIGHT + 1)); - for (INT i = 0; i < 12; i++) { RECT rcItem = rects[i]; INT x = (rcItem.left + rcItem.right) / 2, y = (rcItem.top + rcItem.bottom) / 2; + INT iColor; - if (i == toolsModel.GetBrushStyle()) + const BrushStyleAndWidth& data = c_BrushPresets[i]; + if (data.width == toolsModel.GetBrushWidth() && data.style == toolsModel.GetBrushStyle()) + { iColor = COLOR_HIGHLIGHTTEXT; + ::FillRect(hdc, &rcItem, (HBRUSH)(COLOR_HIGHLIGHT + 1)); + } else + { iColor = COLOR_WINDOWTEXT; - Brush(hdc, x, y, x, y, ::GetSysColor(iColor), i); + } + + Brush(hdc, x, y, x, y, ::GetSysColor(iColor), data.style, data.width); } } @@ -383,7 +403,11 @@ LRESULT CToolSettingsWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lPar case TOOL_BRUSH: iItem = getBrushRects(rects, &rect1, &pt); if (iItem != -1) - toolsModel.SetBrushStyle(iItem); + { + const BrushStyleAndWidth& data = c_BrushPresets[iItem]; + toolsModel.SetBrushStyle(data.style); + toolsModel.SetBrushWidth(data.width); + } break; case TOOL_AIRBRUSH: iItem = getAirBrushRects(rects, &rect1, &pt); diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 6b5e41d483a..07ded56ea99 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -14,8 +14,9 @@ ToolsModel toolsModel; ToolsModel::ToolsModel() { m_lineWidth = m_penWidth = 1; + m_brushWidth = 4; m_shapeStyle = 0; - m_brushStyle = 0; + m_brushStyle = BrushStyleRound; m_oldActiveTool = m_activeTool = TOOL_PEN; m_airBrushWidth = 5; m_rubberRadius = 4; @@ -68,6 +69,18 @@ void ToolsModel::SetPenWidth(INT nPenWidth) imageModel.NotifyImageChanged(); } +INT ToolsModel::GetBrushWidth() const +{ + return m_brushWidth; +} + +void ToolsModel::SetBrushWidth(INT nBrushWidth) +{ + m_brushWidth = nBrushWidth; + NotifyToolSettingsChanged(); + imageModel.NotifyImageChanged(); +} + void ToolsModel::MakeLineThickerOrThinner(BOOL bThinner) { INT thickness = GetLineWidth(); @@ -80,6 +93,12 @@ void ToolsModel::MakePenThickerOrThinner(BOOL bThinner) SetPenWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); } +void ToolsModel::MakeBrushThickerOrThinner(BOOL bThinner) +{ + INT thickness = GetBrushWidth(); + SetBrushWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); +} + int ToolsModel::GetShapeStyle() const { return m_shapeStyle; @@ -91,12 +110,12 @@ void ToolsModel::SetShapeStyle(int nShapeStyle) NotifyToolSettingsChanged(); } -int ToolsModel::GetBrushStyle() const +BrushStyle ToolsModel::GetBrushStyle() const { return m_brushStyle; } -void ToolsModel::SetBrushStyle(int nBrushStyle) +void ToolsModel::SetBrushStyle(BrushStyle nBrushStyle) { m_brushStyle = nBrushStyle; NotifyToolSettingsChanged(); diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index efb63b09022..b6f2c96fbdb 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -28,6 +28,14 @@ enum TOOLTYPE TOOL_MAX = TOOL_RRECT, }; +enum BrushStyle +{ + BrushStyleRound, + BrushStyleSquare, + BrushStyleForeSlash, + BrushStyleBackSlash, +}; + /* CLASSES **********************************************************/ struct ToolBase @@ -68,8 +76,9 @@ class ToolsModel private: int m_lineWidth; INT m_penWidth; + INT m_brushWidth; int m_shapeStyle; - int m_brushStyle; + BrushStyle m_brushStyle; TOOLTYPE m_activeTool; TOOLTYPE m_oldActiveTool; int m_airBrushWidth; @@ -97,17 +106,27 @@ class ToolsModel int GetShapeStyle() const; void SetShapeStyle(int nShapeStyle); - int GetBrushStyle() const; - void SetBrushStyle(int nBrushStyle); + + INT GetBrushWidth() const; + void SetBrushWidth(INT nBrushWidth); + void MakeBrushThickerOrThinner(BOOL bThinner); + + BrushStyle GetBrushStyle() const; + void SetBrushStyle(BrushStyle nBrushStyle); + TOOLTYPE GetActiveTool() const; TOOLTYPE GetOldActiveTool() const; void SetActiveTool(TOOLTYPE nActiveTool); + int GetAirBrushWidth() const; void SetAirBrushWidth(int nAirBrushWidth); + int GetRubberRadius() const; void SetRubberRadius(int nRubberRadius); + BOOL IsBackgroundTransparent() const; void SetBackgroundTransparent(BOOL bTransparent); + int GetZoom() const; void SetZoom(int nZoom); From 3f710ba46d2708d21981baf67d8821b5f614e2d7 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Thu, 28 Sep 2023 21:54:32 +0900 Subject: [PATCH 53/74] [MSPAINT] Larger/smaller Rubber/AirBrush on Ctrl+Plus/Minus (#5740) - Enable changing rubber/airbrush thickness by Ctrl+Plus / Ctrl+Minus key combination in TOOL_AIRBRUSH and TOOL_RUBBER. CORE-19094 --- base/applications/mspaint/mouse.cpp | 10 ++++++++++ base/applications/mspaint/toolsmodel.cpp | 12 ++++++++++++ base/applications/mspaint/toolsmodel.h | 2 ++ 3 files changed, 24 insertions(+) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index fc4b1792bec..793efedf3ec 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -505,6 +505,11 @@ struct RubberTool : SmoothDrawTool else Replace(m_hdc, g_ptEnd.x, g_ptEnd.y, x, y, m_fg, m_bg, toolsModel.GetRubberRadius()); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeRubberThickerOrThinner(bMinus); + } }; // TOOL_FILL @@ -631,6 +636,11 @@ struct AirBrushTool : SmoothDrawTool COLORREF rgb = bLeftButton ? m_fg : m_bg; Airbrush(m_hdc, x, y, rgb, toolsModel.GetAirBrushWidth()); } + + void OnSpecialTweak(BOOL bMinus) override + { + toolsModel.MakeAirBrushThickerOrThinner(bMinus); + } }; // TOOL_TEXT diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 07ded56ea99..dec101adc9e 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -99,6 +99,18 @@ void ToolsModel::MakeBrushThickerOrThinner(BOOL bThinner) SetBrushWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); } +void ToolsModel::MakeAirBrushThickerOrThinner(BOOL bThinner) +{ + INT thickness = GetAirBrushWidth(); + SetAirBrushWidth(bThinner ? max(1, thickness - 1) : (thickness + 1)); +} + +void ToolsModel::MakeRubberThickerOrThinner(BOOL bThinner) +{ + INT thickness = GetRubberRadius(); + SetRubberRadius(bThinner ? max(1, thickness - 1) : (thickness + 1)); +} + int ToolsModel::GetShapeStyle() const { return m_shapeStyle; diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index b6f2c96fbdb..d90faee117b 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -120,9 +120,11 @@ class ToolsModel int GetAirBrushWidth() const; void SetAirBrushWidth(int nAirBrushWidth); + void MakeAirBrushThickerOrThinner(BOOL bThinner); int GetRubberRadius() const; void SetRubberRadius(int nRubberRadius); + void MakeRubberThickerOrThinner(BOOL bThinner); BOOL IsBackgroundTransparent() const; void SetBackgroundTransparent(BOOL bTransparent); From 7b3d00cc864b5b09e458b4511b2bad0bf967f919 Mon Sep 17 00:00:00 2001 From: jpb Date: Sat, 21 Oct 2023 13:22:20 +0100 Subject: [PATCH 54/74] Revert "[MSPAINT][ATL] Delete deprecated functions (#5542)" This reverts commit cbca409d093002f79957a7e723d216078d1282f2. --- base/applications/mspaint/atlimagedx.h | 331 +++++-------------------- base/applications/mspaint/dib.cpp | 14 +- base/applications/mspaint/precomp.h | 1 + base/applications/mspaint/winproc.cpp | 10 - sdk/lib/atl/atlimage.h | 34 ++- 5 files changed, 96 insertions(+), 294 deletions(-) diff --git a/base/applications/mspaint/atlimagedx.h b/base/applications/mspaint/atlimagedx.h index 6469e9d471b..735d4716dc7 100644 --- a/base/applications/mspaint/atlimagedx.h +++ b/base/applications/mspaint/atlimagedx.h @@ -7,340 +7,135 @@ #pragma once -#include - -namespace GPDE = Gdiplus::DllExports; - -class CImageDx +class CImageDx : public CImage { -protected: - HBITMAP m_hBitmap = NULL; - public: - CImageDx() + CImageDx() : CImage() { - _shared()->AddRef(); - } - - ~CImageDx() - { - if (m_hBitmap) - ::DeleteObject(m_hBitmap); - - _shared()->Release(); - } - - void Attach(HBITMAP hbm) - { - if (m_hBitmap) - ::DeleteObject(m_hBitmap); - m_hBitmap = hbm; - } - - HBITMAP Detach() - { - HBITMAP hbmOld = m_hBitmap; - m_hBitmap = NULL; - return hbmOld; + GetImageHorizontalResolution = NULL; + GetImageVerticalResolution = NULL; + BitmapSetResolution = NULL; } BOOL GetResolution(Gdiplus::GpImage *pImage, float *pxDpi, float *pyDpi) { - if (!get_fn(_shared()->m_GetImageHorizontalResolution, "GdipGetImageHorizontalResolution") || - !get_fn(_shared()->m_GetImageVerticalResolution, "GdipGetImageVerticalResolution")) + *pxDpi = 96; + *pyDpi = 96; + + if (GetImageHorizontalResolution == NULL || GetImageVerticalResolution == NULL) { - return FALSE; + GetImageHorizontalResolution = + AddrOf("GdipGetImageHorizontalResolution"); + GetImageVerticalResolution = + AddrOf("GdipGetImageVerticalResolution"); } - if (pxDpi) - _shared()->m_GetImageHorizontalResolution(pImage, pxDpi); - if (pyDpi) - _shared()->m_GetImageVerticalResolution(pImage, pyDpi); + if (GetImageHorizontalResolution == NULL || GetImageVerticalResolution == NULL) + return FALSE; + GetImageHorizontalResolution(pImage, pxDpi); + GetImageVerticalResolution(pImage, pyDpi); return TRUE; } - BOOL SetResolution(Gdiplus::GpBitmap *pBitmap, float xDpi, float yDpi) + BOOL SetResolution(Gdiplus::GpBitmap *pBitmap, float xDpi, float yDpi) const { - if (!get_fn(_shared()->m_BitmapSetResolution, "GdipBitmapSetResolution")) + if (BitmapSetResolution == NULL) + BitmapSetResolution = AddrOf("GdipBitmapSetResolution"); + + if (BitmapSetResolution == NULL) return FALSE; - _shared()->m_BitmapSetResolution(pBitmap, xDpi, yDpi); + BitmapSetResolution(pBitmap, xDpi, yDpi); return TRUE; } HRESULT LoadDx(LPCTSTR pszFileName, float *pxDpi, float *pyDpi) throw() { - using namespace Gdiplus; - - _shared()->AddRef(); - - if (!get_fn(_shared()->m_CreateBitmapFromFile, "GdipCreateBitmapFromFile") || - !get_fn(_shared()->m_CreateHBITMAPFromBitmap, "GdipCreateHBITMAPFromBitmap") || - !get_fn(_shared()->m_DisposeImage, "GdipDisposeImage")) - { - _shared()->Release(); - return E_FAIL; - } + // convert the file name string into Unicode + CStringW pszNameW(pszFileName); // create a GpBitmap object from file + using namespace Gdiplus; GpBitmap *pBitmap = NULL; - if (_shared()->m_CreateBitmapFromFile(pszFileName, &pBitmap) != Ok) + if (GetCommon().CreateBitmapFromFile(pszNameW, &pBitmap) != Ok) { - _shared()->Release(); return E_FAIL; } - // get an HBITMAP + // get bitmap handle HBITMAP hbm = NULL; Color color(0xFF, 0xFF, 0xFF); - Status status = _shared()->m_CreateHBITMAPFromBitmap(pBitmap, &hbm, color.GetValue()); + Gdiplus::Status status; + status = GetCommon().CreateHBITMAPFromBitmap(pBitmap, &hbm, color.GetValue()); // get the resolution - if (pxDpi || pyDpi) - GetResolution((GpImage*)pBitmap, pxDpi, pyDpi); + GetResolution((Gdiplus::GpImage*)pBitmap, pxDpi, pyDpi); // delete GpBitmap - _shared()->m_DisposeImage(pBitmap); + GetCommon().DisposeImage(pBitmap); // attach it if (status == Ok) Attach(hbm); - - _shared()->Release(); return (status == Ok ? S_OK : E_FAIL); } HRESULT SaveDx(LPCTSTR pszFileName, REFGUID guidFileType = GUID_NULL, - float xDpi = 0, float yDpi = 0) throw() + float xDpi = 0, float yDpi = 0) const throw() { using namespace Gdiplus; + ATLASSERT(m_hbm); + + // TODO & FIXME: set parameters (m_rgbTransColor etc.) - _shared()->AddRef(); + // convert the file name string into Unicode + CStringW pszNameW(pszFileName); - if (!get_fn(_shared()->m_CreateBitmapFromHBITMAP, "GdipCreateBitmapFromHBITMAP") || - !get_fn(_shared()->m_SaveImageToFile, "GdipSaveImageToFile") || - !get_fn(_shared()->m_DisposeImage, "GdipDisposeImage")) + // if the file type is null, get the file type from extension + const GUID *FileType = &guidFileType; + if (::IsEqualGUID(guidFileType, GUID_NULL)) { - _shared()->Release(); - return E_FAIL; + LPCWSTR pszExt = GetFileExtension(pszNameW); + FileType = FileTypeFromExtension(pszExt); } + // get CLSID from file type + CLSID clsid; + if (!GetClsidFromFileType(&clsid, FileType)) + return E_FAIL; + // create a GpBitmap from HBITMAP GpBitmap *pBitmap = NULL; - _shared()->m_CreateBitmapFromHBITMAP(m_hBitmap, NULL, &pBitmap); + GetCommon().CreateBitmapFromHBITMAP(m_hbm, NULL, &pBitmap); // set the resolution SetResolution(pBitmap, xDpi, yDpi); - // Get encoders - UINT cEncoders = 0; - ImageCodecInfo* pEncoders = GetAllEncoders(cEncoders); - - // if the file type is null, get the file type from extension - CLSID clsid; - if (::IsEqualGUID(guidFileType, GUID_NULL)) - { - CString strExt(PathFindExtension(pszFileName)); - clsid = FindCodecForExtension(strExt, pEncoders, cEncoders); - } - else - { - clsid = FindCodecForFileType(guidFileType, pEncoders, cEncoders); - } - - delete[] pEncoders; - // save to file - Status status = _shared()->m_SaveImageToFile(pBitmap, pszFileName, &clsid, NULL); + Status status; + status = GetCommon().SaveImageToFile(pBitmap, pszNameW, &clsid, NULL); // destroy GpBitmap - _shared()->m_DisposeImage(pBitmap); - - _shared()->Release(); + GetCommon().DisposeImage(pBitmap); return (status == Ok ? S_OK : E_FAIL); } - static BOOL IsExtensionSupported(PWCHAR pchDotExt) - { - _shared()->AddRef(); - - UINT cEncoders; - Gdiplus::ImageCodecInfo* pEncoders = GetAllEncoders(cEncoders); - - CLSID clsid = FindCodecForExtension(pchDotExt, pEncoders, cEncoders); - BOOL ret = !::IsEqualGUID(clsid, CLSID_NULL); - delete[] pEncoders; - - _shared()->Release(); - return ret; - } - protected: - using FN_Startup = decltype(&Gdiplus::GdiplusStartup); - using FN_Shutdown = decltype(&Gdiplus::GdiplusShutdown); - using FN_GetImageHorizontalResolution = decltype(&GPDE::GdipGetImageHorizontalResolution); - using FN_GetImageVerticalResolution = decltype(&GPDE::GdipGetImageVerticalResolution); - using FN_BitmapSetResolution = decltype(&GPDE::GdipBitmapSetResolution); - using FN_CreateBitmapFromHBITMAP = decltype(&GPDE::GdipCreateBitmapFromHBITMAP); - using FN_CreateBitmapFromFile = decltype(&GPDE::GdipCreateBitmapFromFile); - using FN_CreateHBITMAPFromBitmap = decltype(&GPDE::GdipCreateHBITMAPFromBitmap); - using FN_SaveImageToFile = decltype(&GPDE::GdipSaveImageToFile); - using FN_DisposeImage = decltype(&GPDE::GdipDisposeImage); - using FN_GetImageEncodersSize = decltype(&GPDE::GdipGetImageEncodersSize); - using FN_GetImageEncoders = decltype(&GPDE::GdipGetImageEncoders); - - struct SHARED - { - HINSTANCE m_hGdiPlus = NULL; - LONG m_cRefs = 0; - ULONG_PTR m_dwToken = 0; - FN_Shutdown m_Shutdown = NULL; - FN_GetImageHorizontalResolution m_GetImageHorizontalResolution = NULL; - FN_GetImageVerticalResolution m_GetImageVerticalResolution = NULL; - FN_BitmapSetResolution m_BitmapSetResolution = NULL; - FN_CreateBitmapFromHBITMAP m_CreateBitmapFromHBITMAP = NULL; - FN_CreateBitmapFromFile m_CreateBitmapFromFile = NULL; - FN_CreateHBITMAPFromBitmap m_CreateHBITMAPFromBitmap = NULL; - FN_SaveImageToFile m_SaveImageToFile = NULL; - FN_DisposeImage m_DisposeImage = NULL; - FN_GetImageEncodersSize m_GetImageEncodersSize = NULL; - FN_GetImageEncoders m_GetImageEncoders = NULL; - - HINSTANCE Init() - { - if (m_hGdiPlus) - return m_hGdiPlus; - - m_hGdiPlus = ::LoadLibraryW(L"gdiplus.dll"); - if (!m_hGdiPlus) - return NULL; - - FN_Startup Startup = (FN_Startup)GetProcAddress(m_hGdiPlus, "GdiplusStartup"); - m_Shutdown = (FN_Shutdown)GetProcAddress(m_hGdiPlus, "GdiplusShutdown"); - if (!Startup || !m_Shutdown) - { - ::FreeLibrary(m_hGdiPlus); - m_hGdiPlus = NULL; - return NULL; - } - - Gdiplus::GdiplusStartupInput gdiplusStartupInput; - Startup(&m_dwToken, &gdiplusStartupInput, NULL); - - return m_hGdiPlus; - } - - void Free() - { - ::FreeLibrary(m_hGdiPlus); - ZeroMemory(this, sizeof(*this)); - } - - LONG AddRef() - { - return ++m_cRefs; - } - - LONG Release() - { - if (--m_cRefs == 0) - { - Free(); - return 0; - } - return m_cRefs; - } - }; - - static SHARED* _shared() - { - static SHARED s_shared; - return &s_shared; - } - - static Gdiplus::ImageCodecInfo* GetAllEncoders(UINT& cEncoders) - { - Gdiplus::ImageCodecInfo *ret = NULL; - UINT total_size; - - if (!get_fn(_shared()->m_GetImageEncodersSize, "GdipGetImageEncodersSize") || - !get_fn(_shared()->m_GetImageEncoders, "GdipGetImageEncoders")) - { - cEncoders = 0; - return NULL; - } - - _shared()->m_GetImageEncodersSize(&cEncoders, &total_size); - if (total_size == 0) - return NULL; - - ret = new Gdiplus::ImageCodecInfo[total_size / sizeof(ret[0])]; - if (ret == NULL) - { - cEncoders = 0; - return NULL; - } - - _shared()->m_GetImageEncoders(cEncoders, total_size, ret); - - return ret; // needs delete[] - } - - template - static bool get_fn(FN_T& fn, const char *name) + // get procedure address of the DLL + template + TYPE AddrOf(const char *name) const { - if (fn) - return true; - HINSTANCE hGdiPlus = _shared()->Init(); - fn = reinterpret_cast(::GetProcAddress(hGdiPlus, name)); - return fn != NULL; + FARPROC proc = ::GetProcAddress(GetCommon().hinstGdiPlus, name); + return reinterpret_cast(proc); } - // CImage::FindCodecForExtension is private. We have to duplicate it at here... - static CLSID - FindCodecForExtension(LPCTSTR dotext, const Gdiplus::ImageCodecInfo *pCodecs, UINT nCodecs) - { - for (UINT i = 0; i < nCodecs; ++i) - { - CString strSpecs(pCodecs[i].FilenameExtension); - int ichOld = 0, ichSep; - for (;;) - { - ichSep = strSpecs.Find(TEXT(';'), ichOld); - - CString strSpec; - if (ichSep < 0) - strSpec = strSpecs.Mid(ichOld); - else - strSpec = strSpecs.Mid(ichOld, ichSep - ichOld); - - int ichDot = strSpec.ReverseFind(TEXT('.')); - if (ichDot >= 0) - strSpec = strSpec.Mid(ichDot); - - if (!dotext || strSpec.CompareNoCase(dotext) == 0) - return pCodecs[i].Clsid; - - if (ichSep < 0) - break; - - ichOld = ichSep + 1; - } - } - return CLSID_NULL; - } + typedef St (WINGDIPAPI *GETIMAGEHORIZONTALRESOLUTION)(Im *, float*); + typedef St (WINGDIPAPI *GETIMAGEVERTICALRESOLUTION)(Im *, float*); + typedef St (WINGDIPAPI *BITMAPSETRESOLUTION)(Bm *, float, float); - // CImage::FindCodecForFileType is private. We have to duplicate it at here... - static CLSID - FindCodecForFileType(REFGUID guidFileType, const Gdiplus::ImageCodecInfo *pCodecs, UINT nCodecs) - { - for (UINT iInfo = 0; iInfo < nCodecs; ++iInfo) - { - if (::IsEqualGUID(pCodecs[iInfo].FormatID, guidFileType)) - return pCodecs[iInfo].Clsid; - } - return CLSID_NULL; - } + GETIMAGEHORIZONTALRESOLUTION GetImageHorizontalResolution; + GETIMAGEVERTICALRESOLUTION GetImageVerticalResolution; + mutable BITMAPSETRESOLUTION BitmapSetResolution; }; diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 4e04b9abc90..ee27d23141b 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -272,7 +272,7 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) // load the image CImageDx img; - float xDpi = 0, yDpi = 0; + float xDpi, yDpi; HRESULT hr = img.LoadDx(name, &xDpi, &yDpi); if (FAILED(hr)) { @@ -284,16 +284,12 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) if (!fIsMainFile) return hBitmap; - if (xDpi <= 0 || yDpi <= 0) - { - HDC hDC = ::GetDC(NULL); - xDpi = ::GetDeviceCaps(hDC, LOGPIXELSX); - yDpi = ::GetDeviceCaps(hDC, LOGPIXELSY); - ::ReleaseDC(NULL, hDC); - } - g_xDpi = xDpi; g_yDpi = yDpi; + if (g_xDpi <= 0) + g_xDpi = 96; + if (g_yDpi <= 0) + g_yDpi = 96; SetBitmapAndInfo(hBitmap, name, &find, TRUE); return hBitmap; diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 09775b0cb72..f3e6b9d0d1b 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 643d0aedb61..72d74001f8e 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -142,16 +142,6 @@ void CMainWindow::saveImage(BOOL overwrite) { canvasWindow.finishDrawing(); - // Is the extension not supported? - PWCHAR pchDotExt = PathFindExtensionW(g_szFileName); - if (pchDotExt && *pchDotExt && !CImageDx::IsExtensionSupported(pchDotExt)) - { - // Remove the extension - PathRemoveExtensionW(g_szFileName); - // No overwrite - overwrite = FALSE; - } - if (g_isAFile && overwrite) { imageModel.SaveImage(g_szFileName); diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index a6ac73a6030..30fbb1b6c7d 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -1055,18 +1055,38 @@ class CImage return NULL; } - static CLSID - FindCodecForFileType(REFGUID guidFileType, const Gdiplus::ImageCodecInfo *pCodecs, UINT nCodecs) + struct FORMAT_ENTRY { - for (UINT iInfo = 0; iInfo < nCodecs; ++iInfo) + GUID guid; + LPCWSTR mime; + }; + + bool GetClsidFromFileType(CLSID *clsid, const GUID *guid) const + { + static const FORMAT_ENTRY table[] = + { + {Gdiplus::ImageFormatJPEG, L"image/jpeg"}, + {Gdiplus::ImageFormatPNG, L"image/png"}, + {Gdiplus::ImageFormatBMP, L"image/bmp"}, + {Gdiplus::ImageFormatGIF, L"image/gif"}, + {Gdiplus::ImageFormatTIFF, L"image/tiff"} + }; + const size_t count = _countof(table); + for (size_t i = 0; i < count; ++i) { - if (::IsEqualGUID(pCodecs[iInfo].FormatID, guidFileType)) - return pCodecs[iInfo].Clsid; + if (::IsEqualGUID(table[i].guid, *guid)) + { + int num = GetEncoderClsid(table[i].mime, clsid); + if (num >= 0) + { + return true; + } + } } - return CLSID_NULL; + return false; } - static Gdiplus::ImageCodecInfo* _getAllEncoders(UINT& cEncoders) + int GetEncoderClsid(LPCWSTR mime, CLSID *clsid) const { UINT count = 0, total_size = 0; GetCommon().GetImageEncodersSize(&count, &total_size); From bf7360e53b9efa9aa4e48d747f93b6380e1936ea Mon Sep 17 00:00:00 2001 From: WindowsFan9600 Date: Sat, 21 Oct 2023 15:52:00 +0300 Subject: [PATCH 55/74] Improve language --- base/applications/games/solitaire/lang/tr-TR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/games/solitaire/lang/tr-TR.rc b/base/applications/games/solitaire/lang/tr-TR.rc index cb2469c9c29..82019c9561a 100644 --- a/base/applications/games/solitaire/lang/tr-TR.rc +++ b/base/applications/games/solitaire/lang/tr-TR.rc @@ -31,7 +31,7 @@ BEGIN END IDD_CARDBACK DIALOGEX 6, 6, 345, 185 -CAPTION "Kağıt Sırtını Seç" +CAPTION "Kağıt Destesini Seç" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN From f98ffa5078073c0f2f53dd2c5b34eb24256b40f4 Mon Sep 17 00:00:00 2001 From: WindowsFan9600 Date: Sat, 21 Oct 2023 16:02:54 +0300 Subject: [PATCH 56/74] [NOTEPAD] Translate missing strings on tr-TR --- base/applications/notepad/lang/tr-TR.rc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc index 1f37825511e..5066d0c3757 100644 --- a/base/applications/notepad/lang/tr-TR.rc +++ b/base/applications/notepad/lang/tr-TR.rc @@ -134,11 +134,11 @@ BEGIN END DIALOG_PRINTING DIALOG 0, 0, 160, 100 -CAPTION "Now printing" +CAPTION "Yazdırılıyor" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "Yazdırma işi başlatılıyor...", IDC_PRINTING_STATUS, 5, 10, 150, 15 CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 CTEXT "Sayfa %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 PUSHBUTTON "İptal", IDCANCEL, 50, 75, 60, 20 @@ -149,8 +149,8 @@ BEGIN STRING_PAGESETUP_HEADERVALUE "&f" STRING_PAGESETUP_FOOTERVALUE "Sayfa &p" STRING_NOTEPAD "Not Defteri" - STRING_ERROR "HATA" - STRING_WARNING "UYARI" + STRING_ERROR "Hata" + STRING_WARNING "Uyarı" STRING_INFO "Bilgi" STRING_UNTITLED "Adsız" STRING_ALL_FILES "Tüm Dosyalar (*.*)" @@ -173,12 +173,12 @@ BEGIN STRING_LINE_COLUMN "%d. Satır, %d. Sütun" STRING_PRINTERROR """%s"" dosyası yazdırılamıyor.\n\nYazıcının açık olduğundan ve doğru yapılandırıldığından emin olunuz." STRING_DEFAULTFONT "Lucida Console" - STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." - STRING_NOWPRINTING "Now printing page..." - STRING_PRINTCANCELING "The print job is being canceled..." - STRING_PRINTCOMPLETE "Printing is successfully done." - STRING_PRINTCANCELED "Printing has been canceled." - STRING_PRINTFAILED "Printing is failed." + STRING_LINE_NUMBER_OUT_OF_RANGE "Belirtilen satır numarası aralık dışında." + STRING_NOWPRINTING "Belge yazdırılıyor..." + STRING_PRINTCANCELING "Yazdırma işi iptal ediliyor..." + STRING_PRINTCOMPLETE "Yazdırma işlemi başarılıyla tamamlandı!" + STRING_PRINTCANCELED "Yazdırma işlemi iptal rdildi." + STRING_PRINTFAILED "Yazdırma işlemi başarısız oldu." STRING_TEXT_DOCUMENT "Metin Belgesi" STRING_NOTEPAD_AUTHORS "Telif Hakları: 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" From 4495e8b7db743a4c48aebc3bd92a7d00da69d0cd Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Thu, 5 Oct 2023 19:51:36 +0900 Subject: [PATCH 57/74] [MSPAINT] Fix assertion failure on text tool (#5762) Kill the assertion failure on choosing text tool. Check whether textEditWindow is not null by using IsWindowVisible. CORE-19094 --- base/applications/mspaint/mouse.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 793efedf3ec..8412cc027c0 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -762,7 +762,8 @@ struct TextTool : ToolBase void OnFinishDraw() override { - if (textEditWindow.GetWindowTextLength() > 0) + if (::IsWindowVisible(textEditWindow) && + textEditWindow.GetWindowTextLength() > 0) { imageModel.PushImageForUndo(); draw(m_hdc); From 90c80a8dd4ffa8090ef7ef305aeb929c288ae2a7 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Thu, 5 Oct 2023 20:01:41 +0900 Subject: [PATCH 58/74] [MSPAINT] Update scroll info on loading file (#5761) The scroll info was not updated when the file is loading. - Rename CCanvasWindow::Update as CCanvasWindow::updateScrollInfo. - Update scroll info on ImageModel::NotifyImageChanged. - Improve ImageModel::ClearHistory. CORE-19094 --- base/applications/mspaint/canvas.cpp | 8 ++++---- base/applications/mspaint/canvas.h | 2 +- base/applications/mspaint/dib.cpp | 6 ++++++ base/applications/mspaint/history.cpp | 17 +++++++++++++++-- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index d62779f39a6..a4eeead446b 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -180,7 +180,7 @@ VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) ::DeleteDC(hdcMem0); } -VOID CCanvasWindow::Update(HWND hwndFrom) +VOID CCanvasWindow::updateScrollInfo() { CRect rcClient; GetClientRect(&rcClient); @@ -214,7 +214,7 @@ VOID CCanvasWindow::Update(HWND hwndFrom) LRESULT CCanvasWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (m_hWnd) - Update(m_hWnd); + updateScrollInfo(); return 0; } @@ -245,7 +245,7 @@ VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar) break; } SetScrollInfo(fnBar, &si); - Update(m_hWnd); + updateScrollInfo(); Invalidate(FALSE); // FIXME: Flicker } @@ -627,7 +627,7 @@ LRESULT CCanvasWindow::OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, m_hitCanvasSizeBox = HIT_NONE; toolsModel.resetTool(); // resets the point-buffer of the polygon and bezier functions - Update(NULL); + updateScrollInfo(); Invalidate(TRUE); return 0; } diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index db0e549837b..dc26707be24 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -42,7 +42,7 @@ class CCanvasWindow : public CWindowImpl VOID cancelDrawing(); VOID finishDrawing(); - VOID Update(HWND hwndFrom); + VOID updateScrollInfo(); VOID ImageToCanvas(POINT& pt); VOID ImageToCanvas(RECT& rc); diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index ee27d23141b..8cb5735419f 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -274,8 +274,14 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) CImageDx img; float xDpi, yDpi; HRESULT hr = img.LoadDx(name, &xDpi, &yDpi); + if (FAILED(hr) && fIsMainFile) + { + imageModel.ClearHistory(); + hr = img.LoadDx(name, &xDpi, &yDpi); + } if (FAILED(hr)) { + ATLTRACE("hr: 0x%08lX\n", hr); ShowError(IDS_LOADERRORTEXT, name); return NULL; } diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 9e924b9e3db..05990df42b8 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -15,9 +15,13 @@ ImageModel imageModel; void ImageModel::NotifyImageChanged() { if (canvasWindow.IsWindow()) - canvasWindow.Invalidate(FALSE); + { + canvasWindow.updateScrollInfo(); + canvasWindow.Invalidate(); + } + if (miniature.IsWindow()) - miniature.Invalidate(FALSE); + miniature.Invalidate(); } ImageModel::ImageModel() @@ -99,6 +103,15 @@ void ImageModel::ResetToPrevious() void ImageModel::ClearHistory() { + for (int i = 0; i < HISTORYSIZE; ++i) + { + if (m_hBms[i] && i != m_currInd) + { + ::DeleteObject(m_hBms[i]); + m_hBms[i] = NULL; + } + } + m_undoSteps = 0; m_redoSteps = 0; } From 74b59a07900c85d53c918f2ed1b207650f477377 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Mon, 9 Oct 2023 08:07:02 +0900 Subject: [PATCH 59/74] [MSPAINT] Zoom tool shouldn't use undo buffer (#5778) Remove PushImageForUndo call in Zoom tool. CORE-19214 --- base/applications/mspaint/mouse.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 8412cc027c0..20a8e2157e4 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -571,7 +571,6 @@ struct ZoomTool : ToolBase void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { - imageModel.PushImageForUndo(); if (bLeftButton) { if (toolsModel.GetZoom() < MAX_ZOOM) From 555f892e6635d8aaee70b3728657abf0c051205f Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Mon, 9 Oct 2023 08:37:31 +0900 Subject: [PATCH 60/74] [MSPAINT] Add border width to tool box (#5780) Make tool box pixel-perfect. Add two border widths to the tool box. CORE-19217 --- base/applications/mspaint/toolbox.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/base/applications/mspaint/toolbox.cpp b/base/applications/mspaint/toolbox.cpp index 54d5bd8c2a4..891093f3f77 100644 --- a/base/applications/mspaint/toolbox.cpp +++ b/base/applications/mspaint/toolbox.cpp @@ -34,7 +34,12 @@ CPaintToolBar::ToolBarWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam BOOL CPaintToolBar::DoCreate(HWND hwndParent) { // NOTE: The horizontal line above the toolbar is hidden by CCS_NODIVIDER style. - RECT toolbarPos = { 0, 0, CX_TOOLBAR, CY_TOOLBAR }; + RECT toolbarPos = + { + 0, 0, + CX_TOOLBAR + 2 * GetSystemMetrics(SM_CXBORDER), + CY_TOOLBAR + 2 * GetSystemMetrics(SM_CYBORDER) + }; DWORD style = WS_CHILD | WS_VISIBLE | CCS_NOPARENTALIGN | CCS_VERT | CCS_NORESIZE | TBSTYLE_TOOLTIPS | TBSTYLE_FLAT; if (!CWindow::Create(TOOLBARCLASSNAME, hwndParent, toolbarPos, NULL, style)) From ce30dcf5a56b8ab5b40e74f8fb425c5a844fc61c Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Mon, 9 Oct 2023 08:39:31 +0900 Subject: [PATCH 61/74] [MSPAINT] Check out of image in updating status bar (#5779) Check out of the image by using ::PtInRect and CCanvasWindow::GetImageRect. If out, then don't show the status bar text. CORE-19219 --- base/applications/mspaint/canvas.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index a4eeead446b..ae860cb4d24 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -400,8 +400,12 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL if (!m_drawing) { + RECT rcImage; + GetImageRect(rcImage); + CString strCoord; - strCoord.Format(_T("%ld, %ld"), pt.x, pt.y); + if (::PtInRect(&rcImage, pt)) + strCoord.Format(_T("%ld, %ld"), pt.x, pt.y); ::SendMessage(g_hStatusBar, SB_SETTEXT, 1, (LPARAM) (LPCTSTR) strCoord); } } From 260ecd1e953dd3b74f54f2eed2b5e03f49a5645e Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Mon, 9 Oct 2023 09:24:27 +0900 Subject: [PATCH 62/74] [MSPAINT] Improve Zoom tool --- base/applications/mspaint/canvas.cpp | 23 +++------------------- base/applications/mspaint/canvas.h | 1 - base/applications/mspaint/mouse.cpp | 15 ++++++++++++++ base/applications/mspaint/toolsettings.cpp | 5 ++++- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index ae860cb4d24..17eb2610ae2 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -29,18 +29,6 @@ CCanvasWindow::~CCanvasWindow() ::DeleteObject(m_ahbmCached[1]); } -VOID CCanvasWindow::drawZoomFrame(INT mouseX, INT mouseY) -{ - // FIXME: Draw the border of the area that is to be zoomed in - CRect rc; - GetImageRect(rc); - ImageToCanvas(rc); - - HDC hdc = GetDC(); - DrawXorRect(hdc, &rc); - ReleaseDC(hdc); -} - RECT CCanvasWindow::GetBaseRect() { CRect rcBase; @@ -376,6 +364,9 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; CanvasToImage(pt); + if (toolsModel.GetActiveTool() == TOOL_ZOOM) + Invalidate(); + if (m_hitSelection != HIT_NONE) { SelectionDragging(pt); @@ -384,14 +375,6 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL if (!m_drawing || toolsModel.GetActiveTool() <= TOOL_AIRBRUSH) { - if (toolsModel.GetActiveTool() == TOOL_ZOOM) - { - Invalidate(FALSE); - UpdateWindow(); - CanvasToImage(pt); - drawZoomFrame(pt.x, pt.y); - } - TRACKMOUSEEVENT tme = { sizeof(tme) }; tme.dwFlags = TME_LEAVE; tme.hwndTrack = m_hWnd; diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index dc26707be24..19920018214 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -62,7 +62,6 @@ class CCanvasWindow : public CWindowImpl RECT GetBaseRect(); VOID DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint); VOID OnHVScroll(WPARAM wParam, INT fnBar); - VOID drawZoomFrame(INT mouseX, INT mouseY); HITTEST SelectionHitTest(POINT ptImage); VOID StartSelectionDrag(HITTEST hit, POINT ptImage); diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 20a8e2157e4..4984ab63432 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -569,6 +569,21 @@ struct ZoomTool : ToolBase { } + void OnDrawOverlayOnCanvas(HDC hdc) override + { + CRect rc; + canvasWindow.GetImageRect(rc); + canvasWindow.ImageToCanvas(rc); + + POINT pt; + ::GetCursorPos(&pt); + ::ScreenToClient(canvasWindow, &pt); + + // FIXME: Draw the border of the area that is to be zoomed in + if (rc.PtInRect(pt)) + DrawXorRect(hdc, &rc); + } + void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { if (bLeftButton) diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index 555f5aa92f9..91ce61b8649 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -285,7 +285,10 @@ LRESULT CToolSettingsWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, W m_hTranspIcon = (HICON)LoadImage(g_hinstExe, MAKEINTRESOURCE(IDI_TRANSPARENT), IMAGE_ICON, CX_TRANS_ICON, CY_TRANS_ICON, LR_DEFAULTCOLOR); - RECT trackbarZoomPos = {1, 1, 1 + 40, 1 + 64}; + RECT trackbarZoomPos, rect2; + calculateTwoBoxes(trackbarZoomPos, rect2); + ::InflateRect(&trackbarZoomPos, -1, -1); + trackbarZoom.Create(TRACKBAR_CLASS, m_hWnd, trackbarZoomPos, NULL, WS_CHILD | TBS_VERT | TBS_AUTOTICKS); trackbarZoom.SendMessage(TBM_SETRANGE, (WPARAM) TRUE, MAKELPARAM(0, 6)); trackbarZoom.SendMessage(TBM_SETPOS, (WPARAM) TRUE, (LPARAM) 3); From 4b878f2db796448b7d99ea00dfb052b2f74fd7ad Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Tue, 10 Oct 2023 10:59:29 +0900 Subject: [PATCH 63/74] [MSPAINT] Improve Zoom tool (#5781) - Delete CCanvasWindow::drawZoomFrame. - Invalidate the canvas on mouse move when the active tool is Zoom tool. - Add ZoomTool::OnDrawOverlayOnCanvas to draw the zoom rectangle without flickering. - Improve the zoom trackbar position. - Display the zoom rate on changing the value of the zoom trackbar. - Reverse the direction of the zoom trackbar. - Don't draw the focus rectangle. CORE-19215, CORE-19216 --- base/applications/mspaint/toolsettings.cpp | 42 +++++++++++++++++----- base/applications/mspaint/toolsettings.h | 2 ++ 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index 91ce61b8649..089bf6da6a8 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -21,6 +21,10 @@ #define MARGIN1 3 #define MARGIN2 2 +#define MAX_ZOOM_TRACK 6 +#define MIN_ZOOM_TRACK 0 +#define DEFAULT_ZOOM_TRACK 3 + static const BYTE s_AirRadius[4] = { 5, 8, 3, 12 }; CToolSettingsWindow toolSettingsWindow; @@ -290,8 +294,8 @@ LRESULT CToolSettingsWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, W ::InflateRect(&trackbarZoomPos, -1, -1); trackbarZoom.Create(TRACKBAR_CLASS, m_hWnd, trackbarZoomPos, NULL, WS_CHILD | TBS_VERT | TBS_AUTOTICKS); - trackbarZoom.SendMessage(TBM_SETRANGE, (WPARAM) TRUE, MAKELPARAM(0, 6)); - trackbarZoom.SendMessage(TBM_SETPOS, (WPARAM) TRUE, (LPARAM) 3); + trackbarZoom.SendMessage(TBM_SETRANGE, TRUE, MAKELPARAM(MIN_ZOOM_TRACK, MAX_ZOOM_TRACK)); + trackbarZoom.SendMessage(TBM_SETPOS, TRUE, DEFAULT_ZOOM_TRACK); return 0; } @@ -304,9 +308,30 @@ LRESULT CToolSettingsWindow::OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT CToolSettingsWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (!zoomTo(125 << trackbarZoom.SendMessage(TBM_GETPOS, 0, 0), 0, 0)) + INT trackPos = MAX_ZOOM_TRACK - (INT)trackbarZoom.SendMessage(TBM_GETPOS, 0, 0); + zoomTo(MIN_ZOOM << trackPos, 0, 0); + + INT zoomRate = toolsModel.GetZoom(); + + CString strZoom; + if (zoomRate % 10 == 0) + strZoom.Format(_T("%d%%"), zoomRate / 10); + else + strZoom.Format(_T("%d.%d%%"), zoomRate / 10, zoomRate % 10); + + ::SendMessage(g_hStatusBar, SB_SETTEXT, 1, (LPARAM)(LPCTSTR)strZoom); + + OnToolsModelZoomChanged(nMsg, wParam, lParam, bHandled); + return 0; +} + +LRESULT CToolSettingsWindow::OnNotify(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + NMHDR *pnmhdr = (NMHDR*)lParam; + if (pnmhdr->code == NM_CUSTOMDRAW) { - OnToolsModelZoomChanged(nMsg, wParam, lParam, bHandled); + NMCUSTOMDRAW *pCustomDraw = (NMCUSTOMDRAW*)pnmhdr; + pCustomDraw->uItemState &= ~CDIS_FOCUS; // Do not draw the focus } return 0; } @@ -333,9 +358,7 @@ LRESULT CToolSettingsWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BO PAINTSTRUCT ps; HDC hdc = BeginPaint(&ps); - if (toolsModel.GetActiveTool() == TOOL_ZOOM) - ::DrawEdge(hdc, &rect1, BDR_SUNKENOUTER, BF_RECT); - else + if (toolsModel.GetActiveTool() != TOOL_ZOOM) ::DrawEdge(hdc, &rect1, BDR_SUNKENOUTER, BF_RECT | BF_MIDDLE); if (toolsModel.GetActiveTool() >= TOOL_RECT) @@ -461,7 +484,7 @@ LRESULT CToolSettingsWindow::OnToolsModelSettingsChanged(UINT nMsg, WPARAM wPara LRESULT CToolSettingsWindow::OnToolsModelZoomChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - int tbPos = 0; + int tbPos = MIN_ZOOM_TRACK; int tempZoom = toolsModel.GetZoom(); while (tempZoom > MIN_ZOOM) @@ -469,6 +492,7 @@ LRESULT CToolSettingsWindow::OnToolsModelZoomChanged(UINT nMsg, WPARAM wParam, L tbPos++; tempZoom = tempZoom >> 1; } - trackbarZoom.SendMessage(TBM_SETPOS, (WPARAM) TRUE, (LPARAM) tbPos); + + trackbarZoom.SendMessage(TBM_SETPOS, TRUE, MAX_ZOOM_TRACK - tbPos); return 0; } diff --git a/base/applications/mspaint/toolsettings.h b/base/applications/mspaint/toolsettings.h index be9b09928dd..2c200c333f2 100644 --- a/base/applications/mspaint/toolsettings.h +++ b/base/applications/mspaint/toolsettings.h @@ -17,6 +17,7 @@ class CToolSettingsWindow : public CWindowImpl MESSAGE_HANDLER(WM_VSCROLL, OnVScroll) MESSAGE_HANDLER(WM_PAINT, OnPaint) MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) + MESSAGE_HANDLER(WM_NOTIFY, OnNotify) MESSAGE_HANDLER(WM_TOOLSMODELTOOLCHANGED, OnToolsModelToolChanged) MESSAGE_HANDLER(WM_TOOLSMODELSETTINGSCHANGED, OnToolsModelSettingsChanged) MESSAGE_HANDLER(WM_TOOLSMODELZOOMCHANGED, OnToolsModelZoomChanged) @@ -43,6 +44,7 @@ class CToolSettingsWindow : public CWindowImpl LRESULT OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnNotify(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnToolsModelSettingsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnToolsModelZoomChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); From 4663724bfdcf93e36a3d026a269846a5db7cbab3 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Thu, 12 Oct 2023 19:13:20 +0900 Subject: [PATCH 64/74] [MSPAINT] s/WINBOOL/BOOL/ CORE-19094 --- base/applications/mspaint/toolsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index 089bf6da6a8..0ce4ee709c8 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -281,7 +281,7 @@ VOID CToolSettingsWindow::drawBox(HDC hdc, LPCRECT prc) } } -LRESULT CToolSettingsWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, WINBOOL& bHandled) +LRESULT CToolSettingsWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { /* preloading the draw transparent/nontransparent icons for later use */ m_hNontranspIcon = (HICON)LoadImage(g_hinstExe, MAKEINTRESOURCE(IDI_NONTRANSPARENT), From b302d7f24ea6e0193558030798fd6fafc84562ce Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Thu, 12 Oct 2023 19:31:22 +0900 Subject: [PATCH 65/74] [MSPAINT] Do type-cast (BOOL) for TB_ISBUTTONCHECKED return CORE-19094 --- base/applications/mspaint/dialogs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index 9cda67b3d72..faaf5d3fbfa 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -504,7 +504,7 @@ LRESULT CFontsDialog::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b UINT id = LOWORD(wParam); UINT codeNotify = HIWORD(wParam); HWND hwndToolbar = GetDlgItem(IDD_FONTSTOOLBAR); - BOOL bChecked = ::SendMessage(hwndToolbar, TB_ISBUTTONCHECKED, id, 0); + BOOL bChecked = (BOOL)::SendMessage(hwndToolbar, TB_ISBUTTONCHECKED, id, 0); switch (id) { From 92c0908afdcb1613e3406b35119119075d730b6e Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Thu, 12 Oct 2023 19:38:41 +0900 Subject: [PATCH 66/74] [MSPAINT] Do type-cast (BYTE) for lfItalic and lfUnderline CORE-19094 --- base/applications/mspaint/textedit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index 376b1214045..39cc1ba40e3 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -340,8 +340,8 @@ void CTextEditWindow::UpdateFont() ZeroMemory(&lf, sizeof(lf)); lf.lfCharSet = DEFAULT_CHARSET; // registrySettings.CharSet; // Ignore lf.lfWeight = (registrySettings.Bold ? FW_BOLD : FW_NORMAL); - lf.lfItalic = registrySettings.Italic; - lf.lfUnderline = registrySettings.Underline; + lf.lfItalic = (BYTE)registrySettings.Italic; + lf.lfUnderline = (BYTE)registrySettings.Underline; lstrcpyn(lf.lfFaceName, registrySettings.strFontName, _countof(lf.lfFaceName)); HDC hdc = GetDC(); From 91d322be11aa5e4a253a036c214b90ecac8ba1af Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Thu, 12 Oct 2023 19:43:29 +0900 Subject: [PATCH 67/74] [MSPAINT] Do type-cast (float) for xDpi and yDpi CORE-19094 --- base/applications/mspaint/dib.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 8cb5735419f..61dfcca5c16 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -231,8 +231,8 @@ HBITMAP InitializeImage(LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) return NULL; HDC hScreenDC = ::GetDC(NULL); - g_xDpi = ::GetDeviceCaps(hScreenDC, LOGPIXELSX); - g_yDpi = ::GetDeviceCaps(hScreenDC, LOGPIXELSY); + g_xDpi = (float)::GetDeviceCaps(hScreenDC, LOGPIXELSX); + g_yDpi = (float)::GetDeviceCaps(hScreenDC, LOGPIXELSY); ::ReleaseDC(NULL, hScreenDC); return SetBitmapAndInfo(hBitmap, name, pFound, isFile); @@ -272,7 +272,7 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) // load the image CImageDx img; - float xDpi, yDpi; + float xDpi = 0, yDpi = 0; HRESULT hr = img.LoadDx(name, &xDpi, &yDpi); if (FAILED(hr) && fIsMainFile) { @@ -290,12 +290,16 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) if (!fIsMainFile) return hBitmap; + if (xDpi <= 0 || yDpi <= 0) + { + HDC hDC = ::GetDC(NULL); + xDpi = (float)::GetDeviceCaps(hDC, LOGPIXELSX); + yDpi = (float)::GetDeviceCaps(hDC, LOGPIXELSY); + ::ReleaseDC(NULL, hDC); + } + g_xDpi = xDpi; g_yDpi = yDpi; - if (g_xDpi <= 0) - g_xDpi = 96; - if (g_yDpi <= 0) - g_yDpi = 96; SetBitmapAndInfo(hBitmap, name, &find, TRUE); return hBitmap; From c15d7d164590034435fc9114583443199f7c211e Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Thu, 12 Oct 2023 22:59:17 +0900 Subject: [PATCH 68/74] [MSPAINT] Reset scroll position in some situations (#5789) In some situations, the scroll position should be reset. - Add CCanvasWindow::resetScrollPos method. - Reset the scroll position on loading a file. - Reset the scroll position on mirroring/rotating the image. CORE-19094 --- base/applications/mspaint/canvas.cpp | 6 ++++++ base/applications/mspaint/canvas.h | 1 + base/applications/mspaint/dib.cpp | 1 + base/applications/mspaint/winproc.cpp | 1 + 4 files changed, 9 insertions(+) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 17eb2610ae2..680acd6fe56 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -199,6 +199,12 @@ VOID CCanvasWindow::updateScrollInfo() SetScrollInfo(SB_VERT, &si); } +VOID CCanvasWindow::resetScrollPos() +{ + SetScrollPos(SB_HORZ, 0); + SetScrollPos(SB_VERT, 0); +} + LRESULT CCanvasWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (m_hWnd) diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index 19920018214..193d7603abd 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -43,6 +43,7 @@ class CCanvasWindow : public CWindowImpl VOID cancelDrawing(); VOID finishDrawing(); VOID updateScrollInfo(); + VOID resetScrollPos(); VOID ImageToCanvas(POINT& pt); VOID ImageToCanvas(RECT& rc); diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 61dfcca5c16..de42221ce73 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -241,6 +241,7 @@ HBITMAP InitializeImage(LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) { // update image + canvasWindow.resetScrollPos(); imageModel.PushImageForUndo(hBitmap); imageModel.ClearHistory(); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 72d74001f8e..b2e913cbc04 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -912,6 +912,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH case IDM_IMAGEROTATEMIRROR: { CWaitCursor waitCursor; + canvasWindow.resetScrollPos(); switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) { case 1: /* flip horizontally */ From 30c4d281ea1f2853f86068cbdf74d70b8d938f22 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Tue, 17 Oct 2023 07:25:50 +0900 Subject: [PATCH 69/74] [MSPAINT] Improve Zoom tool (#5798) - Delete global zoomTo function. - Add CCanvasWindow::zoomTo and CCanvasWindow::getNewZoomRect functions. - Rename CCanvasWindow::updateScrollInfo as CCanvasWindow::updateScrollRange. - Rename CCanvasWindow::resetScrollPos as CCanvasWindow::updateScrollPos. - Draw the proper zoom rectangle on mouse move. - Revert the active tool on click when the tool was Zoom. CORE-19094 --- base/applications/mspaint/canvas.cpp | 57 +++++++++++++++++--- base/applications/mspaint/canvas.h | 6 ++- base/applications/mspaint/common.h | 1 - base/applications/mspaint/dib.cpp | 2 +- base/applications/mspaint/history.cpp | 2 +- base/applications/mspaint/mouse.cpp | 61 ++++++++++++++++------ base/applications/mspaint/toolsettings.cpp | 2 +- base/applications/mspaint/winproc.cpp | 55 +++++-------------- 8 files changed, 113 insertions(+), 73 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 680acd6fe56..95fbf4e5b9d 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -89,6 +89,49 @@ HITTEST CCanvasWindow::CanvasHitTest(POINT pt) return getSizeBoxHitTest(pt, &rcBase); } +VOID CCanvasWindow::getNewZoomRect(CRect& rcView, INT newZoom, CPoint ptTarget) +{ + CRect rcImage; + GetImageRect(rcImage); + ImageToCanvas(rcImage); + + // Calculate the zoom rectangle + INT oldZoom = toolsModel.GetZoom(); + GetClientRect(rcView); + LONG cxView = rcView.right * oldZoom / newZoom, cyView = rcView.bottom * oldZoom / newZoom; + ::SetRect(&rcView, ptTarget.x - cxView / 2, ptTarget.y - cyView / 2, + ptTarget.x + cxView / 2, ptTarget.y + cyView / 2); + + // Shift the rectangle if necessary + INT dx = 0, dy = 0; + if (rcView.left < rcImage.left) + dx = rcImage.left - rcView.left; + else if (rcImage.right < rcView.right) + dx = rcImage.right - rcView.right; + if (rcView.top < rcImage.top) + dy = rcImage.top - rcView.top; + else if (rcImage.bottom < rcView.bottom) + dy = rcImage.bottom - rcView.bottom; + rcView.OffsetRect(dx, dy); + + rcView.IntersectRect(&rcView, &rcImage); +} + +VOID CCanvasWindow::zoomTo(INT newZoom, LONG left, LONG top) +{ + POINT pt = { left, top }; + CanvasToImage(pt); + + toolsModel.SetZoom(newZoom); + ImageToCanvas(pt); + pt.x += GetScrollPos(SB_HORZ); + pt.y += GetScrollPos(SB_VERT); + + updateScrollRange(); + updateScrollPos(pt.x, pt.y); + Invalidate(TRUE); +} + VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) { // We use a memory bitmap to reduce flickering @@ -168,7 +211,7 @@ VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) ::DeleteDC(hdcMem0); } -VOID CCanvasWindow::updateScrollInfo() +VOID CCanvasWindow::updateScrollRange() { CRect rcClient; GetClientRect(&rcClient); @@ -199,16 +242,16 @@ VOID CCanvasWindow::updateScrollInfo() SetScrollInfo(SB_VERT, &si); } -VOID CCanvasWindow::resetScrollPos() +VOID CCanvasWindow::updateScrollPos(INT x, INT y) { - SetScrollPos(SB_HORZ, 0); - SetScrollPos(SB_VERT, 0); + SetScrollPos(SB_HORZ, x); + SetScrollPos(SB_VERT, y); } LRESULT CCanvasWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (m_hWnd) - updateScrollInfo(); + updateScrollRange(); return 0; } @@ -239,7 +282,7 @@ VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar) break; } SetScrollInfo(fnBar, &si); - updateScrollInfo(); + updateScrollRange(); Invalidate(FALSE); // FIXME: Flicker } @@ -620,7 +663,7 @@ LRESULT CCanvasWindow::OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, m_hitCanvasSizeBox = HIT_NONE; toolsModel.resetTool(); // resets the point-buffer of the polygon and bezier functions - updateScrollInfo(); + updateScrollRange(); Invalidate(TRUE); return 0; } diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index 193d7603abd..21a6e11ecfa 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -42,8 +42,8 @@ class CCanvasWindow : public CWindowImpl VOID cancelDrawing(); VOID finishDrawing(); - VOID updateScrollInfo(); - VOID resetScrollPos(); + VOID updateScrollRange(); + VOID updateScrollPos(INT x = 0, INT y = 0); VOID ImageToCanvas(POINT& pt); VOID ImageToCanvas(RECT& rc); @@ -51,6 +51,8 @@ class CCanvasWindow : public CWindowImpl VOID CanvasToImage(RECT& rc, BOOL bZoomed = FALSE); VOID GetImageRect(RECT& rc); VOID MoveSelection(INT xDelta, INT yDelta); + VOID getNewZoomRect(CRect& rcView, INT newZoom, CPoint ptTarget); + VOID zoomTo(INT newZoom, LONG left = 0, LONG top = 0); protected: HITTEST m_hitSelection; diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index d2e862b0114..3dda6703441 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -43,7 +43,6 @@ enum HITTEST // hit /* FUNCTIONS ********************************************************/ -BOOL zoomTo(int newZoom, int mouseX, int mouseY); BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1); BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName); diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index de42221ce73..39afda30b81 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -241,7 +241,7 @@ HBITMAP InitializeImage(LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isFile) { // update image - canvasWindow.resetScrollPos(); + canvasWindow.updateScrollPos(); imageModel.PushImageForUndo(hBitmap); imageModel.ClearHistory(); diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 05990df42b8..2d28cb5def2 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -16,7 +16,7 @@ void ImageModel::NotifyImageChanged() { if (canvasWindow.IsWindow()) { - canvasWindow.updateScrollInfo(); + canvasWindow.updateScrollRange(); canvasWindow.Invalidate(); } diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 4984ab63432..423f876c32b 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -565,40 +565,67 @@ struct ColorTool : ToolBase // TOOL_ZOOM struct ZoomTool : ToolBase { + BOOL m_bZoomed = FALSE; + ZoomTool() : ToolBase(TOOL_ZOOM) { } + BOOL getNewZoomRect(CRect& rcView, INT newZoom); + void OnDrawOverlayOnCanvas(HDC hdc) override { - CRect rc; - canvasWindow.GetImageRect(rc); - canvasWindow.ImageToCanvas(rc); - - POINT pt; - ::GetCursorPos(&pt); - ::ScreenToClient(canvasWindow, &pt); - - // FIXME: Draw the border of the area that is to be zoomed in - if (rc.PtInRect(pt)) - DrawXorRect(hdc, &rc); + CRect rcView; + INT oldZoom = toolsModel.GetZoom(); + if (oldZoom < MAX_ZOOM && getNewZoomRect(rcView, oldZoom * 2)) + DrawXorRect(hdc, &rcView); } void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { + INT newZoom, oldZoom = toolsModel.GetZoom(); if (bLeftButton) - { - if (toolsModel.GetZoom() < MAX_ZOOM) - zoomTo(toolsModel.GetZoom() * 2, x, y); - } + newZoom = (oldZoom < MAX_ZOOM) ? (oldZoom * 2) : MIN_ZOOM; else + newZoom = (oldZoom > MIN_ZOOM) ? (oldZoom / 2) : MAX_ZOOM; + + m_bZoomed = FALSE; + + if (oldZoom != newZoom) { - if (toolsModel.GetZoom() > MIN_ZOOM) - zoomTo(toolsModel.GetZoom() / 2, x, y); + CRect rcView; + if (getNewZoomRect(rcView, newZoom)) + { + canvasWindow.zoomTo(newZoom, rcView.left, rcView.top); + m_bZoomed = TRUE; + } } } + + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override + { + if (m_bZoomed) + toolsModel.SetActiveTool(toolsModel.GetOldActiveTool()); + + return TRUE; + } }; +BOOL ZoomTool::getNewZoomRect(CRect& rcView, INT newZoom) +{ + CPoint pt; + ::GetCursorPos(&pt); + canvasWindow.ScreenToClient(&pt); + + canvasWindow.getNewZoomRect(rcView, newZoom, pt); + + CRect rc; + canvasWindow.GetImageRect(rc); + canvasWindow.ImageToCanvas(rc); + + return rc.PtInRect(pt); +} + // TOOL_PEN struct PenTool : SmoothDrawTool { diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index 0ce4ee709c8..64f09ed80e9 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -309,7 +309,7 @@ LRESULT CToolSettingsWindow::OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT CToolSettingsWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { INT trackPos = MAX_ZOOM_TRACK - (INT)trackbarZoom.SendMessage(TBM_GETPOS, 0, 0); - zoomTo(MIN_ZOOM << trackPos, 0, 0); + canvasWindow.zoomTo(MIN_ZOOM << trackPos); INT zoomRate = toolsModel.GetZoom(); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index b2e913cbc04..1cb79a3b6c2 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -41,37 +41,6 @@ static HWND DoHtmlHelpW(HWND hwndCaller, LPCWSTR pszFile, UINT uCommand, DWORD_P return s_pHtmlHelpW(hwndCaller, pszFile, uCommand, dwData); } -BOOL -zoomTo(int newZoom, int mouseX, int mouseY) -{ - int x, y, w, h; - RECT clientRectScrollbox; - canvasWindow.GetClientRect(&clientRectScrollbox); - - RECT clientRectImageArea; - ::SetRect(&clientRectImageArea, 0, 0, imageModel.GetWidth(), imageModel.GetHeight()); - Zoomed(clientRectImageArea); - - w = clientRectImageArea.right * newZoom / toolsModel.GetZoom(); - h = clientRectImageArea.bottom * newZoom / toolsModel.GetZoom(); - if (!w || !h) - { - return FALSE; - } - w = clientRectImageArea.right * clientRectScrollbox.right / w; - h = clientRectImageArea.bottom * clientRectScrollbox.bottom / h; - x = max(0, min(clientRectImageArea.right - w, mouseX - w / 2)) * newZoom / toolsModel.GetZoom(); - y = max(0, min(clientRectImageArea.bottom - h, mouseY - h / 2)) * newZoom / toolsModel.GetZoom(); - - toolsModel.SetZoom(newZoom); - - canvasWindow.Invalidate(TRUE); - - canvasWindow.SendMessage(WM_HSCROLL, MAKEWPARAM(SB_THUMBPOSITION, x), 0); - canvasWindow.SendMessage(WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, y), 0); - return TRUE; -} - void CMainWindow::alignChildrenToMainWindow() { RECT clientRect, rc; @@ -206,20 +175,20 @@ LRESULT CMainWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& { INT zDelta = (SHORT)HIWORD(wParam); - if (::GetAsyncKeyState(VK_CONTROL) < 0) + if (::GetKeyState(VK_CONTROL) < 0) // Ctrl+Wheel { if (zDelta < 0) { if (toolsModel.GetZoom() > MIN_ZOOM) - zoomTo(toolsModel.GetZoom() / 2, 0, 0); + canvasWindow.zoomTo(toolsModel.GetZoom() / 2); } else if (zDelta > 0) { if (toolsModel.GetZoom() < MAX_ZOOM) - zoomTo(toolsModel.GetZoom() * 2, 0, 0); + canvasWindow.zoomTo(toolsModel.GetZoom() * 2); } } - else + else // Wheel only { UINT nCount = 3; if (::GetAsyncKeyState(VK_SHIFT) < 0) @@ -912,7 +881,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH case IDM_IMAGEROTATEMIRROR: { CWaitCursor waitCursor; - canvasWindow.resetScrollPos(); + canvasWindow.updateScrollPos(); switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) { case 1: /* flip horizontally */ @@ -1045,25 +1014,25 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; case IDM_VIEWZOOM125: - zoomTo(125, 0, 0); + canvasWindow.zoomTo(125); break; case IDM_VIEWZOOM25: - zoomTo(250, 0, 0); + canvasWindow.zoomTo(250); break; case IDM_VIEWZOOM50: - zoomTo(500, 0, 0); + canvasWindow.zoomTo(500); break; case IDM_VIEWZOOM100: - zoomTo(1000, 0, 0); + canvasWindow.zoomTo(1000); break; case IDM_VIEWZOOM200: - zoomTo(2000, 0, 0); + canvasWindow.zoomTo(2000); break; case IDM_VIEWZOOM400: - zoomTo(4000, 0, 0); + canvasWindow.zoomTo(4000); break; case IDM_VIEWZOOM800: - zoomTo(8000, 0, 0); + canvasWindow.zoomTo(8000); break; case IDM_VIEWFULLSCREEN: From d2639e10eeabaa7930ca56245e62d9ba79c67171 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Tue, 17 Oct 2023 13:48:19 +0900 Subject: [PATCH 70/74] [MSPAINT] Simplify canvas mouse message handling (#5803) - Unify some mouse message handlers of CCanvasWindow. - Add CCanvasWindow::m_nMouseDownMsg member. CORE-19094 --- base/applications/mspaint/canvas.cpp | 54 +++++++++------------------- base/applications/mspaint/canvas.h | 25 ++++++------- 2 files changed, 26 insertions(+), 53 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 95fbf4e5b9d..696f7052c0c 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -298,10 +298,13 @@ LRESULT CCanvasWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& return 0; } -LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + m_nMouseDownMsg = nMsg; + BOOL bLeftButton = (m_nMouseDownMsg == WM_LBUTTONDOWN); + HITTEST hitSelection = SelectionHitTest(pt); if (hitSelection != HIT_NONE) { @@ -321,7 +324,7 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam } else { - canvasWindow.ClientToScreen(&pt); + ClientToScreen(&pt); mainWindow.TrackPopupMenu(pt, 0); } return 0; @@ -335,13 +338,13 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam case TOOL_BEZIER: case TOOL_SHAPE: toolsModel.OnCancelDraw(); - canvasWindow.Invalidate(); + Invalidate(); break; case TOOL_FREESEL: case TOOL_RECTSEL: toolsModel.OnFinishDraw(); - canvasWindow.Invalidate(); + Invalidate(); break; default: @@ -374,40 +377,21 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam return 0; } -LRESULT CCanvasWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonDown(TRUE, nMsg, wParam, lParam, bHandled); -} - -LRESULT CCanvasWindow::OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonDown(FALSE, nMsg, wParam, lParam, bHandled); -} - -LRESULT CCanvasWindow::OnLRButtonDblClk(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; CanvasToImage(pt); m_drawing = FALSE; - ReleaseCapture(); + ::ReleaseCapture(); + m_nMouseDownMsg = 0; - toolsModel.OnButtonDown(bLeftButton, pt.x, pt.y, TRUE); + toolsModel.OnButtonDown(nMsg == WM_LBUTTONDBLCLK, pt.x, pt.y, TRUE); toolsModel.resetTool(); Invalidate(FALSE); return 0; } -LRESULT CCanvasWindow::OnLButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonDblClk(TRUE, nMsg, wParam, lParam, bHandled); -} - -LRESULT CCanvasWindow::OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonDblClk(FALSE, nMsg, wParam, lParam, bHandled); -} - LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; @@ -600,13 +584,16 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL return 0; } -LRESULT CCanvasWindow::OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CCanvasWindow::OnButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; CanvasToImage(pt); ::ReleaseCapture(); + BOOL bLeftButton = (m_nMouseDownMsg == WM_LBUTTONDOWN); + m_nMouseDownMsg = 0; + if (m_drawing) { m_drawing = FALSE; @@ -668,16 +655,6 @@ LRESULT CCanvasWindow::OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, return 0; } -LRESULT CCanvasWindow::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonUp(TRUE, nMsg, wParam, lParam, bHandled); -} - -LRESULT CCanvasWindow::OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return OnLRButtonUp(FALSE, nMsg, wParam, lParam, bHandled); -} - LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (CWaitCursor::IsWaiting()) @@ -748,6 +725,7 @@ LRESULT CCanvasWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& { // Cancel dragging ::ReleaseCapture(); + m_nMouseDownMsg = 0; m_hitCanvasSizeBox = HIT_NONE; ::SetRectEmpty(&m_rcResizing); Invalidate(TRUE); diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index 21a6e11ecfa..238229e3b2b 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -20,13 +20,13 @@ class CCanvasWindow : public CWindowImpl MESSAGE_HANDLER(WM_HSCROLL, OnHScroll) MESSAGE_HANDLER(WM_VSCROLL, OnVScroll) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) - MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) - MESSAGE_HANDLER(WM_RBUTTONDOWN, OnRButtonDown) - MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnLButtonDblClk) - MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnRButtonDblClk) + MESSAGE_HANDLER(WM_LBUTTONDOWN, OnButtonDown) + MESSAGE_HANDLER(WM_RBUTTONDOWN, OnButtonDown) + MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnButtonDblClk) + MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnButtonDblClk) MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) - MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) - MESSAGE_HANDLER(WM_RBUTTONUP, OnRButtonUp) + MESSAGE_HANDLER(WM_LBUTTONUP, OnButtonUp) + MESSAGE_HANDLER(WM_RBUTTONUP, OnButtonUp) MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) MESSAGE_HANDLER(WM_MOUSEWHEEL, OnMouseWheel) MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) @@ -76,14 +76,8 @@ class CCanvasWindow : public CWindowImpl LRESULT OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnEraseBkgnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCancelMode(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); @@ -91,7 +85,8 @@ class CCanvasWindow : public CWindowImpl LRESULT OnCtlColorEdit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLRButtonDblClk(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + UINT m_nMouseDownMsg = 0; + LRESULT OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); }; From d247e262041bc06b5b83a53b8bc432b9084931d2 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Tue, 17 Oct 2023 15:58:34 +0900 Subject: [PATCH 71/74] [MSPAINT] Implement mouse middle button dragging (#5804) - Handle WM_MBUTTONDOWN and WM_MBUTTONUP messages. - Implement dragging by mouse middle button. - Add IDC_HANDDRAG cursor resource. CORE-19094 --- base/applications/mspaint/canvas.cpp | 33 ++++++++++++++++--- base/applications/mspaint/canvas.h | 2 ++ base/applications/mspaint/icons/handdrag.cur | Bin 0 -> 326 bytes base/applications/mspaint/resource.h | 1 + base/applications/mspaint/rsrc.rc | 1 + 5 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 base/applications/mspaint/icons/handdrag.cur diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 696f7052c0c..6453270ca12 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -266,7 +266,7 @@ VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar) { case SB_THUMBTRACK: case SB_THUMBPOSITION: - si.nPos = HIWORD(wParam); + si.nPos = (SHORT)HIWORD(wParam); break; case SB_LINELEFT: si.nPos -= 5; @@ -281,9 +281,9 @@ VOID CCanvasWindow::OnHVScroll(WPARAM wParam, INT fnBar) si.nPos += si.nPage; break; } + si.nPos = max(min(si.nPos, si.nMax), si.nMin); SetScrollInfo(fnBar, &si); - updateScrollRange(); - Invalidate(FALSE); // FIXME: Flicker + Invalidate(); } LRESULT CCanvasWindow::OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -303,7 +303,15 @@ LRESULT CCanvasWindow::OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; m_nMouseDownMsg = nMsg; - BOOL bLeftButton = (m_nMouseDownMsg == WM_LBUTTONDOWN); + BOOL bLeftButton = (nMsg == WM_LBUTTONDOWN); + + if (nMsg == WM_MBUTTONDOWN) + { + m_ptOrig = pt; + SetCapture(); + ::SetCursor(::LoadCursor(g_hinstExe, MAKEINTRESOURCE(IDC_HANDDRAG))); + return 0; + } HITTEST hitSelection = SelectionHitTest(pt); if (hitSelection != HIT_NONE) @@ -395,6 +403,17 @@ LRESULT CCanvasWindow::OnButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, B LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + + if (m_nMouseDownMsg == WM_MBUTTONDOWN) + { + INT x = GetScrollPos(SB_HORZ) - (pt.x - m_ptOrig.x); + INT y = GetScrollPos(SB_VERT) - (pt.y - m_ptOrig.y); + SendMessage(WM_HSCROLL, MAKEWPARAM(SB_THUMBPOSITION, x), 0); + SendMessage(WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, y), 0); + m_ptOrig = pt; + return 0; + } + CanvasToImage(pt); if (toolsModel.GetActiveTool() == TOOL_ZOOM) @@ -663,6 +682,12 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL return 0; } + if (m_nMouseDownMsg == WM_MBUTTONDOWN) + { + ::SetCursor(::LoadCursor(g_hinstExe, MAKEINTRESOURCE(IDC_HANDDRAG))); + return 0; + } + POINT pt; ::GetCursorPos(&pt); ScreenToClient(&pt); diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index 238229e3b2b..76e7225ccfd 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -22,11 +22,13 @@ class CCanvasWindow : public CWindowImpl MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) MESSAGE_HANDLER(WM_LBUTTONDOWN, OnButtonDown) MESSAGE_HANDLER(WM_RBUTTONDOWN, OnButtonDown) + MESSAGE_HANDLER(WM_MBUTTONDOWN, OnButtonDown) MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnButtonDblClk) MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnButtonDblClk) MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) MESSAGE_HANDLER(WM_LBUTTONUP, OnButtonUp) MESSAGE_HANDLER(WM_RBUTTONUP, OnButtonUp) + MESSAGE_HANDLER(WM_MBUTTONUP, OnButtonUp) MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) MESSAGE_HANDLER(WM_MOUSEWHEEL, OnMouseWheel) MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) diff --git a/base/applications/mspaint/icons/handdrag.cur b/base/applications/mspaint/icons/handdrag.cur new file mode 100644 index 0000000000000000000000000000000000000000..74e5ba6b9c2b8e84d7696ce289ed5ba5296f4efa GIT binary patch literal 326 zcmZ|Ku?@m75CzchP*9;z(c+Sl4Z Date: Fri, 13 Oct 2023 18:07:55 +0900 Subject: [PATCH 72/74] [MSPAINT] Don't include useless CORE-19094 --- base/applications/mspaint/main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index bc72dd35a3b..d5100fa197c 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -8,7 +8,6 @@ #include "precomp.h" #include -#include POINT g_ptStart, g_ptEnd; BOOL g_askBeforeEnlarging = FALSE; // TODO: initialize from registry From 579e727ac372cc9d94f3fd95e0aa9b92ffb61e38 Mon Sep 17 00:00:00 2001 From: WindowsFan9600 Date: Sat, 21 Oct 2023 18:22:22 +0300 Subject: [PATCH 73/74] [MSPAINT] Improve translation and translate missing strings --- base/applications/mspaint/lang/tr-TR.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index dd79bd24c4f..9567339af76 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -89,7 +89,7 @@ BEGIN BEGIN MENUITEM "&Renk Paletini Düzenle...", IDM_COLORSEDITPALETTE MENUITEM SEPARATOR - MENUITEM "&Çağdaş Renk Paleti", IDM_COLORSMODERNPALETTE + MENUITEM "&Yeni Renk Paleti", IDM_COLORSMODERNPALETTE MENUITEM "&Eski Renk Paleti", IDM_COLORSOLDPALETTE END POPUP "&Yardım" @@ -265,8 +265,8 @@ BEGIN IDS_UNDERLINE "Altı Çizgili" IDS_VERTICAL "Düşey" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" - IDS_CANTSENDMAIL "Failed to send a mail." - IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" + IDS_CANTPASTE "Panodan yapıştırma işlemi başarısız oldu. Veri biçimi bozuk veya desteklenmiyor olabilir." + IDS_SAVEERROR "Dosya kaydetme başarısız oldu:\n\n%s" + IDS_CANTSENDMAIL "Mail gönderme başarısız oldu." + IDS_LOSECOLOR "Renk biçimi bu işlem sonrası kaybolacaktır. Bu işlemi yapmak istediğinizden emin misiniz?" END From 7887d17b97be074f750d84c51ab7cd462d8c97f6 Mon Sep 17 00:00:00 2001 From: WindowsFan9600 Date: Sat, 21 Oct 2023 21:37:26 +0300 Subject: [PATCH 74/74] [TASKMGR] Improve translation and translate some untranslated strings --- base/applications/taskmgr/lang/tr-TR.rc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/base/applications/taskmgr/lang/tr-TR.rc b/base/applications/taskmgr/lang/tr-TR.rc index a20a43e7efb..6d61d93da97 100644 --- a/base/applications/taskmgr/lang/tr-TR.rc +++ b/base/applications/taskmgr/lang/tr-TR.rc @@ -124,7 +124,7 @@ BEGIN POPUP "DUMMY" BEGIN MENUITEM "&İşlemi Sonlandır", ID_PROCESS_PAGE_ENDPROCESS - MENUITEM "İ&şlem Ağacını Sonlandır", ID_PROCESS_PAGE_ENDPROCESSTREE + MENUITEM "İ&şlem ağacını Sonlandır", ID_PROCESS_PAGE_ENDPROCESSTREE MENUITEM "&Hata Ayıkla", ID_PROCESS_PAGE_DEBUG MENUITEM SEPARATOR POPUP "&Önceliği Aayarla" @@ -148,7 +148,7 @@ END IDD_TASKMGR_DIALOG DIALOGEX 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Görev Yöneticisi" +CAPTION "Windivs Görev Yöneticisi" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN @@ -324,8 +324,8 @@ END STRINGTABLE BEGIN - IDS_APP_TITLE "Görev Yöneticisi" - IDC_TASKMGR "Görev Yöneticisi" + IDS_APP_TITLE "Windivs Görev Yöneticisi" + IDC_TASKMGR "Windivs Görev Yöneticisi" IDS_IDLE_PROCESS "Boş Sistem İşlemi" END @@ -379,8 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "İşlemi NORMAL öncelik sınıfına getirir." ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "İşlemi NORMAL ALTI öncelik sınıfına getirir." ID_PROCESS_PAGE_SETPRIORITY_LOW "İşlemi DÜŞÜK öncelik sınıfına getirir." - ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" - ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" + ID_PROCESS_PAGE_PROPERTIES "İşlemin dosyasının özelliklerini gösterir." + ID_PROCESS_PAGE_OPENFILELOCATION "İşlemin dosyasının konumunu açar." END STRINGTABLE @@ -428,15 +428,15 @@ BEGIN IDS_MENU_SHOWKERNELTIMES "&Çekirdek Sürelerini Göster" IDS_CREATENEWTASK "Yeni Görev Oluşturma" IDS_CREATENEWTASK_DESC "Bir programın, bir dizinin, bir belgenin veya bir İnternet kaynağının adını yazınız, Görev Yöneticisi onu sizin için açacaktır." - IDS_MSG_ACCESSPROCESSAFF "İşlemci İlişkisinin Erişilemedi veya Ayarlanadı" + IDS_MSG_ACCESSPROCESSAFF "İşlemci İlişkisine Erişilemedi veya Ayarlanamadı." IDS_MSG_PROCESSONEPRO "İşlemin en azından bir işlemciyle ilişkisi olmalıdır." IDS_MSG_INVALIDOPTION "Geçersiz Seçenek" - IDS_MSG_UNABLEDEBUGPROCESS "Hata Ayıklama İşleminin Yapılamadı" + IDS_MSG_UNABLEDEBUGPROCESS "Hata Ayıklama İşlemi Yapılamadı" IDS_MSG_WARNINGDEBUG "UYARI: Bu işlemde hata ayıklama veri kaybıyla sonuçlanabilir.\nHata ayıklayıcı bağlamak istediğinizden emin misiniz?" IDS_MSG_TASKMGRWARNING "Görev Yöneticisi Uyarısı" IDS_MSG_WARNINGTERMINATING "UYARI: Bir işlemin sonlandırılması, veri\nkaybı ve sistem kararsızlığı dahil pek çok istenmeyen sonuca neden\nolabilir. İşleme, işlem sonlandırılmadan önce durumunu veya verisini\nkaydetme fırsatı verilmeyecektir. İşlemi\nsonlandırmak istediğinizden emin misiniz?" IDS_MSG_UNABLETERMINATEPRO "İşlem Sonlandırlamadı" - IDS_MSG_CLOSESYSTEMPROCESS "Bu çok önemli bir sistem işlemidir. Görev Yöneticisi bu işlemi sonlandırmayacak." + IDS_MSG_CLOSESYSTEMPROCESS "Bu kritik bir sistem işlemidir. Görev Yöneticisi bu işlemi sonlandırmamaz." IDS_MSG_UNABLECHANGEPRIORITY "Öncelik Değiştirilemedi" IDS_MSG_WARNINGCHANGEPRIORITY "UYARI: Bu işlemin öncelik sınıfının değiştirilmesi, sistem\nkararsızlığı dahil pek çok istenmeyen sonuca neden olabilir. Öncelik\nsınıfını değiştirmek istediğinizden emin misiniz?" IDS_MSG_TRAYICONCPUUSAGE "CPU Kullanımı: %%%d"