From 1d824ac4f367fd0cb08545dd3570cd245384fac5 Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Sat, 27 Oct 2007 21:02:34 +0000 Subject: [PATCH] - Implement a new ShellAbout dialog, which looks more like the Windows one. Uses the ReactOS Logo bitmap from base/setup/welcome/res. The "Authors" button in the dialog currently highlights a redrawing bug in ReactOS (tracked in bug 2769). - Define default strings in include/reactos/version.rc, which shouldn't be overwritten by applications. These strings can later be used i.e. in resource files like it's done in shell32 now. svn path=/trunk/; revision=29924 --- reactos/dll/win32/shell32/bitmap_res.rc | 6 +- reactos/dll/win32/shell32/lang/bg-BG.rc | 42 ++- reactos/dll/win32/shell32/lang/ca-ES.rc | 43 ++- reactos/dll/win32/shell32/lang/cs-CZ.rc | 43 ++- reactos/dll/win32/shell32/lang/da-DK.rc | 43 ++- reactos/dll/win32/shell32/lang/de-DE.rc | 43 ++- reactos/dll/win32/shell32/lang/en-US.rc | 43 ++- reactos/dll/win32/shell32/lang/eo-EO.rc | 43 ++- reactos/dll/win32/shell32/lang/es-ES.rc | 43 ++- reactos/dll/win32/shell32/lang/fi-FI.rc | 43 ++- reactos/dll/win32/shell32/lang/fr-FR.rc | 43 ++- reactos/dll/win32/shell32/lang/hu-HU.rc | 45 ++- reactos/dll/win32/shell32/lang/it-IT.rc | 43 ++- reactos/dll/win32/shell32/lang/ja-JP.rc | 43 ++- reactos/dll/win32/shell32/lang/ko-KO.rc | 63 ++-- reactos/dll/win32/shell32/lang/nb-NO.rc | 43 ++- reactos/dll/win32/shell32/lang/nl-NL.rc | 43 ++- reactos/dll/win32/shell32/lang/pl-PL.rc | 43 ++- reactos/dll/win32/shell32/lang/pt-BR.rc | 43 ++- reactos/dll/win32/shell32/lang/pt-PT.rc | 43 ++- reactos/dll/win32/shell32/lang/ru-RU.rc | 43 ++- reactos/dll/win32/shell32/lang/sk-SK.rc | 43 ++- reactos/dll/win32/shell32/lang/sl-SI.rc | 43 ++- reactos/dll/win32/shell32/lang/sv-SE.rc | 43 ++- reactos/dll/win32/shell32/lang/tr-TR.rc | 43 ++- reactos/dll/win32/shell32/lang/uk-UA.rc | 43 ++- reactos/dll/win32/shell32/lang/wa-WA.rc | 39 ++- reactos/dll/win32/shell32/lang/zh-CN.rc | 39 ++- reactos/dll/win32/shell32/lang/zh-TW.rc | 36 +- .../res/bitmaps/shell_about_logo_24bpp.bmp | Bin 0 -> 44300 bytes reactos/dll/win32/shell32/shell32.rc | 2 +- reactos/dll/win32/shell32/shell32_main.c | 314 +++++++++++++----- reactos/dll/win32/shell32/shresdef.h | 101 +++--- reactos/include/reactos/version.rc | 17 +- 34 files changed, 1209 insertions(+), 441 deletions(-) create mode 100755 reactos/dll/win32/shell32/res/bitmaps/shell_about_logo_24bpp.bmp diff --git a/reactos/dll/win32/shell32/bitmap_res.rc b/reactos/dll/win32/shell32/bitmap_res.rc index 7ec66e3a726..0a5787c1a52 100644 --- a/reactos/dll/win32/shell32/bitmap_res.rc +++ b/reactos/dll/win32/shell32/bitmap_res.rc @@ -1,4 +1,6 @@ -IDB_SHELL_IEXPLORE_LG BITMAP "res/bitmaps/204+205.bmp" +IDB_SHELL_ABOUT_LOGO_24BPP BITMAP "res/bitmaps/shell_about_logo_24bpp.bmp" + +/*IDB_SHELL_IEXPLORE_LG BITMAP "res/bitmaps/204+205.bmp" IDB_SHELL_IEXPLORE_SM BITMAP "res/bitmaps/206+207.bmp" IDB_SHELL_EXPLORER_LG BITMAP "res/bitmaps/214+215.bmp" IDB_SHELL_EXPLORER_SM BITMAP "res/bitmaps/216+217.bmp" @@ -8,4 +10,4 @@ IDB_SHELL_UNKNOWN3 BITMAP "res/bitmaps/227.bmp" IDB_SHELL_UNKNOWN4 BITMAP "res/bitmaps/228.bmp" IDB_SHELL_UNKNOWN5 BITMAP "res/bitmaps/230.bmp" IDB_SHELL_UNKNOWN6 BITMAP "res/bitmaps/231.bmp" -IDB_SHELL_UNKNOWN7 BITMAP "res/bitmaps/245.bmp" +IDB_SHELL_UNKNOWN7 BITMAP "res/bitmaps/245.bmp"*/ diff --git a/reactos/dll/win32/shell32/lang/bg-BG.rc b/reactos/dll/win32/shell32/lang/bg-BG.rc index 1296bf2d68e..bfe75d260a5 100644 --- a/reactos/dll/win32/shell32/lang/bg-BG.rc +++ b/reactos/dll/win32/shell32/lang/bg-BG.rc @@ -125,17 +125,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Çà %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Äîáðå", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ÐåàêòÎÑ âè áå äîñòàâåí îò:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "Äîáðå", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,10 +425,14 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/ca-ES.rc b/reactos/dll/win32/shell32/lang/ca-ES.rc index b1b760a0268..7ab2b0f205b 100644 --- a/reactos/dll/win32/shell32/lang/ca-ES.rc +++ b/reactos/dll/win32/shell32/lang/ca-ES.rc @@ -125,17 +125,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Quant a %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "D'Acord", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS ha estat construit per:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "D'Acord", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS ha estat construit per:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,9 +425,14 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/cs-CZ.rc b/reactos/dll/win32/shell32/lang/cs-CZ.rc index 6505fd53571..300fa1b77fb 100644 --- a/reactos/dll/win32/shell32/lang/cs-CZ.rc +++ b/reactos/dll/win32/shell32/lang/cs-CZ.rc @@ -126,17 +126,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "O aplikaci %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS je d¡lem:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS je d¡lem:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -410,9 +426,14 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/da-DK.rc b/reactos/dll/win32/shell32/lang/da-DK.rc index 43a9813e4f5..299f891a97e 100644 --- a/reactos/dll/win32/shell32/lang/da-DK.rc +++ b/reactos/dll/win32/shell32/lang/da-DK.rc @@ -125,17 +125,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Om %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS havde ikke været mulig uden hjælp fra disse personer:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS havde ikke været mulig uden hjælp fra disse personer:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,9 +425,14 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/de-DE.rc b/reactos/dll/win32/shell32/lang/de-DE.rc index 7c9c5465cc7..998c37d5e2d 100644 --- a/reactos/dll/win32/shell32/lang/de-DE.rc +++ b/reactos/dll/win32/shell32/lang/de-DE.rc @@ -127,17 +127,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Informationen über %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS wurde Ihnen zur Verfügung gestellt von:", 98, 8, 55, 170, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "Diese ReactOS-Version wurde registriert auf:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installierter physikalischer Speicher:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS wurde Ihnen zur Verfügung gestellt von:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -410,9 +426,14 @@ BEGIN IDS_COMMON_PICTURES "Dokumente\\Eigene Bilder" IDS_COMMON_VIDEO "Dokumente\\Eigene Videos" IDS_CDBURN_AREA "Lokale Einstellungen\\Anwendungsdaten\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Lokaler Datenträger" IDS_DRIVE_CDROM "CD-Laufwerk" IDS_DRIVE_NETWORK "Netzlaufwerk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Öffnen mit" + IDS_OPEN_WITH_CHOOSE "Programm wählen..." + + IDS_SHELL_ABOUT_AUTHORS "&Autoren" + IDS_SHELL_ABOUT_BACK "< &Zurück" END diff --git a/reactos/dll/win32/shell32/lang/en-US.rc b/reactos/dll/win32/shell32/lang/en-US.rc index d3709a95a06..1b30c7bd4e6 100644 --- a/reactos/dll/win32/shell32/lang/en-US.rc +++ b/reactos/dll/win32/shell32/lang/en-US.rc @@ -125,17 +125,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,9 +425,14 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/eo-EO.rc b/reactos/dll/win32/shell32/lang/eo-EO.rc index afbb008d550..12313578beb 100644 --- a/reactos/dll/win32/shell32/lang/eo-EO.rc +++ b/reactos/dll/win32/shell32/lang/eo-EO.rc @@ -125,17 +125,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Pri %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Enorde", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "Enorde", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,9 +425,14 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/es-ES.rc b/reactos/dll/win32/shell32/lang/es-ES.rc index 063cf1dcf00..2bb8a3c59d1 100644 --- a/reactos/dll/win32/shell32/lang/es-ES.rc +++ b/reactos/dll/win32/shell32/lang/es-ES.rc @@ -126,17 +126,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Acerca de %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Aceptar", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS está disponible gracias a:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "Aceptar", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS está disponible gracias a:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -410,9 +426,14 @@ BEGIN IDS_COMMON_PICTURES "Documentos\\Mis imágenes" IDS_COMMON_VIDEO "Documentos\\Mis vídeos" IDS_CDBURN_AREA "Configuración local\\Datos de programa\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Disco Local" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Unidad de red" - IDS_OPEN_WITH "Abrir con" - IDS_OPEN_WITH_CHOOSE "Elegir programa..." + + IDS_OPEN_WITH "Abrir con" + IDS_OPEN_WITH_CHOOSE "Elegir programa..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/fi-FI.rc b/reactos/dll/win32/shell32/lang/fi-FI.rc index cc40376cdff..fd152ece328 100644 --- a/reactos/dll/win32/shell32/lang/fi-FI.rc +++ b/reactos/dll/win32/shell32/lang/fi-FI.rc @@ -125,17 +125,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Tietoja %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS:n toi Sinulle:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS:n toi Sinulle:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,9 +425,14 @@ BEGIN IDS_COMMON_PICTURES "Dokumentit\\Omat kuvatiedostot" IDS_COMMON_VIDEO "Dokumentit\\Omat videotiedostot" IDS_CDBURN_AREA "Paikalliset Asetukset\\Ohjelmien Tiedot\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/fr-FR.rc b/reactos/dll/win32/shell32/lang/fr-FR.rc index 032f0cf0406..8e28acbd5e2 100644 --- a/reactos/dll/win32/shell32/lang/fr-FR.rc +++ b/reactos/dll/win32/shell32/lang/fr-FR.rc @@ -128,17 +128,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "À propos de %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS est une réalisation de:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS est une réalisation de:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -412,9 +428,14 @@ BEGIN IDS_COMMON_PICTURES "Documents\\Mes images" IDS_COMMON_VIDEO "Documents\\Mes vidéos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/hu-HU.rc b/reactos/dll/win32/shell32/lang/hu-HU.rc index 9fd89eedfdd..0476dbac9aa 100644 --- a/reactos/dll/win32/shell32/lang/hu-HU.rc +++ b/reactos/dll/win32/shell32/lang/hu-HU.rc @@ -128,17 +128,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "%s" -FONT 10, "MS Shell Dlg" +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About %s" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "A ReactOS készítõi:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A ReactOS készítõi:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -412,9 +428,14 @@ BEGIN IDS_COMMON_PICTURES "Dokumentumok\\Képek" IDS_COMMON_VIDEO "Dokumentumok\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/it-IT.rc b/reactos/dll/win32/shell32/lang/it-IT.rc index 7aeba5d2957..5c4651c93e3 100644 --- a/reactos/dll/win32/shell32/lang/it-IT.rc +++ b/reactos/dll/win32/shell32/lang/it-IT.rc @@ -126,17 +126,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Informazioni su %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS è disponibile grazie a:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS è disponibile grazie a:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -410,9 +426,14 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/ja-JP.rc b/reactos/dll/win32/shell32/lang/ja-JP.rc index 3d8e417e9ea..8546e322ca7 100644 --- a/reactos/dll/win32/shell32/lang/ja-JP.rc +++ b/reactos/dll/win32/shell32/lang/ja-JP.rc @@ -125,17 +125,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "%s ‚ɂ‚¢‚Ä" -FONT 10, "MS UI Gothic" +FONT 8, "MS UI Gothic" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS UI Gothic" +BEGIN + LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,9 +425,14 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/ko-KO.rc b/reactos/dll/win32/shell32/lang/ko-KO.rc index 89fe2be9475..b3e874a76cd 100644 --- a/reactos/dll/win32/shell32/lang/ko-KO.rc +++ b/reactos/dll/win32/shell32/lang/ko-KO.rc @@ -116,26 +116,42 @@ SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "žÞœÃÁö" FONT 8, "MS Shell Dlg" -{ -DEFPUSHBUTTON "¿¹(&Y)", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP -PUSHBUTTON "žðµÎ ¿¹(&A)", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP -PUSHBUTTON " ŸÆŽÏ¿À(&N)", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP -PUSHBUTTON "ÃëŒÒ(&C)", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP -ICON "", IDD_ICON, 10, 10, 16, 16 -LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 -} - -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "%s¿¡ °üÇÏ¿©" -FONT 10, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "È®ÀÎ", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 + DEFPUSHBUTTON "¿¹(&Y)", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "žðµÎ ¿¹(&A)", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON " ŸÆŽÏ¿À(&N)", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ÃëŒÒ(&C)", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + ICON "", IDD_ICON, 10, 10, 16, 16 + LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 +END + +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "%s¿¡ °üÇÏ¿©" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "È®ÀÎ", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,9 +425,14 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/nb-NO.rc b/reactos/dll/win32/shell32/lang/nb-NO.rc index 9f406eb3843..cbad1061ca7 100644 --- a/reactos/dll/win32/shell32/lang/nb-NO.rc +++ b/reactos/dll/win32/shell32/lang/nb-NO.rc @@ -125,17 +125,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Om %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,9 +425,14 @@ BEGIN IDS_COMMON_PICTURES "Dokumenter\\Mine bilder" IDS_COMMON_VIDEO "Dokumenter\\Mine videoklipp" IDS_CDBURN_AREA "Lokale innstillinger\\Programdata\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/nl-NL.rc b/reactos/dll/win32/shell32/lang/nl-NL.rc index 02c32fbb0ee..0eebfcd67bf 100644 --- a/reactos/dll/win32/shell32/lang/nl-NL.rc +++ b/reactos/dll/win32/shell32/lang/nl-NL.rc @@ -125,17 +125,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Info %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS is geschreven door:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS is geschreven door:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,9 +425,14 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/pl-PL.rc b/reactos/dll/win32/shell32/lang/pl-PL.rc index f61cbc956f7..ebf8bc6cbb9 100644 --- a/reactos/dll/win32/shell32/lang/pl-PL.rc +++ b/reactos/dll/win32/shell32/lang/pl-PL.rc @@ -126,17 +126,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "O %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "Mo¿esz korzystaæ z Wine'a dziêki:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -410,9 +426,14 @@ BEGIN IDS_COMMON_PICTURES "Documenty\\Moje obrazy" IDS_COMMON_VIDEO "Documenty\\Moje wideo" IDS_CDBURN_AREA "Ustawienia lokalne\\Dane aplikacji\\Microsoft\\Nagrywanie dysków CD" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/pt-BR.rc b/reactos/dll/win32/shell32/lang/pt-BR.rc index bbc9fe84d36..fead6d58cc8 100644 --- a/reactos/dll/win32/shell32/lang/pt-BR.rc +++ b/reactos/dll/win32/shell32/lang/pt-BR.rc @@ -127,17 +127,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Sobre %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS foi disponibilizado por:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS foi disponibilizado por:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -411,9 +427,14 @@ BEGIN IDS_COMMON_PICTURES "Documentos\\Minhas Imagens" IDS_COMMON_VIDEO "Documentos\\Meus Vídeos" IDS_CDBURN_AREA "Configurações locais\\Dados de aplicativos\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/pt-PT.rc b/reactos/dll/win32/shell32/lang/pt-PT.rc index f10b04b4a63..288bae0e970 100644 --- a/reactos/dll/win32/shell32/lang/pt-PT.rc +++ b/reactos/dll/win32/shell32/lang/pt-PT.rc @@ -127,17 +127,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Acerca do %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS disponibilizado por:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS disponibilizado por:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -411,9 +427,14 @@ BEGIN IDS_COMMON_PICTURES "Os Meus Documentos\\As Minhas Imagens" IDS_COMMON_VIDEO "Os Meus Documentos\\Os Meus Vídeos" IDS_CDBURN_AREA "Definições locais\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/ru-RU.rc b/reactos/dll/win32/shell32/lang/ru-RU.rc index f704d747c1c..8df0ba3303b 100644 --- a/reactos/dll/win32/shell32/lang/ru-RU.rc +++ b/reactos/dll/win32/shell32/lang/ru-RU.rc @@ -126,17 +126,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Î %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "Ðàçðàáîò÷èêè ReactOS:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ðàçðàáîò÷èêè ReactOS:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -410,9 +426,14 @@ BEGIN IDS_COMMON_PICTURES "Îáùèå äîêóìåíòû\\Ìîè ðèñóíêè" IDS_COMMON_VIDEO "Îáùèå äîêóìåíòû\\Ìîè ôèëüìû" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/sk-SK.rc b/reactos/dll/win32/shell32/lang/sk-SK.rc index 0e8320bc260..03e547ab1f2 100644 --- a/reactos/dll/win32/shell32/lang/sk-SK.rc +++ b/reactos/dll/win32/shell32/lang/sk-SK.rc @@ -125,17 +125,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,9 +425,14 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Choose Program..." + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/sl-SI.rc b/reactos/dll/win32/shell32/lang/sl-SI.rc index 8a7765bc3fc..4dd58f757fe 100644 --- a/reactos/dll/win32/shell32/lang/sl-SI.rc +++ b/reactos/dll/win32/shell32/lang/sl-SI.rc @@ -125,17 +125,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "O %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "V redu", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS so ustvarili:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "V redu", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS so ustvarili:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,9 +425,14 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Select Program" + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Select Program" + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/sv-SE.rc b/reactos/dll/win32/shell32/lang/sv-SE.rc index ac0603482c1..7d593ea778d 100644 --- a/reactos/dll/win32/shell32/lang/sv-SE.rc +++ b/reactos/dll/win32/shell32/lang/sv-SE.rc @@ -125,17 +125,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Om %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS hade inte varit möjligt utan dessa personer:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS hade inte varit möjligt utan dessa personer:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,9 +425,14 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Select Program" + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Select Program" + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/tr-TR.rc b/reactos/dll/win32/shell32/lang/tr-TR.rc index e4f46862f6a..b71ceaa1dab 100644 --- a/reactos/dll/win32/shell32/lang/tr-TR.rc +++ b/reactos/dll/win32/shell32/lang/tr-TR.rc @@ -125,17 +125,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "%s Hakkýnda" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Tamam", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS'ý size sunan geliþtiriciler:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "Tamam", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS'ý size sunan geliþtiriciler:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,9 +425,14 @@ BEGIN IDS_COMMON_PICTURES "Belgeler\\Resimlerim" IDS_COMMON_VIDEO "Belgeler\\Videolarým" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Select Program" + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Select Program" + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/uk-UA.rc b/reactos/dll/win32/shell32/lang/uk-UA.rc index 645db05f57e..d9e26b34237 100644 --- a/reactos/dll/win32/shell32/lang/uk-UA.rc +++ b/reactos/dll/win32/shell32/lang/uk-UA.rc @@ -125,17 +125,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ïðî %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "Ðîçðîáíèêè ReactOS:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ðîçðîáíèêè ReactOS:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,9 +425,14 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Select Program" + + IDS_OPEN_WITH "Open With" + IDS_OPEN_WITH_CHOOSE "Select Program" + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/wa-WA.rc b/reactos/dll/win32/shell32/lang/wa-WA.rc index ef1d78da174..3dffb1f8e76 100644 --- a/reactos/dll/win32/shell32/lang/wa-WA.rc +++ b/reactos/dll/win32/shell32/lang/wa-WA.rc @@ -125,17 +125,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Å dfait di %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "I Va", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS a estu fwait par:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "I Va", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS a estu fwait par:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,9 +425,14 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" + IDS_OPEN_WITH "Open With" IDS_OPEN_WITH_CHOOSE "Select Program" + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END diff --git a/reactos/dll/win32/shell32/lang/zh-CN.rc b/reactos/dll/win32/shell32/lang/zh-CN.rc index d49dfa7f1ce..8033f89e350 100644 --- a/reactos/dll/win32/shell32/lang/zh-CN.rc +++ b/reactos/dll/win32/shell32/lang/zh-CN.rc @@ -126,17 +126,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "¹ØÓÚ %s" -FONT 10, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "È·¶¨", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "È·¶¨", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -410,11 +426,16 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" + IDS_OPEN_WITH "Open With" IDS_OPEN_WITH_CHOOSE "Select Program" + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END #pragma code_page(default) diff --git a/reactos/dll/win32/shell32/lang/zh-TW.rc b/reactos/dll/win32/shell32/lang/zh-TW.rc index 3654289f737..c2e249cdafe 100644 --- a/reactos/dll/win32/shell32/lang/zh-TW.rc +++ b/reactos/dll/win32/shell32/lang/zh-TW.rc @@ -126,16 +126,33 @@ BEGIN LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "êPì¶ %s" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "´_¶¨", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 35, 10, 137, 10 - LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 + ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 + LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 + LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 + LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 + LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 + LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 + LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ + LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 + DEFPUSHBUTTON "´_¶¨", IDOK, 220, 178, 50, 14 + + PUSHBUTTON "", IDC_SHELL_ABOUT_AUTHORS, 5, 178, 70, 14 +END + +IDD_SHELL_ABOUT_AUTHORS DIALOGEX MOVEABLE DISCARDABLE 35, 90, 235, 85 +STYLE DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -409,11 +426,16 @@ BEGIN IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" + IDS_OPEN_WITH "Open With" IDS_OPEN_WITH_CHOOSE "Select Program" + + IDS_SHELL_ABOUT_AUTHORS "&Authors" + IDS_SHELL_ABOUT_BACK "< &Back" END #pragma code_page(default) diff --git a/reactos/dll/win32/shell32/res/bitmaps/shell_about_logo_24bpp.bmp b/reactos/dll/win32/shell32/res/bitmaps/shell_about_logo_24bpp.bmp new file mode 100755 index 0000000000000000000000000000000000000000..335383f3f1df49d273e70a7ca693b8f898eb0c84 GIT binary patch literal 44300 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 literal 0 HcmV?d00001 diff --git a/reactos/dll/win32/shell32/shell32.rc b/reactos/dll/win32/shell32/shell32.rc index 6bb05d7960c..138d174ec69 100644 --- a/reactos/dll/win32/shell32/shell32.rc +++ b/reactos/dll/win32/shell32/shell32.rc @@ -37,7 +37,7 @@ END * found in the corresponding directorys */ #include "icon_res.rc" -//#include "bitmap_res.rc" +#include "bitmap_res.rc" #include "avi_res.rc" /* diff --git a/reactos/dll/win32/shell32/shell32_main.c b/reactos/dll/win32/shell32/shell32_main.c index 4a12b30f971..e49043d1430 100644 --- a/reactos/dll/win32/shell32/shell32_main.c +++ b/reactos/dll/win32/shell32/shell32_main.c @@ -852,31 +852,11 @@ typedef struct LPCWSTR szApp; LPCWSTR szOtherStuff; HICON hIcon; - HFONT hFont; } ABOUT_INFO; -#define IDC_STATIC_TEXT1 100 -#define IDC_STATIC_TEXT2 101 -#define IDC_LISTBOX 99 -#define IDC_WINE_TEXT 98 - #define DROP_FIELD_TOP (-15) #define DROP_FIELD_HEIGHT 15 -static BOOL __get_dropline( HWND hWnd, LPRECT lprect ) -{ - HWND hWndCtl = GetDlgItem(hWnd, IDC_WINE_TEXT); - - if( hWndCtl ) - { - GetWindowRect( hWndCtl, lprect ); - MapWindowPoints( 0, hWnd, (LPPOINT)lprect, 2 ); - lprect->bottom = (lprect->top += DROP_FIELD_TOP); - return TRUE; - } - return FALSE; -} - /************************************************************************* * SHAppBarMessage [SHELL32.@] */ @@ -968,77 +948,250 @@ HRESULT WINAPI SHLoadInProc (REFCLSID rclsid) return DISP_E_MEMBERNOTFOUND; } +static VOID SetRegTextData(HWND hWnd, HKEY hKey, LPWSTR Value, UINT uID) +{ + DWORD dwBufferSize; + DWORD dwType; + LPWSTR lpBuffer; + + if( RegQueryValueExW(hKey, Value, NULL, &dwType, NULL, &dwBufferSize) == ERROR_SUCCESS ) + { + if(dwType == REG_SZ) + { + lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwBufferSize); + + if(lpBuffer) + { + if( RegQueryValueExW(hKey, Value, NULL, &dwType, (LPBYTE)lpBuffer, &dwBufferSize) == ERROR_SUCCESS ) + { + SetDlgItemTextW(hWnd, uID, lpBuffer); + } + + HeapFree(GetProcessHeap(), 0, lpBuffer); + } + } + } +} + +INT_PTR CALLBACK AboutAuthorsDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + switch(msg) + { + case WM_INITDIALOG: + { + const char* const *pstr = SHELL_Authors; + + // Add the authors to the list + SendDlgItemMessageW( hWnd, IDC_SHELL_ABOUT_AUTHORS_LISTBOX, WM_SETREDRAW, FALSE, 0 ); + + while (*pstr) + { + WCHAR name[64]; + + /* authors list is in utf-8 format */ + MultiByteToWideChar( CP_UTF8, 0, *pstr, -1, name, sizeof(name)/sizeof(WCHAR) ); + SendDlgItemMessageW( hWnd, IDC_SHELL_ABOUT_AUTHORS_LISTBOX, LB_ADDSTRING, (WPARAM)-1, (LPARAM)name ); + pstr++; + } + + SendDlgItemMessageW( hWnd, IDC_SHELL_ABOUT_AUTHORS_LISTBOX, WM_SETREDRAW, TRUE, 0 ); + + return TRUE; + } + } + + return FALSE; +} /************************************************************************* * AboutDlgProc (internal) */ -INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, - LPARAM lParam ) +INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) { - HWND hWndCtl; - - TRACE("\n"); + static DWORD cxLogoBmp; + static DWORD cyLogoBmp; + static HBITMAP hLogoBmp; + static HWND hWndAuthors; switch(msg) { - case WM_INITDIALOG: + case WM_INITDIALOG: { ABOUT_INFO *info = (ABOUT_INFO *)lParam; - WCHAR Template[512], AppTitle[512]; if (info) { - const char* const *pstr = SHELL_Authors; - SendDlgItemMessageW(hWnd, stc1, STM_SETICON,(WPARAM)info->hIcon, 0); - GetWindowTextW( hWnd, Template, sizeof(Template)/sizeof(WCHAR) ); - sprintfW( AppTitle, Template, info->szApp ); - SetWindowTextW( hWnd, AppTitle ); - SetWindowTextW( GetDlgItem(hWnd, IDC_STATIC_TEXT1), info->szApp ); - SetWindowTextW( GetDlgItem(hWnd, IDC_STATIC_TEXT2), info->szOtherStuff ); - hWndCtl = GetDlgItem(hWnd, IDC_LISTBOX); - SendMessageW( hWndCtl, WM_SETREDRAW, 0, 0 ); - SendMessageW( hWndCtl, WM_SETFONT, (WPARAM)info->hFont, 0 ); - while (*pstr) + const WCHAR szRegKey[] = L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"; + HKEY hRegKey; + MEMORYSTATUSEX MemStat; + WCHAR szAppTitle[512]; + WCHAR szAppTitleTemplate[512]; + WCHAR szAuthorsText[20]; + + // Preload the ROS bitmap + hLogoBmp = LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_SHELL_ABOUT_LOGO_24BPP), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + + if(hLogoBmp) { - WCHAR name[64]; - /* authors list is in utf-8 format */ - MultiByteToWideChar( CP_UTF8, 0, *pstr, -1, name, sizeof(name)/sizeof(WCHAR) ); - SendMessageW( hWndCtl, LB_ADDSTRING, (WPARAM)-1, (LPARAM)name ); - pstr++; + BITMAP bmpLogo; + + GetObject( hLogoBmp, sizeof(BITMAP), &bmpLogo ); + + cxLogoBmp = bmpLogo.bmWidth; + cyLogoBmp = bmpLogo.bmHeight; } - SendMessageW( hWndCtl, WM_SETREDRAW, 1, 0 ); + + // Set App-specific stuff (icon, app name, szOtherStuff string) + SendDlgItemMessageW(hWnd, IDC_SHELL_ABOUT_ICON, STM_SETICON, (WPARAM)info->hIcon, 0); + + GetWindowTextW( hWnd, szAppTitleTemplate, sizeof(szAppTitleTemplate) / sizeof(WCHAR) ); + wsprintfW( szAppTitle, szAppTitleTemplate, info->szApp ); + SetWindowTextW( hWnd, szAppTitle ); + + SetDlgItemTextW( hWnd, IDC_SHELL_ABOUT_APPNAME, info->szApp ); + SetDlgItemTextW( hWnd, IDC_SHELL_ABOUT_OTHERSTUFF, info->szOtherStuff ); + + // Set the registered user and organization name + if(RegOpenKeyExW( HKEY_LOCAL_MACHINE, szRegKey, 0, KEY_QUERY_VALUE, &hRegKey ) == ERROR_SUCCESS) + { + SetRegTextData( hWnd, hRegKey, L"RegisteredOwner", IDC_SHELL_ABOUT_REG_USERNAME ); + SetRegTextData( hWnd, hRegKey, L"RegisteredOrganization", IDC_SHELL_ABOUT_REG_ORGNAME ); + + RegCloseKey( hRegKey ); + } + + // Set the value for the installed physical memory + MemStat.dwLength = sizeof(MemStat); + if( GlobalMemoryStatusEx(&MemStat) ) + { + WCHAR szBuf[12]; + + if (MemStat.ullTotalPhys > 1024 * 1024 * 1024) + { + double dTotalPhys; + WCHAR szDecimalSeparator[4]; + WCHAR szUnits[3]; + + // We're dealing with GBs or more + MemStat.ullTotalPhys /= 1024 * 1024; + + if (MemStat.ullTotalPhys > 1024 * 1024) + { + // We're dealing with TBs or more + MemStat.ullTotalPhys /= 1024; + + if (MemStat.ullTotalPhys > 1024 * 1024) + { + // We're dealing with PBs or more + MemStat.ullTotalPhys /= 1024; + + dTotalPhys = (double)MemStat.ullTotalPhys / 1024; + wcscpy( szUnits, L"PB" ); + } + else + { + dTotalPhys = (double)MemStat.ullTotalPhys / 1024; + wcscpy( szUnits, L"TB" ); + } + } + else + { + dTotalPhys = (double)MemStat.ullTotalPhys / 1024; + wcscpy( szUnits, L"GB" ); + } + + // We need the decimal point of the current locale to display the RAM size correctly + if( GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szDecimalSeparator, sizeof(szDecimalSeparator) / sizeof(WCHAR)) > 0) + { + UCHAR uDecimals; + UINT uIntegral; + + uIntegral = (UINT)dTotalPhys; + uDecimals = (UCHAR)((UINT)(dTotalPhys * 100) - uIntegral * 100); + + // Display the RAM size with 2 decimals + wsprintfW(szBuf, L"%u%s%02u %s", uIntegral, szDecimalSeparator, uDecimals, szUnits); + } + } + else + { + // We're dealing with MBs, don't show any decimals + wsprintfW( szBuf, L"%u MB", (UINT)MemStat.ullTotalPhys / 1024 / 1024 ); + } + + SetDlgItemTextW( hWnd, IDC_SHELL_ABOUT_PHYSMEM, szBuf); + } + + // Add the Authors dialog + hWndAuthors = CreateDialogW( shell32_hInstance, MAKEINTRESOURCEW(IDD_SHELL_ABOUT_AUTHORS), hWnd, AboutAuthorsDlgProc ); + LoadStringW( shell32_hInstance, IDS_SHELL_ABOUT_AUTHORS, szAuthorsText, sizeof(szAuthorsText) / sizeof(WCHAR) ); + SetDlgItemTextW( hWnd, IDC_SHELL_ABOUT_AUTHORS, szAuthorsText ); } - } - return 1; - case WM_PAINT: - { - RECT rect; - PAINTSTRUCT ps; - HDC hDC = BeginPaint( hWnd, &ps ); - - if (__get_dropline( hWnd, &rect )) - { - SelectObject( hDC, GetStockObject( BLACK_PEN ) ); - MoveToEx( hDC, rect.left, rect.top, NULL ); - LineTo( hDC, rect.right, rect.bottom ); - } - EndPaint( hWnd, &ps ); - } - break; - - case WM_COMMAND: - if (wParam == IDOK || wParam == IDCANCEL) - { - EndDialog(hWnd, TRUE); return TRUE; } - break; - case WM_CLOSE: - EndDialog(hWnd, TRUE); - break; + + case WM_PAINT: + { + if(hLogoBmp) + { + PAINTSTRUCT ps; + HDC hdc; + HDC hdcMem; + + hdc = BeginPaint(hWnd, &ps); + hdcMem = CreateCompatibleDC(hdc); + + if(hdcMem) + { + SelectObject(hdcMem, hLogoBmp); + BitBlt(hdc, 0, 0, cxLogoBmp, cyLogoBmp, hdcMem, 0, 0, SRCCOPY); + + DeleteDC(hdcMem); + } + + EndPaint(hWnd, &ps); + } + + break; + } + + case WM_COMMAND: + switch(wParam) + { + case IDOK: + case IDCANCEL: + EndDialog(hWnd, TRUE); + return TRUE; + + case IDC_SHELL_ABOUT_AUTHORS: + { + static BOOL bShowingAuthors = FALSE; + WCHAR szAuthorsText[20]; + + if(bShowingAuthors) + { + LoadStringW( shell32_hInstance, IDS_SHELL_ABOUT_AUTHORS, szAuthorsText, sizeof(szAuthorsText) / sizeof(WCHAR) ); + ShowWindow( hWndAuthors, SW_HIDE ); + } + else + { + LoadStringW( shell32_hInstance, IDS_SHELL_ABOUT_BACK, szAuthorsText, sizeof(szAuthorsText) / sizeof(WCHAR) ); + ShowWindow( hWndAuthors, SW_SHOW ); + } + + SetDlgItemTextW( hWnd, IDC_SHELL_ABOUT_AUTHORS, szAuthorsText ); + bShowingAuthors = !bShowingAuthors; + return TRUE; + } + } + break; + + case WM_CLOSE: + EndDialog(hWnd, TRUE); + break; } - return 0; + return FALSE; } @@ -1076,32 +1229,27 @@ BOOL WINAPI ShellAboutA( HWND hWnd, LPCSTR szApp, LPCSTR szOtherStuff, HICON hIc * ShellAboutW [SHELL32.289] */ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, - HICON hIcon ) + HICON hIcon ) { ABOUT_INFO info; - LOGFONTW logFont; HRSRC hRes; - LPVOID template; + LPVOID DlgTemplate; BOOL bRet; - static const WCHAR wszSHELL_ABOUT_MSGBOX[] = - {'S','H','E','L','L','_','A','B','O','U','T','_','M','S','G','B','O','X',0}; TRACE("\n"); - if(!(hRes = FindResourceW(shell32_hInstance, wszSHELL_ABOUT_MSGBOX, (LPWSTR)RT_DIALOG))) + // DialogBoxIndirectParamW will be called with the hInstance of the calling application, so we have to preload the dialog template + if(!(hRes = FindResourceW(shell32_hInstance, MAKEINTRESOURCEW(IDD_SHELL_ABOUT), (LPWSTR)RT_DIALOG))) return FALSE; - if(!(template = (LPVOID)LoadResource(shell32_hInstance, hRes))) + if(!(DlgTemplate = (LPVOID)LoadResource(shell32_hInstance, hRes))) return FALSE; + info.szApp = szApp; info.szOtherStuff = szOtherStuff; info.hIcon = hIcon ? hIcon : LoadIconW( 0, (LPWSTR)IDI_WINLOGO ); - SystemParametersInfoW( SPI_GETICONTITLELOGFONT, 0, &logFont, 0 ); - info.hFont = CreateFontIndirectW( &logFont ); - bRet = DialogBoxIndirectParamW((HINSTANCE)GetWindowLongPtrW( hWnd, GWLP_HINSTANCE ), - template, hWnd, AboutDlgProc, (LPARAM)&info ); - DeleteObject(info.hFont); + DlgTemplate, hWnd, AboutDlgProc, (LPARAM)&info ); return bRet; } diff --git a/reactos/dll/win32/shell32/shresdef.h b/reactos/dll/win32/shell32/shresdef.h index 295069d4e48..862314eb543 100644 --- a/reactos/dll/win32/shell32/shresdef.h +++ b/reactos/dll/win32/shell32/shresdef.h @@ -19,37 +19,42 @@ #ifndef __WINE_SHELL_RES_H #define __WINE_SHELL_RES_H +#define IDC_STATIC -1 + +/* Bitmap ID's */ +#define IDB_SHELL_ABOUT_LOGO_24BPP 131 + /* columntitles for the shellview */ -#define IDS_SHV_COLUMN1 7 -#define IDS_SHV_COLUMN2 8 -#define IDS_SHV_COLUMN3 9 -#define IDS_SHV_COLUMN4 10 -#define IDS_SHV_COLUMN5 11 -#define IDS_SHV_COLUMN6 12 -#define IDS_SHV_COLUMN7 13 -#define IDS_SHV_COLUMN8 14 -#define IDS_SHV_COLUMN9 15 -#define IDS_SHV_COLUMN10 16 -#define IDS_SHV_COLUMN11 17 -#define IDS_SHV_COLUMN_DELFROM 18 -#define IDS_SHV_COLUMN_DELDATE 19 +#define IDS_SHV_COLUMN1 7 +#define IDS_SHV_COLUMN2 8 +#define IDS_SHV_COLUMN3 9 +#define IDS_SHV_COLUMN4 10 +#define IDS_SHV_COLUMN5 11 +#define IDS_SHV_COLUMN6 12 +#define IDS_SHV_COLUMN7 13 +#define IDS_SHV_COLUMN8 14 +#define IDS_SHV_COLUMN9 15 +#define IDS_SHV_COLUMN10 16 +#define IDS_SHV_COLUMN11 17 +#define IDS_SHV_COLUMN_DELFROM 18 +#define IDS_SHV_COLUMN_DELDATE 19 -#define IDS_DESKTOP 20 -#define IDS_MYCOMPUTER 21 +#define IDS_DESKTOP 20 +#define IDS_MYCOMPUTER 21 -#define IDS_SELECT 22 -#define IDS_OPEN 23 -#define IDS_VIEW_LARGE 24 -#define IDS_VIEW_SMALL 25 -#define IDS_VIEW_LIST 26 -#define IDS_VIEW_DETAILS 27 +#define IDS_SELECT 22 +#define IDS_OPEN 23 +#define IDS_VIEW_LARGE 24 +#define IDS_VIEW_SMALL 25 +#define IDS_VIEW_LIST 26 +#define IDS_VIEW_DETAILS 27 -#define IDS_RESTART_TITLE 40 -#define IDS_RESTART_PROMPT 41 -#define IDS_SHUTDOWN_TITLE 42 -#define IDS_SHUTDOWN_PROMPT 43 +#define IDS_RESTART_TITLE 40 +#define IDS_RESTART_PROMPT 41 +#define IDS_SHUTDOWN_TITLE 42 +#define IDS_SHUTDOWN_PROMPT 43 #define IDS_PROGRAMS 45 #define IDS_PERSONAL 46 @@ -84,12 +89,12 @@ #define IDS_CREATEFOLDER_DENIED 128 #define IDS_CREATEFOLDER_CAPTION 129 -#define IDS_DELETEITEM_CAPTION 130 +#define IDS_DELETEITEM_CAPTION 130 #define IDS_DELETEFOLDER_CAPTION 131 -#define IDS_DELETEITEM_TEXT 132 -#define IDS_DELETEMULTIPLE_TEXT 133 +#define IDS_DELETEITEM_TEXT 132 +#define IDS_DELETEMULTIPLE_TEXT 133 #define IDS_OVERWRITEFILE_CAPTION 134 -#define IDS_OVERWRITEFILE_TEXT 135 +#define IDS_OVERWRITEFILE_TEXT 135 #define IDS_DELETESELECTED_TEXT 136 #define IDS_TRASHFOLDER_TEXT 137 #define IDS_TRASHITEM_TEXT 138 @@ -98,24 +103,42 @@ #define IDS_OVERWRITEFOLDER_TEXT 141 #define IDS_OPEN_WITH 142 #define IDS_OPEN_WITH_CHOOSE 143 +#define IDS_SHELL_ABOUT_AUTHORS 144 +#define IDS_SHELL_ABOUT_BACK 145 -/* Note: this string is referenced from the registry*/ +/* Note: this string is referenced from the registry */ #define IDS_RECYCLEBIN_FOLDER_NAME 8964 -#define IDD_ICON 0x4300 -#define IDD_MESSAGE 0x4301 +#define IDD_ICON 0x4300 +#define IDD_MESSAGE 0x4301 /* these IDs are the same as on native */ -#define IDD_YESTOALL 0x3207 +#define IDD_YESTOALL 0x3207 + /* browse for folder dialog box */ -#define IDD_MAKENEWFOLDER 0x3746 -#define IDD_FOLDERTEXT 0x3745 -#define IDD_FOLDER 0x3744 -#define IDD_STATUS 0x3743 -#define IDD_TITLE 0x3742 -#define IDD_TREEVIEW 0x3741 +#define IDD_MAKENEWFOLDER 0x3746 +#define IDD_FOLDERTEXT 0x3745 +#define IDD_FOLDER 0x3744 +#define IDD_STATUS 0x3743 +#define IDD_TITLE 0x3742 +#define IDD_TREEVIEW 0x3741 #define SHELL_EXTENDED_SHORTCUT_DLG 0x4000 +/* ID's of the ShellAbout controls */ +// Part 1 - ID's identical to Windows Server 2003 SP1's shell32.dll +#define IDD_SHELL_ABOUT 0x3810 +#define IDC_SHELL_ABOUT_ICON 0x3009 +#define IDC_SHELL_ABOUT_APPNAME 0x3500 +#define IDC_SHELL_ABOUT_OTHERSTUFF 0x350D +#define IDC_SHELL_ABOUT_REG_USERNAME 0x3507 +#define IDC_SHELL_ABOUT_REG_ORGNAME 0x3508 +#define IDC_SHELL_ABOUT_PHYSMEM 0x3503 + +// Part 2 - ReactOS-specific ID's +#define IDD_SHELL_ABOUT_AUTHORS 0x4100 +#define IDC_SHELL_ABOUT_AUTHORS 0x4101 +#define IDC_SHELL_ABOUT_AUTHORS_LISTBOX 0x4102 + #define IDI_SHELL_DOCUMENT 1 #define IDI_SHELL_FOLDER 4 #define IDI_SHELL_FOLDER_OPEN 5 diff --git a/reactos/include/reactos/version.rc b/reactos/include/reactos/version.rc index 9a347e79f96..0e4338335e0 100644 --- a/reactos/include/reactos/version.rc +++ b/reactos/include/reactos/version.rc @@ -16,6 +16,13 @@ #include "version.h" #include "buildno.h" +/* Define some defaults (shouldn't be overwritten by applications */ +#define REACTOS_DEFAULT_STR_COMPANY_NAME "ReactOS Development Team\0" +#define REACTOS_DEFAULT_STR_DESCRIPTION "ReactOS Core Component\0" +#define REACTOS_DEFAULT_STR_INTERNAL_NAME "\0" +#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-2007 ReactOS Team\0" +#define REACTOS_DEFAULT_STR_PRODUCT_NAME "ReactOS Operating System\0" + /* Set defaults for everything, unless overridden */ #ifndef REACTOS_FILEVERSION #ifdef REACTOS_VERSION_DLL @@ -58,11 +65,11 @@ #endif /* REACTOS_FILESUBTYPE */ #ifndef REACTOS_STR_COMPANY_NAME -#define REACTOS_STR_COMPANY_NAME "ReactOS Development Team\0" +#define REACTOS_STR_COMPANY_NAME REACTOS_DEFAULT_STR_COMPANY_NAME #endif /* REACTOS_STR_COMPANY_NAME */ #ifndef REACTOS_STR_FILE_DESCRIPTION -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS core dll\0" +#define REACTOS_STR_FILE_DESCRIPTION REACTOS_DEFAULT_STR_FILE_DESCRIPTION #endif /* REACTOS_STR_FILE_DESCRIPTION */ #ifndef REACTOS_STR_FILE_VERSION @@ -74,11 +81,11 @@ #endif /* REACTOS_STR_FILE_VERSION */ #ifndef REACTOS_STR_INTERNAL_NAME -#define REACTOS_STR_INTERNAL_NAME "\0" +#define REACTOS_STR_INTERNAL_NAME REACTOS_DEFAULT_STR_INTERNAL_NAME #endif /* REACTOS_STR_INTERNAL_NAME */ #ifndef REACTOS_STR_LEGAL_COPYRIGHT -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2007 ReactOS Team\0" +#define REACTOS_STR_LEGAL_COPYRIGHT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT #endif /* REACTOS_STR_LEGAL_COPYRIGHT */ #ifndef REACTOS_STR_ORIGINAL_FILENAME @@ -86,7 +93,7 @@ #endif /* REACTOS_STR_ORIGINAL_FILENAME */ #ifndef REACTOS_STR_PRODUCT_NAME -#define REACTOS_STR_PRODUCT_NAME "ReactOS Operating System\0" +#define REACTOS_STR_PRODUCT_NAME REACTOS_DEFAULT_STR_PRODUCT_NAME #endif /* REACTOS_STR_PRODUCT_NAME */ #ifndef REACTOS_STR_PRODUCT_VERSION