Index: base/applications/notepad/dialog.c
===================================================================
--- base/applications/notepad/dialog.c	(revision 66064)
+++ base/applications/notepad/dialog.c	(working copy)
@@ -33,7 +33,7 @@
 static const TCHAR szDefaultExt[] = _T("txt");
 static const TCHAR txt_files[] = _T("*.txt");
 
-static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);
+static UINT_PTR CALLBACK DIALOG_PAGESETUP_Hook(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 
 #ifndef UNICODE
 static LPSTR ConvertToASCII(LPSTR pszText)
@@ -654,6 +654,9 @@
     /* Let commdlg manage copy settings */
     printer.nCopies = (WORD)PD_USEDEVMODECOPIES;
 
+    printer.hDevMode = Globals.hDevMode;
+    printer.hDevNames = Globals.hDevNames;
+
     if (!PrintDlg(&printer))
     {
         DeleteObject(font);
@@ -660,6 +663,9 @@
         return;
     }
 
+    Globals.hDevMode = printer.hDevMode;
+    Globals.hDevNames = printer.hDevNames;
+
     assert(printer.hDC != 0);
 
     /* initialize DOCINFO */
@@ -781,20 +787,6 @@
     DeleteObject(font);
 }
 
-VOID DIALOG_FilePrinterSetup(VOID)
-{
-    PRINTDLG printer;
-
-    ZeroMemory(&printer, sizeof(printer));
-    printer.lStructSize = sizeof(printer);
-    printer.hwndOwner = Globals.hMainWnd;
-    printer.hInstance = Globals.hInstance;
-    printer.Flags = PD_PRINTSETUP;
-    printer.nCopies = 1;
-
-    PrintDlg(&printer);
-}
-
 VOID DIALOG_FileExit(VOID)
 {
     PostMessage(Globals.hMainWnd, WM_CLOSE, 0, 0l);
@@ -1257,20 +1249,38 @@
  */
 VOID DIALOG_FilePageSetup(void)
 {
-    DialogBox(Globals.hInstance,
-              MAKEINTRESOURCE(DIALOG_PAGESETUP),
-              Globals.hMainWnd,
-              DIALOG_PAGESETUP_DlgProc);
+    PAGESETUPDLG page;
+
+    ZeroMemory(&page, sizeof(page));
+    page.lStructSize = sizeof(page);
+    page.hwndOwner = Globals.hMainWnd;
+    page.Flags = PSD_ENABLEPAGESETUPTEMPLATE | PSD_ENABLEPAGESETUPHOOK | PSD_MARGINS;
+    page.hInstance = Globals.hInstance;
+    page.rtMargin.left = Globals.lMarginLeft;
+    page.rtMargin.top = Globals.lMarginTop;
+    page.rtMargin.right = Globals.lMarginRight;
+    page.rtMargin.bottom = Globals.lMarginBottom;
+    page.hDevMode = Globals.hDevMode;
+    page.hDevNames = Globals.hDevNames;
+    page.lpPageSetupTemplateName = MAKEINTRESOURCE(DIALOG_PAGESETUP);
+    page.lpfnPageSetupHook = DIALOG_PAGESETUP_Hook;
+
+    PageSetupDlg(&page);
+
+    Globals.hDevMode = page.hDevMode;
+    Globals.hDevNames = page.hDevNames;
+    Globals.lMarginLeft = page.rtMargin.left;
+    Globals.lMarginTop = page.rtMargin.top;
+    Globals.lMarginRight = page.rtMargin.right;
+    Globals.lMarginBottom = page.rtMargin.bottom;
 }
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *           DIALOG_PAGESETUP_DlgProc
+ *           DIALOG_PAGESETUP_Hook
  */
 
-static INT_PTR
-WINAPI
-DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static UINT_PTR CALLBACK DIALOG_PAGESETUP_Hook(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     switch (msg)
     {
@@ -1283,17 +1293,11 @@
                 /* save user input and close dialog */
                 GetDlgItemText(hDlg, 0x141, Globals.szHeader, SIZEOF(Globals.szHeader));
                 GetDlgItemText(hDlg, 0x143, Globals.szFooter, SIZEOF(Globals.szFooter));
-                GetDlgItemText(hDlg, 0x14A, Globals.szMarginTop, SIZEOF(Globals.szMarginTop));
-                GetDlgItemText(hDlg, 0x150, Globals.szMarginBottom, SIZEOF(Globals.szMarginBottom));
-                GetDlgItemText(hDlg, 0x147, Globals.szMarginLeft, SIZEOF(Globals.szMarginLeft));
-                GetDlgItemText(hDlg, 0x14D, Globals.szMarginRight, SIZEOF(Globals.szMarginRight));
-                EndDialog(hDlg, IDOK);
-                return TRUE;
+                return FALSE;
 
             case IDCANCEL:
                 /* discard user input and close dialog */
-                EndDialog(hDlg, IDCANCEL);
-                return TRUE;
+                return FALSE;
 
             case IDHELP:
                 {
@@ -1314,10 +1318,6 @@
         /* fetch last user input prior to display dialog */
         SetDlgItemText(hDlg, 0x141, Globals.szHeader);
         SetDlgItemText(hDlg, 0x143, Globals.szFooter);
-        SetDlgItemText(hDlg, 0x14A, Globals.szMarginTop);
-        SetDlgItemText(hDlg, 0x150, Globals.szMarginBottom);
-        SetDlgItemText(hDlg, 0x147, Globals.szMarginLeft);
-        SetDlgItemText(hDlg, 0x14D, Globals.szMarginRight);
         break;
     }
 
Index: base/applications/notepad/dialog.h
===================================================================
--- base/applications/notepad/dialog.h	(revision 66064)
+++ base/applications/notepad/dialog.h	(working copy)
@@ -26,7 +26,6 @@
 BOOL DIALOG_FileSaveAs(VOID);
 VOID DIALOG_FilePrint(VOID);
 VOID DIALOG_FilePageSetup(VOID);
-VOID DIALOG_FilePrinterSetup(VOID);
 VOID DIALOG_FileExit(VOID);
 
 VOID DIALOG_EditUndo(VOID);
Index: base/applications/notepad/lang/bg-BG.rc
===================================================================
--- base/applications/notepad/lang/bg-BG.rc	(revision 66064)
+++ base/applications/notepad/lang/bg-BG.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Настройка на страницата...", CMD_PAGE_SETUP
         MENUITEM "От&печатване\tCtrl+P", CMD_PRINT
-        MENUITEM "Настройка на печатача...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "Из&ход", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Настройка на страницата"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Глава:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Пета:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Полета:", 0x144, 10, 43, 160, 45
-    LTEXT "&Отляво:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Отгоре:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Отдясно:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Отдолу:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "Добре", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Отказ", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Помо&щ", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/cs-CZ.rc
===================================================================
--- base/applications/notepad/lang/cs-CZ.rc	(revision 66064)
+++ base/applications/notepad/lang/cs-CZ.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Nas&tavení stránky...", CMD_PAGE_SETUP
         MENUITEM "&Tisk\tCtrl+P", CMD_PRINT
-        MENUITEM "Nastavení tiská&rny...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "&Konec", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Nastavení stránky"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "Zá&hlaví:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Zápatí:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Okraje:", 0x144, 10, 43, 160, 45
-    LTEXT "&Levý:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Horní:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "P&ravý:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Dolní:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Storno", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Nápověda", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/da-DK.rc
===================================================================
--- base/applications/notepad/lang/da-DK.rc	(revision 66064)
+++ base/applications/notepad/lang/da-DK.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Side&opsætning...", CMD_PAGE_SETUP
         MENUITEM "&Udskriv\tCtrl+P", CMD_PRINT
-        MENUITEM "&Indstil printer...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "&Afslut", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Sideopsætning"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Sidehoved:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "Side&fod:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "Margener:", 0x144, 10, 43, 160, 45
-    LTEXT "&Venstre:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Top:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Højre:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Bund:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Annuller", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Hjælp", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/de-DE.rc
===================================================================
--- base/applications/notepad/lang/de-DE.rc	(revision 66064)
+++ base/applications/notepad/lang/de-DE.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Seite ein&richten...", CMD_PAGE_SETUP
         MENUITEM "&Drucken\tStrg+P", CMD_PRINT
-        MENUITEM "Drucker&einrichtung...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "&Beenden", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Seite einrichten' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
 CAPTION "Seite einrichten"
 BEGIN
-    LTEXT "&Kopfzeile:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Fußzeile:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "Ränder", 0x144, 10, 43, 160, 45
-    LTEXT "&Links:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Oben:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Rechts:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Unten:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Abbrechen", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Hilfe", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Vorschau", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Papier", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Größe:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Zufuhr:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Ausrichtung", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Hochformat", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Querformat", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Ränder", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "&Links:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Rechts:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Oben:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Unten:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Kopfzeile:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Fußzeile:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Hilfe", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "&Abbrechen", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "&Drucker...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Zeichenkodierung' */
Index: base/applications/notepad/lang/el-GR.rc
===================================================================
--- base/applications/notepad/lang/el-GR.rc	(revision 66064)
+++ base/applications/notepad/lang/el-GR.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Ε&πιλογές σελίδας...", CMD_PAGE_SETUP
         MENUITEM "&Εκτύπωση\tCtrl+P", CMD_PRINT
-        MENUITEM "Επιλογές εκ&τυπωτή ...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "Έ&ξοδος", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Επιλογές Σελίδας"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Κεφαλή:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Υποσέλιδο:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Όρια:", 0x144, 10, 43, 160, 45
-    LTEXT "&Αριστερά:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Πάνω:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Δεξιά:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Κάτω:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Ακύρωση", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Βοήθεια", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/en-US.rc
===================================================================
--- base/applications/notepad/lang/en-US.rc	(revision 66064)
+++ base/applications/notepad/lang/en-US.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Page Se&tup...", CMD_PAGE_SETUP
         MENUITEM "&Print\tCtrl+P", CMD_PRINT
-        MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "E&xit", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
 CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Header:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Footer:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Margins:", 0x144, 10, 43, 160, 45
-    LTEXT "&Left:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Top:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Right:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Bottom:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Help", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/es-ES.rc
===================================================================
--- base/applications/notepad/lang/es-ES.rc	(revision 66064)
+++ base/applications/notepad/lang/es-ES.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Configurar &página...", CMD_PAGE_SETUP
         MENUITEM "&Imprimir\tCtrl+P", CMD_PRINT
-        MENUITEM "A&justes de impresión...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "&Salir", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Ajuste de página"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Encabezado:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 62, 05, 108, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Pie de página:", 0x142, 10, 24, 60, 15
-    EDITTEXT 0x143, 62, 22, 108, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Márgenes:", 0x144, 10, 43, 160, 45
-    LTEXT "&Izquierda:", 0x145, 19, 55, 32, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 53, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "A&rriba:", 0x148, 19, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 53, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Derecha:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "Aba&jo:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "Aceptar", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Cancelar", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Ayuda", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/eu-ES.rc
===================================================================
--- base/applications/notepad/lang/eu-ES.rc	(revision 66064)
+++ base/applications/notepad/lang/eu-ES.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Prestatu &orrialdea...", CMD_PAGE_SETUP
         MENUITEM "&Inprimatu\tCtrl+P", CMD_PRINT
-        MENUITEM "Inprimatzeko &aurrebista...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "&Irten", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Doitu orria"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Izenburua:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Oina:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Marjinak:", 0x144, 10, 43, 160, 45
-    LTEXT "&Ezkerrera:", 0x145, 15, 55, 33, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "Gora:", 0x148, 15, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Eskuinera:", 0x14B, 95, 55, 33, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "Behera:", 0x14E, 95, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "Ados", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Utzi", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Laguntza", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/fi-FI.rc
===================================================================
--- base/applications/notepad/lang/fi-FI.rc	(revision 66064)
+++ base/applications/notepad/lang/fi-FI.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "&Sivun asetukset...", CMD_PAGE_SETUP
         MENUITEM "T&ulosta\tCtrl+P", CMD_PRINT
-        MENUITEM "&Kirjoittimen asetukset...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "&Poistu", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Sivun asetukset"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Yläotsikko:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "Alao&tsikko:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Marginaali:", 0x144, 10, 43, 160, 45
-    LTEXT "&Vasen:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "Y&lä:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Oikea:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Ala:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Peruuta", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Apua", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/fr-FR.rc
===================================================================
--- base/applications/notepad/lang/fr-FR.rc	(revision 66064)
+++ base/applications/notepad/lang/fr-FR.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "&Mise en page...", CMD_PAGE_SETUP
         MENUITEM "Im&primer\tCtrl+P", CMD_PRINT
-        MENUITEM "&Configuration de l'imprimante...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "&Quitter", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Mise en page"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&En-tête :", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Pied de page :", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Marges :", 0x144, 10, 43, 160, 45
-    LTEXT "&Gauche :", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Haut :", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Droite :", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Bas :", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Annuler", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Aide", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/he-IL.rc
===================================================================
--- base/applications/notepad/lang/he-IL.rc	(revision 66064)
+++ base/applications/notepad/lang/he-IL.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "הגדרת עמ&וד", CMD_PAGE_SETUP
         MENUITEM "הד&פסה\tCtrl+P", CMD_PRINT
-        MENUITEM "הג&דרת מדפסת...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "&יציאה", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "הגדרת עמוד"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "כותרת עליונה:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "כותרת תחתונה:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "שוליים:", 0x144, 10, 43, 160, 45
-    LTEXT "שמאליים:", 0x145, 14, 55, 35, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "עליונים:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "ימניים:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "תחתונים:", 0x14E, 97, 73, 33, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "אישור", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "ביטול", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "עזרה", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/hu-HU.rc
===================================================================
--- base/applications/notepad/lang/hu-HU.rc	(revision 66064)
+++ base/applications/notepad/lang/hu-HU.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "&Oldalbeállítás...", CMD_PAGE_SETUP
         MENUITEM "Nyom&tatás\tCtrl+P", CMD_PRINT
-        MENUITEM "Nyomtató &beállítás...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "&Kilépés", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Oldalbeállítás"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Fejléc:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Lábléc:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Margók:", 0x144, 10, 43, 160, 45
-    LTEXT "&Bal:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Felsõ:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Jobb:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Alsó:", 0x14E,100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Mégse", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Súgó", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/hy-AM.rc
===================================================================
--- base/applications/notepad/lang/hy-AM.rc	(revision 66064)
+++ base/applications/notepad/lang/hy-AM.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Էջի& պարամետրերը...", CMD_PAGE_SETUP
         MENUITEM "&Տպել\tCtrl+P", CMD_PRINT
-        MENUITEM "&Տպիչի կարգավորում...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "Ե&լք", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Էջի պարամետրերը"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "Վերեվից սահմանափակում:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "Ներքևից սահմանափակում:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "Դածտեր:", 0x144, 10, 43, 160, 45
-    LTEXT "&Ձախ:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Վորևի:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Աջ:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Ներքևի:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Չնդունել", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Տեղեկություն", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/id-ID.rc
===================================================================
--- base/applications/notepad/lang/id-ID.rc	(revision 66064)
+++ base/applications/notepad/lang/id-ID.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Se&tup Halaman...", CMD_PAGE_SETUP
         MENUITEM "&Cetak\tCtrl+P", CMD_PRINT
-        MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "&Keluar", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Setup Halaman"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Header:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Footer:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Marjin:", 0x144, 10, 43, 160, 45
-    LTEXT "K&iri:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Atas:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "Ka&nan:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "Ba&wah:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Batal", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Bantuan", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/it-IT.rc
===================================================================
--- base/applications/notepad/lang/it-IT.rc	(revision 66064)
+++ base/applications/notepad/lang/it-IT.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "I&mposta pagina...", CMD_PAGE_SETUP
         MENUITEM "S&tampa\tCtrl+P", CMD_PRINT
-        MENUITEM "&Configurazione stampante...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "&Esci", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Imposta pagina"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Intestazione:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Piè di pagina:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Margini:", 0x144, 10, 43,160, 45
-    LTEXT "Si&nistro:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "S&uperiore:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "D&estro:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "In&feriore:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Annulla", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Aiuto", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/ja-JP.rc
===================================================================
--- base/applications/notepad/lang/ja-JP.rc	(revision 66064)
+++ base/applications/notepad/lang/ja-JP.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "ページ設定(&T)...", CMD_PAGE_SETUP
         MENUITEM "印刷(&P)\tCtrl+P", CMD_PRINT
-        MENUITEM "プリンタの設定(&R)...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "メモ帳の終了(&X)", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 9, "MS UI Gothic"
-CAPTION "ページ設定"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "ヘッダ(&H):", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "フッタ(&F):", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "マージン(&M):", 0x144, 10, 43, 160, 45
-    LTEXT "左(&L):", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "上(&T):", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "右(&R):", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "下(&B):", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "キャンセル", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "ヘルプ(&H)", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/lt-LT.rc
===================================================================
--- base/applications/notepad/lang/lt-LT.rc	(revision 66064)
+++ base/applications/notepad/lang/lt-LT.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "P&uslapio nuostatos...", CMD_PAGE_SETUP
         MENUITEM "&Spausdinti\tCtrl+P", CMD_PRINT
-        MENUITEM "S&pausdintuvo nuostatos...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "&Baigti", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Puslapio nuostatos"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Antraštė:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Poraštė:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "Pa&raštės:", 0x144, 10, 43, 160, 45
-    LTEXT "&Kairė:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Viršus:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Dešinė:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "Apač&ia:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "Gerai", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Atsisakyti", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Pagalba", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/nl-NL.rc
===================================================================
--- base/applications/notepad/lang/nl-NL.rc	(revision 66064)
+++ base/applications/notepad/lang/nl-NL.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Pagina-in&stelling...", CMD_PAGE_SETUP
         MENUITEM "&Afdrukken\tCtrl+P", CMD_PRINT
-        MENUITEM "Printerinstellingen...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "&Afsluiten", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Pagina-instelling"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Koptekst:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Voettekst:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Marges:", 0x144, 10, 43,160, 45
-    LTEXT "Li&nks:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Boven:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Rechts:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Onder:", 0x14E,100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Annuleren", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Help", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/no-NO.rc
===================================================================
--- base/applications/notepad/lang/no-NO.rc	(revision 66064)
+++ base/applications/notepad/lang/no-NO.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Side &innstillinger...", CMD_PAGE_SETUP
         MENUITEM "&Utskrift\tCtrl+P", CMD_PRINT
-        MENUITEM "U&tskrift innstillinger...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "A&vslutt", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Side innstillinger"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Topptekst:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Bunntekst:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Marger:", 0x144, 10, 43, 160, 45
-    LTEXT "&Venstre:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Topp:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Høyre", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Bunn:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Avbryt", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Hjelp", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/pl-PL.rc
===================================================================
--- base/applications/notepad/lang/pl-PL.rc	(revision 66064)
+++ base/applications/notepad/lang/pl-PL.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "&Ustawienia strony...", CMD_PAGE_SETUP
         MENUITEM "&Drukuj\tCtrl+P", CMD_PRINT
-        MENUITEM "Ustawienia &drukarki...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "Zakoń&cz", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Ustawienia strony"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Nagłówek:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Stopka:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Marginesy:", 0x144, 10, 43, 160, 45
-    LTEXT "&Lewy:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Górny:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "P&rawy:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Dolny:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Anuluj", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Pomo&c", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/pt-BR.rc
===================================================================
--- base/applications/notepad/lang/pt-BR.rc	(revision 66064)
+++ base/applications/notepad/lang/pt-BR.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "C&onfigurar página...", CMD_PAGE_SETUP
         MENUITEM "&Imprimir\tCtrl+P", CMD_PRINT
-        MENUITEM "Configurar i&mpressora...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "Sai&r", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Configurar página"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Cabeçalho:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Rodapé:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Margens:", 0x144, 10, 43, 160, 45
-    LTEXT "&Esquerda:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Superior:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Direita:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Inferior:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Cancelar", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Ajuda", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/pt-PT.rc
===================================================================
--- base/applications/notepad/lang/pt-PT.rc	(revision 66064)
+++ base/applications/notepad/lang/pt-PT.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "C&onfigurar página...", CMD_PAGE_SETUP
         MENUITEM "&Imprimir\tCtrl+P", CMD_PRINT
-        MENUITEM "Configurar i&mpressora...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "Sai&r", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Configurar página"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Cabeçalho:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Rodapé:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Margens:", 0x144, 10, 43, 160, 45
-    LTEXT "&Esquerda:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Superior:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Direita:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Inferior:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Cancelar", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Ajuda", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/ro-RO.rc
===================================================================
--- base/applications/notepad/lang/ro-RO.rc	(revision 66064)
+++ base/applications/notepad/lang/ro-RO.rc	(working copy)
@@ -34,7 +34,6 @@
         MENUITEM SEPARATOR
         MENUITEM "&Configurare pagină…", CMD_PAGE_SETUP
         MENUITEM "I&mprimă\tCtrl+P", CMD_PRINT
-        MENUITEM "C&onfigurare imprimantă…", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "I&eșire", CMD_EXIT
     END
@@ -76,27 +75,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Configurare pagină"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "Ant&et:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "Su&bsol:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "Margini:", 0x144, 10, 43, 160, 45
-    LTEXT "Stâng&a:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "S&us:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Dreapta:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "J&os:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "Con&firmă", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "A&nulează", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Manual…", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/ru-RU.rc
===================================================================
--- base/applications/notepad/lang/ru-RU.rc	(revision 66064)
+++ base/applications/notepad/lang/ru-RU.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Пара&метры страницы...", CMD_PAGE_SETUP
         MENUITEM "&Печатать\tCtrl+P", CMD_PRINT
-        MENUITEM "&Настройка принтера...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "В&ыход", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Параметры страницы"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "В&ерхний колонтитул:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "Н&ижний колонтитул:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "Поля (мм):", 0x144, 10, 43, 160, 45
-    LTEXT "&Левое:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Верхнее:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Правое:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Нижнее:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Отмена", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Справка", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/sk-SK.rc
===================================================================
--- base/applications/notepad/lang/sk-SK.rc	(revision 66064)
+++ base/applications/notepad/lang/sk-SK.rc	(working copy)
@@ -37,7 +37,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Nasta&venie strany...", CMD_PAGE_SETUP
         MENUITEM "&Tlačiť\tCtrl+P", CMD_PRINT
-        MENUITEM "Nastavenie tlačia&rne...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "&Skončiť", CMD_EXIT
     END
@@ -79,27 +78,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Nastavenie strany"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "H&lavička:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Päta:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "&Okraje:", 0x144, 10, 43, 160, 45
-    LTEXT "Ľa&vý:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Horný:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "P&ravý:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Dolný:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Zrušiť", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Pomocník", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/sl-SI.rc
===================================================================
--- base/applications/notepad/lang/sl-SI.rc	(revision 66064)
+++ base/applications/notepad/lang/sl-SI.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "P&riprava strani ...", CMD_PAGE_SETUP
         MENUITEM "Na&tisni\tCtrl+P", CMD_PRINT
-        MENUITEM "&Tiskalnik ...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "Iz&hod", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
 CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Glava:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Noga:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "Robovi", 0x144, 10, 43, 160, 45
-    LTEXT "&Levo:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Desno:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Zgoraj:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Spodaj:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "V redu", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Preklièi", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Pomoè", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/sq-AL.rc
===================================================================
--- base/applications/notepad/lang/sq-AL.rc	(revision 66064)
+++ base/applications/notepad/lang/sq-AL.rc	(working copy)
@@ -33,7 +33,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Konfigurim Faqes...", CMD_PAGE_SETUP
         MENUITEM "&Printo\tCtrl+P", CMD_PRINT
-        MENUITEM "Konfigurim P&rinter...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "Dil", CMD_EXIT
     END
@@ -75,27 +74,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Konfigurim Faqe"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "Kokë:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "Këmbë:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "Kufijtë:", 0x144, 10, 43, 160, 45
-    LTEXT "Majtas:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "Lart:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "Djathtas:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "Poshtë:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Anulo", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Ndihmë", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+  PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/sv-SE.rc
===================================================================
--- base/applications/notepad/lang/sv-SE.rc	(revision 66064)
+++ base/applications/notepad/lang/sv-SE.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Utskrifts&format...", CMD_PAGE_SETUP
         MENUITEM "Skriv &ut\tCtrl+P", CMD_PRINT
-        MENUITEM "Skrivar&inställningar...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "&Avsluta", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Skrivarinställningar"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Sidhuvud:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Sidfot:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "Marginaler:", 0x144, 10, 43, 160, 45
-    LTEXT "&Vänsterkant:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Överkant:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Högerkant:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Nederkant:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Avbryt", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Hjälp", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/th-TH.rc
===================================================================
--- base/applications/notepad/lang/th-TH.rc	(revision 66064)
+++ base/applications/notepad/lang/th-TH.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "ปรับแต่งหน้า...", CMD_PAGE_SETUP
         MENUITEM "พิมพ์\tCtrl+P", CMD_PRINT
-        MENUITEM "ปรับแต่งเครื่องพิมพ์...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "ออก", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "ปรับแต่งหน้า"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "หัว:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Footer:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "ขอบกระดาษ:", 0x144, 10, 43,160, 45
-    LTEXT "ฃ้าย:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "บน:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "ขวา:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "ล่าง:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "ตกลง", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "ยกเลิก", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "ช่วยเหลีอ", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/tr-TR.rc
===================================================================
--- base/applications/notepad/lang/tr-TR.rc	(revision 66064)
+++ base/applications/notepad/lang/tr-TR.rc	(working copy)
@@ -31,7 +31,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Say&fa Ayarla...", CMD_PAGE_SETUP
         MENUITEM "Ya&zdır...\tCtrl+P", CMD_PRINT
-        MENUITEM "Yaz&ıcı Ayarla...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "&Çıkış", CMD_EXIT
     END
@@ -73,27 +72,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Sayfa Ayarla"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "&Üst Bilgi:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "&Alt Bilgi:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "Kıyı Payı:", 0x144, 10, 43, 160, 45
-    LTEXT "&Sol:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "Üs&t:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "Sa&ğ:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "A&lt:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "Tamam", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "İptal", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Yardım", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/uk-UA.rc
===================================================================
--- base/applications/notepad/lang/uk-UA.rc	(revision 66064)
+++ base/applications/notepad/lang/uk-UA.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Пара&метри сторінки...", CMD_PAGE_SETUP
         MENUITEM "Д&рук\tCtrl+P", CMD_PRINT
-        MENUITEM "Налаштування &принтера...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "В&ихід", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Параметри сторінки"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "В&ерхній колонтитул:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "Н&ижній колонтитул:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "Поля", 0x144, 10, 43, 160, 45
-    LTEXT "&Ліве:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Верхнє:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Праве:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Нижнє:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "Так", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Ні", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Довідка", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/uz-UZ.rc
===================================================================
--- base/applications/notepad/lang/uz-UZ.rc	(revision 66064)
+++ base/applications/notepad/lang/uz-UZ.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "Sahi&fa parametrlari...", CMD_PAGE_SETUP
         MENUITEM "Chop &etmoq...\tCtrl+P", CMD_PRINT
-        MENUITEM "&Настройка принтера...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "Chiq&moq", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "Sahifa parametrlari"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "Sa&rlavha:", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "Pastki kolontit&ul:", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "Chegaralar (мм):", 0x144, 10, 43, 160, 45
-    LTEXT "C&hap:", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "&Yuqori:", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "O‘&ng:", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "Pa&st:", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "Ha", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "Bekor qilmoq", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "&Справка", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/lang/zh-CN.rc
===================================================================
--- base/applications/notepad/lang/zh-CN.rc	(revision 66064)
+++ base/applications/notepad/lang/zh-CN.rc	(working copy)
@@ -29,7 +29,6 @@
         MENUITEM SEPARATOR
         MENUITEM "页面设置(&T)...", CMD_PAGE_SETUP
         MENUITEM "打印(&P)", CMD_PRINT
-        MENUITEM "打印设置(&R)...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "退出(&E)", CMD_EXIT
     END
@@ -71,27 +70,40 @@
 END
 
 /* Dialog 'Page setup' */
-DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP
 FONT 8, "MS Shell Dlg"
-CAPTION "页面设置"
+CAPTION "Page Setup"
 BEGIN
-    LTEXT "页眉(&H):", 0x140, 10, 07, 40, 15
-    EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
-    LTEXT "脚注(&F):", 0x142, 10, 24, 40, 15
-    EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
-    GROUPBOX "边缘空白(&M)：", 0x144, 10, 43, 160, 45
-    LTEXT "左(&L)：", 0x145, 20, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "上(&T)：", 0x148, 20, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "右(&R)：", 0x14B, 100, 55, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    LTEXT "下(&B)：", 0x14E, 100, 73, 30, 10, WS_CHILD
-    EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-    DEFPUSHBUTTON "确定", IDOK, 180, 3, 40, 15, WS_TABSTOP
-    PUSHBUTTON "取消", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
-    PUSHBUTTON "帮助(&H)", IDHELP, 180, 39, 40, 15, WS_TABSTOP
+    GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX
+    CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80
+    CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80
+    CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4
+    GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX
+    LTEXT "&Size:", stc2, 16, 22, 36, 8
+    COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    LTEXT "&Tray:", stc3, 16, 42, 36, 8
+    COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL
+    GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX
+    AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON
+    AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON
+    GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX
+    LTEXT "L&eft:", stc15, 88, 82, 30, 8
+    EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Right:", stc16, 159, 82, 30, 8
+    EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "T&op:", stc17, 88, 102, 30, 8
+    EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Bottom:", stc18, 159, 102, 30, 8
+    EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER
+    LTEXT "&Header:", 0x140, 8, 132, 40, 15
+    EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT "&Footer:", 0x142, 8, 149, 40, 15
+    EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON
+    PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14
+    PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14
 END
 
 /* Dialog 'Encoding' */
Index: base/applications/notepad/main.c
===================================================================
--- base/applications/notepad/main.c	(revision 66064)
+++ base/applications/notepad/main.c	(working copy)
@@ -64,7 +64,6 @@
     case CMD_SAVE_AS: DIALOG_FileSaveAs(); break;
     case CMD_PRINT: DIALOG_FilePrint(); break;
     case CMD_PAGE_SETUP: DIALOG_FilePageSetup(); break;
-    case CMD_PRINTER_SETUP: DIALOG_FilePrinterSetup(); break;
     case CMD_EXIT: DIALOG_FileExit(); break;
 
     case CMD_UNDO: DIALOG_EditUndo(); break;
@@ -359,6 +358,10 @@
         if (DoCloseFile()) {
             if (Globals.hFont)
                 DeleteObject(Globals.hFont);
+            if (Globals.hDevMode)
+                GlobalFree(Globals.hDevMode);
+            if (Globals.hDevNames)
+                GlobalFree(Globals.hDevNames);
             DestroyWindow(hWnd);
         }
         break;
Index: base/applications/notepad/main.h
===================================================================
--- base/applications/notepad/main.h	(revision 66064)
+++ base/applications/notepad/main.h	(working copy)
@@ -51,6 +51,8 @@
     HWND hStatusBar;
     HFONT hFont; /* Font used by the edit control */
     HMENU hMenu;
+    HGLOBAL hDevMode;
+    HGLOBAL hDevNames;
     LOGFONT lfFont;
     BOOL bWrapLongLines;
     BOOL bShowStatusBar;
@@ -59,10 +61,10 @@
     TCHAR szFileName[MAX_PATH];
     TCHAR szFileTitle[MAX_PATH];
     TCHAR szFilter[2 * MAX_STRING_LEN + 100];
-    TCHAR szMarginTop[MAX_PATH];
-    TCHAR szMarginBottom[MAX_PATH];
-    TCHAR szMarginLeft[MAX_PATH];
-    TCHAR szMarginRight[MAX_PATH];
+    LONG lMarginTop;
+    LONG lMarginBottom;
+    LONG lMarginLeft;
+    LONG lMarginRight;
     TCHAR szHeader[MAX_PATH];
     TCHAR szFooter[MAX_PATH];
     TCHAR szStatusBarLineCol[MAX_PATH];
Index: base/applications/notepad/notepad_res.h
===================================================================
--- base/applications/notepad/notepad_res.h	(revision 66064)
+++ base/applications/notepad/notepad_res.h	(working copy)
@@ -34,14 +34,13 @@
 #define IDC_LICENSE      0x20B
 
 /* Commands */
-#define CMD_NEW           0x100
-#define CMD_OPEN          0x101
-#define CMD_SAVE          0x102
-#define CMD_SAVE_AS       0x103
-#define CMD_PRINT         0x104
-#define CMD_PAGE_SETUP    0x105
-#define CMD_PRINTER_SETUP 0x106
-#define CMD_EXIT          0x108
+#define CMD_NEW        0x100
+#define CMD_OPEN       0x101
+#define CMD_SAVE       0x102
+#define CMD_SAVE_AS    0x103
+#define CMD_PRINT      0x104
+#define CMD_PAGE_SETUP 0x105
+#define CMD_EXIT       0x108
 
 #define CMD_UNDO       0x110
 #define CMD_CUT        0x111
Index: base/applications/notepad/rsrc.rc
===================================================================
--- base/applications/notepad/rsrc.rc	(revision 66064)
+++ base/applications/notepad/rsrc.rc	(working copy)
@@ -19,6 +19,7 @@
 
 #include <windef.h>
 #include <winuser.h>
+#include <dlgs.h>
 
 #include "notepad_res.h"
 
Index: base/applications/notepad/settings.c
===================================================================
--- base/applications/notepad/settings.c	(revision 66064)
+++ base/applications/notepad/settings.c	(working copy)
@@ -133,12 +133,18 @@
         QueryByte(hKey, _T("lfStrikeOut"), &Globals.lfFont.lfStrikeOut);
         QueryByte(hKey, _T("lfUnderline"), &Globals.lfFont.lfUnderline);
         QueryDword(hKey, _T("lfWeight"), (DWORD*)&Globals.lfFont.lfWeight);
-        QueryDword(hKey, _T("iPointSize"), &dwPointSize);
-        QueryBool(hKey, _T("fWrap"), &Globals.bWrapLongLines);
-        QueryBool(hKey, _T("fStatusBar"), &Globals.bShowStatusBar);
+		QueryDword(hKey, _T("iPointSize"), &dwPointSize);
+		QueryBool(hKey, _T("fWrap"), &Globals.bWrapLongLines);
+		QueryBool(hKey, _T("fStatusBar"), &Globals.bShowStatusBar);
+		QueryString(hKey, _T("szHeader"), Globals.szHeader, sizeof(Globals.szHeader) / sizeof(Globals.szHeader[0]));
+		QueryString(hKey, _T("szTrailer"), Globals.szFooter, sizeof(Globals.szFooter) / sizeof(Globals.szFooter[0]));
+		QueryDword(hKey, _T("iMarginLeft"), (DWORD*)&Globals.lMarginLeft);
+		QueryDword(hKey, _T("iMarginTop"), (DWORD*)&Globals.lMarginTop);
+		QueryDword(hKey, _T("iMarginRight"), (DWORD*)&Globals.lMarginRight);
+		QueryDword(hKey, _T("iMarginBottom"), (DWORD*)&Globals.lMarginBottom);
 
-        QueryDword(hKey, _T("iWindowPosX"), (DWORD*)&Globals.main_rect.left);
-        QueryDword(hKey, _T("iWindowPosY"), (DWORD*)&Globals.main_rect.top);
+		QueryDword(hKey, _T("iWindowPosX"), (DWORD*)&Globals.main_rect.left);
+		QueryDword(hKey, _T("iWindowPosY"), (DWORD*)&Globals.main_rect.top);
         QueryDword(hKey, _T("iWindowPosDX"), (DWORD*)&dx);
         QueryDword(hKey, _T("iWindowPosDY"), (DWORD*)&dy);
 
@@ -195,12 +201,18 @@
         SaveDword(hKey, _T("lfStrikeOut"), Globals.lfFont.lfStrikeOut);
         SaveDword(hKey, _T("lfUnderline"), Globals.lfFont.lfUnderline);
         SaveDword(hKey, _T("lfWeight"), Globals.lfFont.lfWeight);
-        SaveDword(hKey, _T("iPointSize"), PointSizeFromHeight(Globals.lfFont.lfHeight));
-        SaveDword(hKey, _T("fWrap"), Globals.bWrapLongLines ? 1 : 0);
-        SaveDword(hKey, _T("fStatusBar"), Globals.bShowStatusBar ? 1 : 0);
-        SaveDword(hKey, _T("iWindowPosX"), Globals.main_rect.left);
-        SaveDword(hKey, _T("iWindowPosY"), Globals.main_rect.top);
-        SaveDword(hKey, _T("iWindowPosDX"), Globals.main_rect.right - Globals.main_rect.left);
+		SaveDword(hKey, _T("iPointSize"), PointSizeFromHeight(Globals.lfFont.lfHeight));
+		SaveDword(hKey, _T("fWrap"), Globals.bWrapLongLines ? 1 : 0);
+		SaveDword(hKey, _T("fStatusBar"), Globals.bShowStatusBar ? 1 : 0);
+		SaveString(hKey, _T("szHeader"), Globals.szHeader);
+		SaveString(hKey, _T("szTrailer"), Globals.szFooter);
+        SaveDword(hKey, _T("iMarginLeft"), Globals.lMarginLeft);
+		SaveDword(hKey, _T("iMarginTop"), Globals.lMarginTop);
+		SaveDword(hKey, _T("iMarginRight"), Globals.lMarginRight);
+		SaveDword(hKey, _T("iMarginBottom"), Globals.lMarginBottom);
+		SaveDword(hKey, _T("iWindowPosX"), Globals.main_rect.left);
+		SaveDword(hKey, _T("iWindowPosY"), Globals.main_rect.top);
+		SaveDword(hKey, _T("iWindowPosDX"), Globals.main_rect.right - Globals.main_rect.left);
         SaveDword(hKey, _T("iWindowPosDY"), Globals.main_rect.bottom - Globals.main_rect.top);
         RegCloseKey(hKey);
     }