diff --git a/reactos/base/applications/winhelp/lang/nl-NL.rc b/reactos/base/applications/winhelp/lang/nl-NL.rc
index 44ecd902683..b17e067ec2d 100644
--- a/reactos/base/applications/winhelp/lang/nl-NL.rc
+++ b/reactos/base/applications/winhelp/lang/nl-NL.rc
@@ -2,6 +2,7 @@
  * Help Viewer (Dutch resources)
  *
  * Copyright 2003 Hans Leidekker
+ * Copyright 2008 Frans Kool
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -49,6 +50,16 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
  }
 }
 
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Index"
+{
+    LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
+    PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12
+    PUSHBUTTON "&Annuleren", IDCANCEL, 120, 170, 50, 12
+}
+
 /* Strings */
 STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 {
@@ -65,5 +76,5 @@ STID_HISTORY, 		"&Geschiedenis"
 STID_TOPICS,		"&Onderwerpen"
 STID_ALL_FILES, 	"Alle bestanden (*.*)"
 STID_HELP_FILES_HLP, 	"Helpbestanden (*.hlp)"
-STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
+STID_FILE_NOT_FOUND_s	"Kan '%s' niet openen. Wilt u zelf dit bestand zoeken?"
 }
diff --git a/reactos/base/applications/winhelp/lang/pl-PL.rc b/reactos/base/applications/winhelp/lang/pl-PL.rc
index 1c90a0ce43f..bc74dc2a970 100644
--- a/reactos/base/applications/winhelp/lang/pl-PL.rc
+++ b/reactos/base/applications/winhelp/lang/pl-PL.rc
@@ -51,6 +51,16 @@ MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
  }
 }
 
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Indeks"
+{
+    LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
+    PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12
+    PUSHBUTTON "&Anuluj", IDCANCEL, 120, 170, 50, 12
+}
+
 /* Strings */
 STRINGTABLE DISCARDABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 {
diff --git a/reactos/base/applications/winhelp/lex.yy.c b/reactos/base/applications/winhelp/lex.yy.c
index e0e5d15686c..8f542332777 100644
--- a/reactos/base/applications/winhelp/lex.yy.c
+++ b/reactos/base/applications/winhelp/lex.yy.c
@@ -407,7 +407,13 @@ char *yytext;
 #define quote 1
 
 #line 26 "macro.lex.l"
+#include "config.h"
 #include <assert.h>
+
+#ifndef HAVE_UNISTD_H
+#define YY_NO_UNISTD_H
+#endif
+
 #include "macro.h"
 
 #include "wine/debug.h"
@@ -423,7 +429,7 @@ struct lexret  yylval;
 #define YY_INPUT(buf,result,max_size)\
   if ((result = *macroptr ? 1 : 0)) buf[0] = *macroptr++;
 
-#line 427 "lex.yy.c"
+#line 433 "lex.yy.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -574,10 +580,10 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
 
-#line 43 "macro.lex.l"
+#line 49 "macro.lex.l"
 
 
-#line 581 "lex.yy.c"
+#line 587 "lex.yy.c"
 
 	if ( yy_init )
 		{
@@ -662,32 +668,32 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 45 "macro.lex.l"
+#line 51 "macro.lex.l"
 yylval.integer = strtol(yytext, NULL, 10);	return INTEGER;
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 46 "macro.lex.l"
+#line 52 "macro.lex.l"
 yylval.integer = strtol(yytext, NULL, 16);	return INTEGER;
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 48 "macro.lex.l"
+#line 54 "macro.lex.l"
 return MACRO_Lookup(yytext, &yylval);
 	YY_BREAK
 case 4:
-#line 51 "macro.lex.l"
+#line 57 "macro.lex.l"
 case 5:
-#line 52 "macro.lex.l"
+#line 58 "macro.lex.l"
 case 6:
-#line 53 "macro.lex.l"
+#line 59 "macro.lex.l"
 case 7:
-#line 54 "macro.lex.l"
+#line 60 "macro.lex.l"
 case 8:
-#line 55 "macro.lex.l"
+#line 61 "macro.lex.l"
 case 9:
 YY_RULE_SETUP
-#line 55 "macro.lex.l"
+#line 61 "macro.lex.l"
 {
     if (quote_stk_idx == 0 ||
         (yytext[0] == '\"' && quote_stack[quote_stk_idx - 1] != '\"') ||
@@ -720,34 +726,34 @@ YY_RULE_SETUP
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 85 "macro.lex.l"
+#line 91 "macro.lex.l"
 *strptr++ = yytext[0];
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 86 "macro.lex.l"
+#line 92 "macro.lex.l"
 *strptr++ = yytext[1];
 	YY_BREAK
 case YY_STATE_EOF(quote):
-#line 87 "macro.lex.l"
+#line 93 "macro.lex.l"
 return 0;
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 89 "macro.lex.l"
+#line 95 "macro.lex.l"
 
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 90 "macro.lex.l"
+#line 96 "macro.lex.l"
 return yytext[0];
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 91 "macro.lex.l"
+#line 97 "macro.lex.l"
 ECHO;
 	YY_BREAK
-#line 751 "lex.yy.c"
+#line 757 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1633,7 +1639,7 @@ int main()
 	return 0;
 	}
 #endif
-#line 91 "macro.lex.l"
+#line 97 "macro.lex.l"
 
 
 #if 0
diff --git a/reactos/base/applications/winhelp/macro.lex.l b/reactos/base/applications/winhelp/macro.lex.l
index c9aee2067b5..b1b3b2a8615 100644
--- a/reactos/base/applications/winhelp/macro.lex.l
+++ b/reactos/base/applications/winhelp/macro.lex.l
@@ -1,4 +1,4 @@
-%{
+%{ /* -*-C-*- */
 /*
  * Help Viewer
  *
@@ -23,7 +23,13 @@
 %option nounput interactive 8bit
 %x quote
 %{
+#include "config.h"
 #include <assert.h>
+
+#ifndef HAVE_UNISTD_H
+#define YY_NO_UNISTD_H
+#endif
+
 #include "macro.h"
 
 #include "wine/debug.h"
diff --git a/reactos/base/applications/wordpad/De.rc b/reactos/base/applications/wordpad/De.rc
index 3c2908fd40e..f5ab003ebda 100644
--- a/reactos/base/applications/wordpad/De.rc
+++ b/reactos/base/applications/wordpad/De.rc
@@ -22,7 +22,7 @@ IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Datei"
     BEGIN
-        MENUITEM "&Neu\tStrg+N",          ID_FILE_NEW
+        MENUITEM "&Neu...\tStrg+N",          ID_FILE_NEW
         MENUITEM "Ö&ffnen...\tStrg+O",    ID_FILE_OPEN
         MENUITEM "&Speichern\tStrg+S",    ID_FILE_SAVE
         MENUITEM "Speichern &unter...",   ID_FILE_SAVEAS
diff --git a/reactos/base/applications/wordpad/En.rc b/reactos/base/applications/wordpad/En.rc
index 67cd9ac3ba9..b449ae46451 100644
--- a/reactos/base/applications/wordpad/En.rc
+++ b/reactos/base/applications/wordpad/En.rc
@@ -22,7 +22,7 @@ IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&File"
     BEGIN
-        MENUITEM "&New\tCtrl+N",          ID_FILE_NEW
+        MENUITEM "&New . . .\tCtrl+N",          ID_FILE_NEW
         MENUITEM "&Open . . .\tCtrl+O",   ID_FILE_OPEN
         MENUITEM "&Save\tCtrl+S",         ID_FILE_SAVE
         MENUITEM "Save &as . . .",        ID_FILE_SAVEAS
diff --git a/reactos/base/applications/wordpad/Fr.rc b/reactos/base/applications/wordpad/Fr.rc
index ff3da1e29a2..4d239552123 100644
--- a/reactos/base/applications/wordpad/Fr.rc
+++ b/reactos/base/applications/wordpad/Fr.rc
@@ -22,7 +22,7 @@ IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Fichier"
     BEGIN
-        MENUITEM "&Nouveau\tCtrl+N",        ID_FILE_NEW
+        MENUITEM "&Nouveau...\tCtrl+N",        ID_FILE_NEW
         MENUITEM "&Ouvrir...\tCtrl+O",      ID_FILE_OPEN
         MENUITEM "&Enregistrer\tCtrl+S",    ID_FILE_SAVE
         MENUITEM "Enregistrer &sous...",    ID_FILE_SAVEAS
diff --git a/reactos/base/applications/wordpad/Hu.rc b/reactos/base/applications/wordpad/Hu.rc
index 34ec7cc1d77..dc01f628c0a 100644
--- a/reactos/base/applications/wordpad/Hu.rc
+++ b/reactos/base/applications/wordpad/Hu.rc
@@ -22,7 +22,7 @@ IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Fájl"
     BEGIN
-        MENUITEM "&Új\tCtrl+N",           ID_FILE_NEW
+        MENUITEM "&Új...\tCtrl+N",           ID_FILE_NEW
         MENUITEM "&Megnyitás...\tCtrl+O", ID_FILE_OPEN
         MENUITEM "M&entés\tCtrl+S",       ID_FILE_SAVE
         MENUITEM "Mentés má&sként...",        ID_FILE_SAVEAS
diff --git a/reactos/base/applications/wordpad/Ko.rc b/reactos/base/applications/wordpad/Ko.rc
index 58a0c99ebed..73d17809510 100644
--- a/reactos/base/applications/wordpad/Ko.rc
+++ b/reactos/base/applications/wordpad/Ko.rc
@@ -24,7 +24,7 @@ IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "ÆÄÀÏ(&F)"
     BEGIN
-        MENUITEM "»õ ÆÄÀÏ(&N)\tCtrl+N",          ID_FILE_NEW
+        MENUITEM "»õ ÆÄÀÏ(&N)...\tCtrl+N",          ID_FILE_NEW
         MENUITEM "¿­±â(&O)...\tCtrl+O",      ID_FILE_OPEN
         MENUITEM "ÀúÀå(&S)\tCtrl+S",         ID_FILE_SAVE
         MENUITEM "´Ù¸¥ À̸§À¸·Î ÀúÀå(&A)...", ID_FILE_SAVEAS
diff --git a/reactos/base/applications/wordpad/Nl.rc b/reactos/base/applications/wordpad/Nl.rc
index d2c1a0fddb7..62f3759ae58 100644
--- a/reactos/base/applications/wordpad/Nl.rc
+++ b/reactos/base/applications/wordpad/Nl.rc
@@ -22,7 +22,7 @@ IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Bestand"
     BEGIN
-        MENUITEM "&Nieuw\tCtrl+N"         ID_FILE_NEW
+        MENUITEM "&Nieuw...\tCtrl+N"      ID_FILE_NEW
         MENUITEM "&Openen...\tCtrl+O",    ID_FILE_OPEN
         MENUITEM "O&pslaan\tCtrl+S",      ID_FILE_SAVE
         MENUITEM "Ops&laan als...",       ID_FILE_SAVEAS
diff --git a/reactos/base/applications/wordpad/No.rc b/reactos/base/applications/wordpad/No.rc
index 4e258fd1e70..01e6b7b4e93 100644
--- a/reactos/base/applications/wordpad/No.rc
+++ b/reactos/base/applications/wordpad/No.rc
@@ -22,7 +22,7 @@ IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Fil"
     BEGIN
-        MENUITEM "&Ny\tCtrl+N",               ID_FILE_NEW
+        MENUITEM "&Ny...\tCtrl+N",            ID_FILE_NEW
         MENUITEM "&Åpne . . .\tCtrl+O",       ID_FILE_OPEN
         MENUITEM "&Lagre\tCtrl+S",            ID_FILE_SAVE
         MENUITEM "Lagre &som . . .",          ID_FILE_SAVEAS
diff --git a/reactos/base/applications/wordpad/Pl.rc b/reactos/base/applications/wordpad/Pl.rc
index e52203b3d59..cb29bc9022a 100644
--- a/reactos/base/applications/wordpad/Pl.rc
+++ b/reactos/base/applications/wordpad/Pl.rc
@@ -23,14 +23,14 @@ IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Plik"
     BEGIN
-        MENUITEM "&Nowy\tCtrl+N",           ID_FILE_NEW
+        MENUITEM "&Nowy...\tCtrl+N",           ID_FILE_NEW
         MENUITEM "&Otwórz...\tCtrl+O",      ID_FILE_OPEN
         MENUITEM "&Zapisz\tCtrl+S",         ID_FILE_SAVE
         MENUITEM "Z&apisz jako...",         ID_FILE_SAVEAS
         MENUITEM SEPARATOR
-        MENUITEM "&Print . . .\tCtrl+P",    ID_PRINT
-        MENUITEM "Print previe&w . . .",    ID_PREVIEW
-        MENUITEM "Pag&e setup . . .",       ID_PRINTSETUP
+        MENUITEM "&Drukuj...\tCtrl+P",    ID_PRINT
+        MENUITEM "&Podgl¹d wydruku...",    ID_PREVIEW
+        MENUITEM "&Ustawienia strony...",       ID_PRINTSETUP
         MENUITEM SEPARATOR
         MENUITEM "Za&koñcz",         ID_FILE_EXIT
     END
@@ -45,9 +45,9 @@ BEGIN
         MENUITEM "&Usuñ\tDel",                    ID_EDIT_CLEAR
         MENUITEM "&Zaznacz wszystko\tCtrl+A",         ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
-        MENUITEM "&Find . . .\tCrtl+F",           ID_FIND
-        MENUITEM "Find &next\tF3",                ID_FIND_NEXT
-        MENUITEM "&Replace . . .\tCtrl+H",        ID_REPLACE
+        MENUITEM "Znaj&dŸ...\tCrtl+F",           ID_FIND
+        MENUITEM "Z&najdŸ nastêpny\tF3",                ID_FIND_NEXT
+        MENUITEM "Za&mieñ...\tCtrl+H",        ID_REPLACE
         MENUITEM SEPARATOR
         MENUITEM "Tylko do &odczytu",                  ID_EDIT_READONLY
         MENUITEM "&Zmodifykowany",                   ID_EDIT_MODIFIED
@@ -61,34 +61,34 @@ BEGIN
             MENUITEM "&Pobie¿ tekst",                   ID_EDIT_GETTEXT
         END
     END
-    POPUP "&View"
+    POPUP "Wido&k"
     BEGIN
-        MENUITEM "&Toolbar",        ID_TOGGLE_TOOLBAR
-        MENUITEM "&Formatbar",      ID_TOGGLE_FORMATBAR
-        MENUITEM "&Ruler",          ID_TOGGLE_RULER
-        MENUITEM "&Statusbar",      ID_TOGGLE_STATUSBAR
+        MENUITEM "Pasek &narzêdzi",        ID_TOGGLE_TOOLBAR
+        MENUITEM "Pasek &formatu",      ID_TOGGLE_FORMATBAR
+        MENUITEM "&Linijka",          ID_TOGGLE_RULER
+        MENUITEM "Pasek &stanu",      ID_TOGGLE_STATUSBAR
         MENUITEM SEPARATOR
-        MENUITEM "&Options . . .",  ID_VIEWPROPERTIES
+        MENUITEM "&Opcje...",  ID_VIEWPROPERTIES
     END
-    POPUP "&Insert"
+    POPUP "&Wstaw"
     BEGIN
-        MENUITEM "&Date and time . . .",  ID_DATETIME
+        MENUITEM "&Data i godzina...",  ID_DATETIME
     END
-    POPUP "F&ormat"
+    POPUP "For&mat"
     BEGIN
-        MENUITEM "&Font . . .",                  ID_FONTSETTINGS
-        MENUITEM "&Bullet points"                ID_BULLET
-        MENUITEM "&Paragraph . . ."              ID_PARAFORMAT
-        MENUITEM "Tab&s . . ."                   ID_TABSTOPS
-        POPUP "&T³o"
+        MENUITEM "&Czcionka...",                  ID_FONTSETTINGS
+        MENUITEM "&Wypunktowanie"                ID_BULLET
+        MENUITEM "&Akapit..."              ID_PARAFORMAT
+        MENUITEM "&Tabulatory..."                   ID_TABSTOPS
+        POPUP "T³&o"
         BEGIN
             MENUITEM "&System\tCtrl+1",         ID_BACK_1
             MENUITEM "&PostThat (¿ó³ty)\tCtrl+2",           ID_BACK_2
         END
     END
-    POPUP "&Help"
+    POPUP "Pomo&c"
     BEGIN
-        MENUITEM "&About Wine Wordpad"       ID_ABOUT
+        MENUITEM "Wine Wordpad - &informacje"       ID_ABOUT
     END
 END
 
@@ -100,63 +100,63 @@ BEGIN
         MENUITEM "&Kopiuj",              ID_EDIT_COPY
         MENUITEM "Wkl&ej",               ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "&Bullet points"        ID_BULLET
-        MENUITEM "&Paragraph . . ."      ID_PARAFORMAT
+        MENUITEM "&Wypunktowanie"        ID_BULLET
+        MENUITEM "&Akapit..."      ID_PARAFORMAT
     END
 END
 
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Date and time"
+CAPTION "Data i godzina"
 FONT 10, "MS Sans Serif"
 BEGIN
-    LTEXT        "Available formats",0,3,2,100,15
+    LTEXT        "Dostêpne formaty",0,3,2,100,15
     LISTBOX      IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT
     PUSHBUTTON   "&OK",IDOK,87,12,40,12
-    PUSHBUTTON   "&Cancel",IDCANCEL,87,26,40,12
+    PUSHBUTTON   "&Anuluj",IDCANCEL,87,26,40,12
 END
 
 IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "New"
+CAPTION "Nowy"
 FONT 10, "MS Sans Serif"
 BEGIN
-    LTEXT        "New document type",0,3,2,100,15
+    LTEXT        "Typ nowego dokumentu",0,3,2,100,15
     LISTBOX      IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT
     PUSHBUTTON   "&OK",IDOK,97,12,40,12
-    PUSHBUTTON   "&Cancel",IDCANCEL,97,26,40,12
+    PUSHBUTTON   "&Anuluj",IDCANCEL,97,26,40,12
 END
 
 IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-Caption "Paragraph format"
+Caption "Format akapitu"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Indentation", 0, 10, 10, 120, 68
-    LTEXT "Left", 0, 15, 22, 40, 13
+    GROUPBOX "Wciêcia", 0, 10, 10, 120, 68
+    LTEXT "Z lewej", 0, 15, 22, 40, 13
     EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
-    LTEXT "Right", 0, 15, 40, 40, 13
+    LTEXT "Z prawej", 0, 15, 40, 40, 13
     EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
-    LTEXT "First line", 0, 15, 58, 40, 13
+    LTEXT "Pierwszy wiersz", 0, 15, 55, 40, 19
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
-    LTEXT "Alignment", 0, 15, 87, 40, 13
+    LTEXT "Wyrównanie", 0, 15, 87, 40, 13
     COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST
     PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
+    PUSHBUTTON "&Anuluj", IDCANCEL, 137, 33, 50, 15
 END
 
 IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-Caption "Tabs"
-FONT 8, "MS SHell DLg"
+Caption "Tabulatory"
+FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Tab stops", 0, 10, 10, 120, 90
+    GROUPBOX "Pozycje tabulatorów", 0, 10, 10, 120, 90
     COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15
-    PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15
-    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
-    PUSHBUTTON "Remove al&l", ID_TAB_EMPTY, 137, 51, 50, 15
+    DEFPUSHBUTTON "&Dodaj", ID_TAB_ADD, 20, 80, 45, 15
+    PUSHBUTTON "&Usuñ", ID_TAB_DEL, 72, 80, 45, 15
+    PUSHBUTTON "&OK", IDOK, 137, 15, 57, 15
+    PUSHBUTTON "&Anuluj", IDCANCEL, 137, 33, 57, 15
+    PUSHBUTTON "Usuñ &wszystkie", ID_TAB_EMPTY, 137, 51, 57, 15
 END
 
 IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110
@@ -164,14 +164,14 @@ STYLE DS_SYSMODAL
 Caption ""
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Line wrapping", 0, 10, 10, 130, 85
-    RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 25, 117, 15
-    RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 45, 117, 15
-    GROUPBOX "Toolbars", 0, 150, 10, 120, 85
-    CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15
-    CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15
-    CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15
-    CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15
+    GROUPBOX "Zawijanie wierszy", 0, 10, 10, 130, 85
+    RADIOBUTTON "Zawijaj do &brzegu okna", IDC_PAGEFMT_WW, 18, 25, 117, 15
+    RADIOBUTTON "Zawijaj do &marginesu", IDC_PAGEFMT_WM, 18, 45, 117, 15
+    GROUPBOX "Paski narzêdzi", 0, 150, 10, 120, 85
+    CHECKBOX "Pasek &narzêdzi", IDC_PAGEFMT_TB, 160, 20, 80, 15
+    CHECKBOX "Pasek &formatu", IDC_PAGEFMT_FB, 160, 38, 80, 15
+    CHECKBOX "&Linijka", IDC_PAGEFMT_RU, 160, 56, 80, 15
+    CHECKBOX "Pasek &stanu", IDC_PAGEFMT_SB, 160, 74, 80, 15
     LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
 END
 
@@ -185,36 +185,36 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_ALIGN_LEFT,            "Left"
-    STRING_ALIGN_RIGHT,           "Right"
-    STRING_ALIGN_CENTER,          "Center"
+    STRING_ALIGN_LEFT,            "Do lewej"
+    STRING_ALIGN_RIGHT,           "Do prawej"
+    STRING_ALIGN_CENTER,          "Wyœrodkowane"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_NEWFILE_RICHTEXT,     "Rich text document"
-    STRING_NEWFILE_TXT,          "Text document"
-    STRING_NEWFILE_TXT_UNICODE,  "Unicode text document"
+    STRING_NEWFILE_RICHTEXT,     "Document sformatowany (RTF)"
+    STRING_NEWFILE_TXT,          "Document tekstowy"
+    STRING_NEWFILE_TXT_UNICODE,  "Document tekstowy Unicode"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_PRINTER_FILES_PRN,        "Printer files (*.PRN)"
+    STRING_PRINTER_FILES_PRN,        "Pliki drukarki (*.PRN)"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_VIEWPROPS_TITLE,          "Options"
-    STRING_VIEWPROPS_TEXT,           "Text"
-    STRING_VIEWPROPS_RICHTEXT,       "Rich text"
+    STRING_VIEWPROPS_TITLE,          "Opcje"
+    STRING_VIEWPROPS_TEXT,           "Tekst"
+    STRING_VIEWPROPS_RICHTEXT,       "Tekst sformatowany"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_PREVIEW_PRINT,            "Print"
-    STRING_PREVIEW_NEXTPAGE,         "Next page"
-    STRING_PREVIEW_PREVPAGE,         "Previous page"
-    STRING_PREVIEW_CLOSE,            "Close"
+    STRING_PREVIEW_PRINT,            "Drukuj"
+    STRING_PREVIEW_NEXTPAGE,         "Nast. strona"
+    STRING_PREVIEW_PREVPAGE,         "Poprz. strona"
+    STRING_PREVIEW_CLOSE,            "Zamknij"
 END
 
 STRINGTABLE DISCARDABLE
@@ -224,13 +224,13 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_DEFAULT_FILENAME,     "Document"
-    STRING_PROMPT_SAVE_CHANGES,  "Save changes to '%s'?"
-    STRING_SEARCH_FINISHED,      "Finished searching the document."
-    STRING_LOAD_RICHED_FAILED,   "Failed to load the RichEdit library."
-    STRING_SAVE_LOSEFORMATTING,  "You have chosen to save in plain text format, " \
-                                 "which will cause all formatting to be lost. " \
-                                 "Are you sure that you wish to do this?"
-    STRING_INVALID_NUMBER,       "Invalid number format"
-    STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported"
+    STRING_DEFAULT_FILENAME,     "Dokument"
+    STRING_PROMPT_SAVE_CHANGES,  "Zapisaæ zmiany w pliku '%s'?"
+    STRING_SEARCH_FINISHED,      "Zakoñczono przeszukowanie dokumentu."
+    STRING_LOAD_RICHED_FAILED,   "Nie uda³o siê za³adowaæ biblioteki systemowej RichEdit."
+    STRING_SAVE_LOSEFORMATTING,  "Wybrano zapisanie dokumentu jako zwyk³y tekst, " \
+                                 "w wyniku czego formatowanie zostanie utracone. " \
+                                 "Czy na pewno chcesz to zrobiæ?"
+    STRING_INVALID_NUMBER,       "Z³y format liczby"
+    STRING_OLE_STORAGE_NOT_SUPPORTED, "Dokumenty typu OLE storage nie s¹ obs³ugiwane"
 END
diff --git a/reactos/base/applications/wordpad/Ru.rc b/reactos/base/applications/wordpad/Ru.rc
index dddcdd77b99..3dcfc6d3387 100644
--- a/reactos/base/applications/wordpad/Ru.rc
+++ b/reactos/base/applications/wordpad/Ru.rc
@@ -22,7 +22,7 @@ IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Ôàéë"
     BEGIN
-        MENUITEM "Ñîçä&àòü\tCtrl+N",   ID_FILE_NEW
+        MENUITEM "Ñîçä&àòü...\tCtrl+N",ID_FILE_NEW
         MENUITEM "&Îòêðûòü...\tCtrl+O",ID_FILE_OPEN
         MENUITEM "&Ñîõðàíèòü\tCtrl+S", ID_FILE_SAVE
         MENUITEM "Ñîõðàíèòü &êàê...",  ID_FILE_SAVEAS
diff --git a/reactos/base/applications/wordpad/Tr.rc b/reactos/base/applications/wordpad/Tr.rc
index 01671279367..26c6d88c09d 100644
--- a/reactos/base/applications/wordpad/Tr.rc
+++ b/reactos/base/applications/wordpad/Tr.rc
@@ -24,7 +24,7 @@ IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Dosya"
     BEGIN
-        MENUITEM "&Yeni\tCtrl+N",         ID_FILE_NEW
+        MENUITEM "&Yeni...\tCtrl+N",      ID_FILE_NEW
         MENUITEM "&Aç...\tCtrl+O",        ID_FILE_OPEN
         MENUITEM "&Kaydet\tCtrl+S",       ID_FILE_SAVE
         MENUITEM "&Farklý Kaydet...",     ID_FILE_SAVEAS
diff --git a/reactos/base/applications/wordpad/resource.h b/reactos/base/applications/wordpad/resource.h
deleted file mode 100644
index 2c2cc986f06..00000000000
--- a/reactos/base/applications/wordpad/resource.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright 2004 by Krzysztof Foltman
- * Copyright 2007 by Alexander N. Sørnes <alex@thehandofagony.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#define ID_FILE_EXIT 1000
-#define ID_FILE_OPEN 1001
-#define ID_FILE_SAVE 1002
-#define ID_FILE_NEW 1003
-#define ID_FILE_SAVEAS 1004
-
-#define ID_FILE_RECENT1 1005
-#define ID_FILE_RECENT2 1006
-#define ID_FILE_RECENT3 1007
-#define ID_FILE_RECENT4 1008
-#define ID_FILE_RECENT_SEPARATOR 1009
-
-#define ID_PRINT 1010
-#define ID_PREVIEW 1011
-#define ID_PRINTSETUP 1012
-#define ID_PRINT_QUICK 1013
-
-#define ID_FIND 1014
-#define ID_FIND_NEXT 1015
-#define ID_REPLACE 1016
-
-#define ID_PREVIEW_NEXTPAGE 1017
-#define ID_PREVIEW_PREVPAGE 1018
-
-#define ID_ALIGN_LEFT 1100
-#define ID_ALIGN_CENTER 1101
-#define ID_ALIGN_RIGHT 1102
-
-#define ID_BACK_1 1200
-#define ID_BACK_2 1201
-
-#define ID_EDIT_SELECTALL 1300
-#define ID_EDIT_SELECTIONINFO 1301
-#define ID_EDIT_READONLY 1302
-#define ID_EDIT_MODIFIED 1303
-#define ID_EDIT_CHARFORMAT 1304
-#define ID_EDIT_PARAFORMAT 1305
-#define ID_EDIT_DEFCHARFORMAT 1306
-#define ID_EDIT_UNDO 1307
-#define ID_EDIT_REDO 1308
-#define ID_EDIT_GETTEXT 1309
-#define ID_EDIT_COPY 1310
-#define ID_EDIT_CUT 1311
-#define ID_EDIT_PASTE 1312
-#define ID_EDIT_CLEAR 1313
-#define ID_BULLET 1314
-
-#define ID_FONTSETTINGS 1315
-
-#define ID_FORMAT_BOLD 1400
-#define ID_FORMAT_ITALIC 1401
-#define ID_FORMAT_UNDERLINE 1402
-
-#define ID_TOGGLE_TOOLBAR 1500
-#define ID_TOGGLE_FORMATBAR 1501
-#define ID_TOGGLE_STATUSBAR 1502
-
-#define PREVIEW_BUTTONS 4
-
-#define FILELIST_ENTRIES 4
-#define FILELIST_ENTRY_LENGTH 33
-
-#define BANDID_TOOLBAR 2
-#define BANDID_FORMATBAR 3
-#define BANDID_RULER 0
-#define BANDID_STATUSBAR 1
-#define BANDID_FONTLIST 4
-#define BANDID_SIZELIST 5
-
-#define BANDID_PREVIEW_BTN1 6
-#define BANDID_PREVIEW_BTN2 7
-#define BANDID_PREVIEW_BTN3 8
-#define BANDID_PREVIEW_BTN4 9
-#define BANDID_PREVIEW_BUFFER 10
-
-#define ID_WORDWRAP_NONE 0
-#define ID_WORDWRAP_WINDOW 1
-#define ID_WORDWRAP_MARGIN 2
-
-#define ID_NEWFILE_ABORT 100
-
-#define ID_TAB_ADD 100
-#define ID_TAB_DEL 101
-#define ID_TAB_EMPTY 102
-
-#define IDC_PAGEFMT_TB 100
-#define IDC_PAGEFMT_FB 101
-#define IDC_PAGEFMT_SB 102
-#define IDC_PAGEFMT_WW 103
-#define IDC_PAGEFMT_WM 104
-#define IDC_PAGEFMT_ID 105
-
-#define ID_DATETIME 1600
-#define ID_PARAFORMAT 1601
-#define ID_TABSTOPS 1602
-
-#define ID_ABOUT 1603
-#define ID_VIEWPROPERTIES 1604
-
-#define IDC_STATUSBAR 2000
-#define IDC_EDITOR 2001
-#define IDC_TOOLBAR 2002
-#define IDC_FORMATBAR 2003
-#define IDC_REBAR 2004
-#define IDC_COMBO 2005
-#define IDC_DATETIME 2006
-#define IDC_NEWFILE 2007
-#define IDC_PARA_LEFT 2008
-#define IDC_PARA_RIGHT 2009
-#define IDC_PARA_FIRST 2010
-#define IDC_PARA_ALIGN 2011
-#define IDC_TABSTOPS 2012
-#define IDC_FONTLIST 2013
-#define IDC_SIZELIST 2014
-
-#define IDD_DATETIME 2100
-#define IDD_NEWFILE 2101
-#define IDD_PARAFORMAT 2102
-#define IDD_TABSTOPS 2103
-#define IDD_FORMATOPTS 2104
-
-#define IDM_POPUP 2200
-
-#define IDB_TOOLBAR 100
-#define IDB_FORMATBAR 101
-
-#define IDI_WORDPAD 102
-#define IDI_RTF 103
-#define IDI_WRI 104
-#define IDI_TXT 105
-
-#define STRING_ALL_FILES 1400
-#define STRING_TEXT_FILES_TXT 1401
-#define STRING_TEXT_FILES_UNICODE_TXT 1402
-#define STRING_RICHTEXT_FILES_RTF 1403
-
-#define STRING_NEWFILE_RICHTEXT 1404
-#define STRING_NEWFILE_TXT 1405
-#define STRING_NEWFILE_TXT_UNICODE 1406
-
-#define STRING_ALIGN_LEFT 1407
-#define STRING_ALIGN_RIGHT 1408
-#define STRING_ALIGN_CENTER 1409
-
-#define STRING_PRINTER_FILES_PRN 1410
-
-#define STRING_VIEWPROPS_TITLE 1411
-#define STRING_VIEWPROPS_TEXT 1412
-#define STRING_VIEWPROPS_RICHTEXT 1413
-
-#define STRING_PREVIEW_PRINT 1414
-#define STRING_PREVIEW_NEXTPAGE 1415
-#define STRING_PREVIEW_PREVPAGE 1416
-#define STRING_PREVIEW_CLOSE 1417
-
-#define STRING_UNITS_CM 1418
-
-#define STRING_DEFAULT_FILENAME 1700
-#define STRING_PROMPT_SAVE_CHANGES 1701
-#define STRING_SEARCH_FINISHED 1702
-#define STRING_LOAD_RICHED_FAILED 1703
-#define STRING_SAVE_LOSEFORMATTING 1704
-#define STRING_INVALID_NUMBER 1705