diff --git a/reactos/base/applications/msconfig/De.rc b/reactos/base/applications/msconfig/De.rc
index 6712799a884..1aa4d5010b0 100644
--- a/reactos/base/applications/msconfig/De.rc
+++ b/reactos/base/applications/msconfig/De.rc
@@ -5,7 +5,7 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
     WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
     WS_THICKFRAME
 CAPTION "Systemkonfigurationsprogramm"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195
     DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
@@ -16,7 +16,7 @@ END
 
 IDD_STARTUP_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148
     PUSHBUTTON      "Alle &aktivieren",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14
@@ -25,7 +25,7 @@ END
 
 IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134
     EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY
@@ -34,7 +34,7 @@ END
 
 IDD_SERVICES_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148
     PUSHBUTTON      "Alle &aktivieren",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14
@@ -43,7 +43,7 @@ END
 
 IDD_GENERAL_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
  GROUPBOX "Systemstartauswahl", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT
  CONTROL "&Normaler Systemstart - Alle Gerätetreiber und Dienste laden", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 210, 10
@@ -56,7 +56,7 @@ END
 
 IDD_FREELDR_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
    CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200
    PUSHBUTTON    "&Alle Bootpfade überprüfen", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 90, 12
@@ -77,7 +77,7 @@ END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE  0, 0, 175, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
    CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10
    EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12
diff --git a/reactos/base/applications/msconfig/En.rc b/reactos/base/applications/msconfig/En.rc
index 6cc93e32368..66074de31c2 100644
--- a/reactos/base/applications/msconfig/En.rc
+++ b/reactos/base/applications/msconfig/En.rc
@@ -5,7 +5,7 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
     WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
     WS_THICKFRAME
 CAPTION "System configuration program"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195
     DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
@@ -16,7 +16,7 @@ END
 
 IDD_STARTUP_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148
     PUSHBUTTON      "&Activate all",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14
@@ -25,7 +25,7 @@ END
 
 IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134
     EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY
@@ -34,7 +34,7 @@ END
 
 IDD_SERVICES_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148
     PUSHBUTTON      "&Activate all",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14
@@ -43,7 +43,7 @@ END
 
 IDD_GENERAL_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
  GROUPBOX "Startup Selection", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT
  CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
@@ -56,7 +56,7 @@ END
 
 IDD_FREELDR_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
    CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200
    PUSHBUTTON    "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
@@ -77,7 +77,7 @@ END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE  0, 0, 175, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
    CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10
    EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12
@@ -96,7 +96,7 @@ BEGIN
    CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10
    EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT
    CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11
-   PUSHBUTTON "Ok", IDC_OK, 20, 160, 50, 12
+   PUSHBUTTON "OK", IDC_OK, 20, 160, 50, 12
    PUSHBUTTON "Cancel", IDC_CANCEL, 100, 160, 50, 12
 END
 
diff --git a/reactos/base/applications/msconfig/Fr.rc b/reactos/base/applications/msconfig/Fr.rc
index 94743d41617..cda4875d037 100644
--- a/reactos/base/applications/msconfig/Fr.rc
+++ b/reactos/base/applications/msconfig/Fr.rc
@@ -5,7 +5,7 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
     WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
     WS_THICKFRAME
 CAPTION "Utilitaire de configuration système"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195
     DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
@@ -16,7 +16,7 @@ END
 
 IDD_STARTUP_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148
     PUSHBUTTON      "&Activer tout",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14
@@ -25,7 +25,7 @@ END
 
 IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134
     EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY
@@ -34,7 +34,7 @@ END
 
 IDD_SERVICES_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148
     PUSHBUTTON      "&Activer tout",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14
@@ -43,7 +43,7 @@ END
 
 IDD_GENERAL_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
  GROUPBOX "Sélection du Démarrage ", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT
  CONTROL "Démarrage &Normal - charge tous les drivers et services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 185, 10
@@ -56,7 +56,7 @@ END
 
 IDD_FREELDR_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
    CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200
    PUSHBUTTON    "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
@@ -77,7 +77,7 @@ END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE  0, 0, 175, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
    CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10
    EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12
@@ -96,7 +96,7 @@ BEGIN
    CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10
    EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT
    CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11
-   PUSHBUTTON "Ok", IDC_OK, 20, 160, 50, 12
+   PUSHBUTTON "OK", IDC_OK, 20, 160, 50, 12
    PUSHBUTTON "Annuler", IDC_CANCEL, 100, 160, 50, 12
 END
 
diff --git a/reactos/base/applications/msconfig/Hu.rc b/reactos/base/applications/msconfig/Hu.rc
index bdbf73f67c9..fc8ed8aceb3 100644
--- a/reactos/base/applications/msconfig/Hu.rc
+++ b/reactos/base/applications/msconfig/Hu.rc
@@ -7,7 +7,7 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
     WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
     WS_THICKFRAME
 CAPTION "Rendszerbeállítások"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195
     DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
@@ -18,7 +18,7 @@ END
 
 IDD_STARTUP_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148
     PUSHBUTTON      "Mindet &bekapcsol",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14
@@ -27,7 +27,7 @@ END
 
 IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134
     EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY
@@ -36,7 +36,7 @@ END
 
 IDD_SERVICES_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148
     PUSHBUTTON      "Mindet &bekapcsol",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14
diff --git a/reactos/base/applications/msconfig/Nl.rc b/reactos/base/applications/msconfig/Nl.rc
index 1a85d64e280..f9417f0c259 100644
--- a/reactos/base/applications/msconfig/Nl.rc
+++ b/reactos/base/applications/msconfig/Nl.rc
@@ -25,7 +25,7 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
     WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
     WS_THICKFRAME
 CAPTION "Hulpprogramma voor systeemconfiguratie"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195
     DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
@@ -36,7 +36,7 @@ END
 
 IDD_STARTUP_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148
     PUSHBUTTON      "&Alles inschakelen",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14
@@ -45,7 +45,7 @@ END
 
 IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134
     EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY
@@ -54,7 +54,7 @@ END
 
 IDD_SERVICES_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148
     PUSHBUTTON      "&Alles inschakelen",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14
@@ -63,7 +63,7 @@ END
 
 IDD_GENERAL_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
  GROUPBOX "Type opstartprocedure", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT
  CONTROL "&Normaal opstarten - alle apparatuurstuurprogramma's en services in het geheugen laden", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
@@ -76,7 +76,7 @@ END
 
 IDD_FREELDR_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
    CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200
    PUSHBUTTON    "&Alle opstartpaden controleren", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
@@ -97,7 +97,7 @@ END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE  0, 0, 175, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
    CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10
    EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12
@@ -116,7 +116,7 @@ BEGIN
    CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10
    EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT
    CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11
-   PUSHBUTTON "Ok", IDC_OK, 20, 160, 50, 12
+   PUSHBUTTON "OK", IDC_OK, 20, 160, 50, 12
    PUSHBUTTON "Cancel", IDC_CANCEL, 100, 160, 50, 12
 END
 
diff --git a/reactos/base/applications/notepad/res/Cs.rc b/reactos/base/applications/notepad/res/Cs.rc
index 174087f8f73..6b0130c788a 100644
--- a/reactos/base/applications/notepad/res/Cs.rc
+++ b/reactos/base/applications/notepad/res/Cs.rc
@@ -97,7 +97,7 @@ PUSHBUTTON    "&N
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Da.rc b/reactos/base/applications/notepad/res/Da.rc
index d5f06d241bc..32699cfa369 100644
--- a/reactos/base/applications/notepad/res/Da.rc
+++ b/reactos/base/applications/notepad/res/Da.rc
@@ -95,7 +95,7 @@ PUSHBUTTON    "&Hj
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/De.rc b/reactos/base/applications/notepad/res/De.rc
index 8cd3256c9e4..4e1a841dae2 100644
--- a/reactos/base/applications/notepad/res/De.rc
+++ b/reactos/base/applications/notepad/res/De.rc
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 
 MAIN_MENU MENU
 BEGIN
@@ -101,11 +101,22 @@ PUSHBUTTON    "Abbrechen",     IDCANCEL,               180, 21, 40, 15, WS_TABST
 PUSHBUTTON    "&Hilfe",       0x153,                180, 39, 40, 15, WS_TABSTOP
 }
 
+/* Dialog 'Gehe zu...' */
+DIALOG_GOTO DIALOG 0,0,165,50
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Gehe zu Zeile"
+{
+EDITTEXT        ID_LINENUMBER,54,10,106,12,WS_CHILD | WS_BORDER | WS_TABSTOP
+LTEXT           "Zeile Nummer:",0x155,5,12,45,12,WS_CHILD | WS_TABSTOP | ES_NUMBER
+DEFPUSHBUTTON   "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP
+PUSHBUTTON      "Abbrechen", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP
+}
 
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Über ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/En.rc b/reactos/base/applications/notepad/res/En.rc
index d97bd1123d0..628a0fdbd74 100644
--- a/reactos/base/applications/notepad/res/En.rc
+++ b/reactos/base/applications/notepad/res/En.rc
@@ -129,7 +129,7 @@ PUSHBUTTON      "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Es.rc b/reactos/base/applications/notepad/res/Es.rc
index c28b9e5958c..e7532b6d6d9 100644
--- a/reactos/base/applications/notepad/res/Es.rc
+++ b/reactos/base/applications/notepad/res/Es.rc
@@ -98,7 +98,7 @@ PUSHBUTTON    "&Ayuda",       0x153,                180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Fi.rc b/reactos/base/applications/notepad/res/Fi.rc
index a6cf816e972..b7157589c3d 100644
--- a/reactos/base/applications/notepad/res/Fi.rc
+++ b/reactos/base/applications/notepad/res/Fi.rc
@@ -93,7 +93,7 @@ PUSHBUTTON    "&Apua",       0x153,                180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Fr.rc b/reactos/base/applications/notepad/res/Fr.rc
index 17e51fec8e6..53e9d27908d 100644
--- a/reactos/base/applications/notepad/res/Fr.rc
+++ b/reactos/base/applications/notepad/res/Fr.rc
@@ -96,7 +96,7 @@ PUSHBUTTON    "&Aide",       0x153,                180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Gr.rc b/reactos/base/applications/notepad/res/Gr.rc
index 779efa183c4..657949b62a6 100644
--- a/reactos/base/applications/notepad/res/Gr.rc
+++ b/reactos/base/applications/notepad/res/Gr.rc
@@ -128,7 +128,7 @@ PUSHBUTTON      "
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Hu.rc b/reactos/base/applications/notepad/res/Hu.rc
index c3a2c4af999..4c439d67668 100644
--- a/reactos/base/applications/notepad/res/Hu.rc
+++ b/reactos/base/applications/notepad/res/Hu.rc
@@ -95,7 +95,7 @@ PUSHBUTTON    "&S
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/It.rc b/reactos/base/applications/notepad/res/It.rc
index 75e0c97f7d7..899f25eb506 100644
--- a/reactos/base/applications/notepad/res/It.rc
+++ b/reactos/base/applications/notepad/res/It.rc
@@ -98,7 +98,7 @@ PUSHBUTTON    "&Aiuto",       0x153,                180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Ja.rc b/reactos/base/applications/notepad/res/Ja.rc
index 6a9d61e7a4b..4378b3a883f 100644
--- a/reactos/base/applications/notepad/res/Ja.rc
+++ b/reactos/base/applications/notepad/res/Ja.rc
@@ -130,7 +130,7 @@ PUSHBUTTON      "
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Nl.rc b/reactos/base/applications/notepad/res/Nl.rc
index 45e517ae901..079f579294d 100644
--- a/reactos/base/applications/notepad/res/Nl.rc
+++ b/reactos/base/applications/notepad/res/Nl.rc
@@ -94,7 +94,7 @@ PUSHBUTTON    "&Help",     0x153,               180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Pl.rc b/reactos/base/applications/notepad/res/Pl.rc
index c8765353ced..7e7a92427c7 100644
--- a/reactos/base/applications/notepad/res/Pl.rc
+++ b/reactos/base/applications/notepad/res/Pl.rc
@@ -97,7 +97,7 @@ PUSHBUTTON    "&Pomoc",       0x153,                180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Pt.rc b/reactos/base/applications/notepad/res/Pt.rc
index b1096a67bd5..412195ef28f 100644
--- a/reactos/base/applications/notepad/res/Pt.rc
+++ b/reactos/base/applications/notepad/res/Pt.rc
@@ -98,7 +98,7 @@ PUSHBUTTON    "&Ajuda",       0x153,                180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Ru.rc b/reactos/base/applications/notepad/res/Ru.rc
index aae021eaf03..91027bc1e3b 100644
--- a/reactos/base/applications/notepad/res/Ru.rc
+++ b/reactos/base/applications/notepad/res/Ru.rc
@@ -93,7 +93,7 @@ PUSHBUTTON    "&
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Si.rc b/reactos/base/applications/notepad/res/Si.rc
index 820b5fa28fb..5afa1df00a2 100644
--- a/reactos/base/applications/notepad/res/Si.rc
+++ b/reactos/base/applications/notepad/res/Si.rc
@@ -93,7 +93,7 @@ PUSHBUTTON    "&Pomo
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Sk.rc b/reactos/base/applications/notepad/res/Sk.rc
index 5f1a2256d07..cf865c72622 100644
--- a/reactos/base/applications/notepad/res/Sk.rc
+++ b/reactos/base/applications/notepad/res/Sk.rc
@@ -99,7 +99,7 @@ PUSHBUTTON    "&Help",       0x153,                180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Sv.rc b/reactos/base/applications/notepad/res/Sv.rc
index e6934bbaca7..0a660940650 100644
--- a/reactos/base/applications/notepad/res/Sv.rc
+++ b/reactos/base/applications/notepad/res/Sv.rc
@@ -95,7 +95,7 @@ PUSHBUTTON    "&Hj
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Th.rc b/reactos/base/applications/notepad/res/Th.rc
index 39e6d94822c..3740f2141fe 100644
--- a/reactos/base/applications/notepad/res/Th.rc
+++ b/reactos/base/applications/notepad/res/Th.rc
@@ -94,7 +94,7 @@ PUSHBUTTON    "
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Uk.rc b/reactos/base/applications/notepad/res/Uk.rc
index 655078cc93d..536724956ba 100644
--- a/reactos/base/applications/notepad/res/Uk.rc
+++ b/reactos/base/applications/notepad/res/Uk.rc
@@ -122,7 +122,7 @@ PUSHBUTTON      "
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Ïðî Áëîêíîò ReactOS"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "Áëîêíîò ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\nÇíà÷îê çàïîçè÷åíî ç Notepad2 - http://www.flos-freeware.ch/notepad2.html",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Wa.rc b/reactos/base/applications/notepad/res/Wa.rc
index 3aa668e926b..987aa623276 100644
--- a/reactos/base/applications/notepad/res/Wa.rc
+++ b/reactos/base/applications/notepad/res/Wa.rc
@@ -93,7 +93,7 @@ PUSHBUTTON    "&Aide",       0x153,                180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/notepad/res/Zh.rc b/reactos/base/applications/notepad/res/Zh.rc
index a1b016f1e1a..cea358ba136 100644
--- a/reactos/base/applications/notepad/res/Zh.rc
+++ b/reactos/base/applications/notepad/res/Zh.rc
@@ -93,7 +93,7 @@ PUSHBUTTON    "
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "Tahoma"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ",
                     -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39
diff --git a/reactos/base/applications/regedit/De.rc b/reactos/base/applications/regedit/De.rc
index fd94044d1cf..5521d1ac712 100644
--- a/reactos/base/applications/regedit/De.rc
+++ b/reactos/base/applications/regedit/De.rc
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 
 /*
  * Menu
@@ -330,14 +330,14 @@ END
 IDD_DIALOG1 DIALOG DISCARDABLE  50, 50, 268, 98
 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS |
     WS_BORDER
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
 END
 
 IDD_ADDFAVORITES DIALOG DISCARDABLE  0, 0, 186, 46
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Zu Favoriten hinzufügen"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
     PUSHBUTTON      "A&bbrechen",IDCANCEL,129,24,50,14
@@ -348,7 +348,7 @@ END
 IDD_REMOVEFAVORITES DIALOG DISCARDABLE  0, 0, 164, 135
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Favoriten entfernen"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,107,114,50,14
     PUSHBUTTON      "A&bbrechen",IDCANCEL,7,114,50,14
@@ -360,7 +360,7 @@ END
 IDD_FIND DIALOG DISCARDABLE  0, 0, 254, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Suchen"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "&Weitersuchen",IDOK,197,7,50,14
     PUSHBUTTON      "A&bbrechen",IDCANCEL,197,24,50,14
@@ -368,7 +368,7 @@ BEGIN
     LTEXT           "Suche &nach:",IDC_STATIC,7,8,37,10
     EDITTEXT        IDC_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL
     CONTROL         "&Schlüssel",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,14,36,35,8
+                    WS_TABSTOP,14,36,45,8
     CONTROL         "&Werte",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,14,48,36,8
     CONTROL         "&Daten",IDC_LOOKAT_DATA,"Button",BS_AUTOCHECKBOX | 
diff --git a/reactos/base/applications/regedit/En.rc b/reactos/base/applications/regedit/En.rc
index b0d5fc92a7f..da2f5031642 100644
--- a/reactos/base/applications/regedit/En.rc
+++ b/reactos/base/applications/regedit/En.rc
@@ -364,7 +364,7 @@ END
 IDD_EXPORTRANGE DIALOG DISCARDABLE  50, 50, 370, 50
 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS |
     WS_BORDER
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
    GROUPBOX "Export Range",IDC_STATIC,2,0,366,48
    CONTROL "&All",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11
@@ -375,7 +375,7 @@ END
 IDD_ADDFAVORITES DIALOG DISCARDABLE  0, 0, 186, 46
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Add to Favorites"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14
@@ -386,7 +386,7 @@ END
 IDD_REMOVEFAVORITES DIALOG DISCARDABLE  0, 0, 164, 135
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Remove Favorites"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,107,114,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,7,114,50,14
@@ -398,7 +398,7 @@ END
 IDD_FIND DIALOG DISCARDABLE  0, 0, 254, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Find"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "&Find Next",IDOK,197,7,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,197,24,50,14
diff --git a/reactos/base/applications/reporterror/de.rc b/reactos/base/applications/reporterror/de.rc
index cd94d7157fe..c69d2973afb 100644
--- a/reactos/base/applications/reporterror/de.rc
+++ b/reactos/base/applications/reporterror/de.rc
@@ -1,4 +1,4 @@
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 
 IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
diff --git a/reactos/base/applications/reporterror/en.rc b/reactos/base/applications/reporterror/en.rc
index 9c8c1d5f618..6a82cdb08e4 100644
--- a/reactos/base/applications/reporterror/en.rc
+++ b/reactos/base/applications/reporterror/en.rc
@@ -6,7 +6,7 @@ CAPTION "Error reporting assistant"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
   LTEXT "The system recovered from an error.", -1, 115, 15, 160, 24
-  LTEXT "Would you like to report the error to the ReactOS project?", -1, 115, 35, 160, 17
+  LTEXT "Would you like to report the error to the ReactOS foundation?", -1, 115, 35, 160, 17
 END
 
 IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
@@ -14,7 +14,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Error reporting assistant"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  LTEXT "Please describe what you were trying to do when the error occurred.\n\nClick 'Next' to send the report to the ReactOS project or 'Cancel' to not send any information.",-1,10,0,225,40
+  LTEXT "Please describe what you were trying to do when the error occurred.\n\nClick 'Next' to send the report to the ReactOS foundation or 'Cancel' to not send any information.",-1,10,0,225,40
   LTEXT "Your e-mail address (optional):",-1,10,40,120,20
   EDITTEXT IDE_SUBMIT_REPORT_YOUR_EMAIL, 110,40,150,12
   LTEXT "Description of problem (optional):",-1,10,55,120,20
@@ -35,12 +35,12 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Error reporting assistant"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  LTEXT "Your error report was successfully sent to the ReactOS project.",-1,25,5,225,20
+  LTEXT "Your error report was successfully sent to the ReactOS foundation.",-1,25,5,225,20
 END
 
 STRINGTABLE
 BEGIN
-  IDS_WIZARD_NAME "Report error to the ReactOS project"
+  IDS_WIZARD_NAME "Report error to the ReactOS foundation"
   IDS_FAILED_TO_CONTACT_SERVER "The system was unable to contact the error reporting server.\nPlease make sure that your system is connected to the internet."
   IDS_FAILED_TO_DELIVER_ERROR_REPORT "The system was unable to deliver the error report."
 END