Update xcopy, winhlp32 and wordpad to Wine HEAD. I kept Fireball's changes, but plz send them to Wine, too.

The Lithuan, Ukrainian and Greek Translators of winhlp32 should do the same.

svn path=/trunk/; revision=34090

reactos/base/applications/cmdutils/xcopy/Da.rc

@@ -47,7 +47,7 @@ STRINGTABLE
 "XCOPY - Kopierer filer eller katalogtre til en målplassering\n\
 \n\
 Syntaks:\n\
-XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 hvor:\n\
@@ -69,7 +69,7 @@ hvor:\n\
 [/H]  Kopier skjulte filer og systemfiler\n\
 [/C]  Fortsæt selv om det opstår fejl under kopieringen\n\
 [/A]  Kopier ikke filer som er markeret som arkiv\n\
-[/M]  Kopier kun filer som er markeret som akriv; fjerner denne markering \n\
+[/M]  Kopier kun filer som er markeret som akriv; fjerner denne markering\n\
 [/D | /D:m-d-å] Kopier kun nye filer eller dem som er ændret efter\n\
       \t\tden opgivne dato.\n\
       \t\tHvis ingen dato opgives kopieres kun de filer hvor\n\

reactos/base/applications/cmdutils/xcopy/De.rc

@@ -48,7 +48,7 @@ STRINGTABLE
 "XCOPY - Kopiert Dateien oder Verzeichnisse an einen Zielort\n\
 \n\
 Syntax:\n\
-XCOPY Quelle [Ziel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY Quelle [Ziel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Mit:\n\

reactos/base/applications/cmdutils/xcopy/En.rc

@@ -47,12 +47,12 @@ STRINGTABLE
 "XCOPY - Copies source files or directory trees to a destination\n\
 \n\
 Syntax:\n\
-XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Where:\n\
 \n\
-[/I]  Assume directory if destination does not exist and copying 2 or \n\
+[/I]  Assume directory if destination does not exist and copying 2 or\n\
 \tmore files\n\
 [/S]  Copy directories and subdirectories\n\
 [/E]  Copy directories and subdirectories, including any empty ones\n\
@@ -70,7 +70,7 @@ Where:\n\
 [/H]  Include hidden and system files in the copy\n\
 [/C]  Continue even if an error occurs during the copy\n\
 [/A]  Only copy files with archive attribute set\n\
-[/M]  Only copy files with archive attribute set, removes \n\
+[/M]  Only copy files with archive attribute set, removes\n\
 \tarchive attribute\n\
 [/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\
 \t\tIf no date is supplied, only copy if destination is older\n\

reactos/base/applications/cmdutils/xcopy/Fr.rc

@@ -48,7 +48,7 @@ STRINGTABLE
 "XCOPY - Copie les fichiers ou répertoires source vers une destination\n\
 \n\
 Syntaxe :\n\
-XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Où :\n\
@@ -71,7 +71,7 @@ Où :\n\
 [/H]  Inclure les fichiers cachés et système dans la copie\n\
 [/C]  Continue même si une erreur survient pendant la copie\n\
 [/A]  Copie uniquement les fichiers qui ont l'attribut archive défini\n\
-[/M]  Copie uniquement les fichiers qui ont l'attribut archive défini, supprime \n\
+[/M]  Copie uniquement les fichiers qui ont l'attribut archive défini, supprime\n\
 \tensuite l'attribut\n\
 [/D | /D:m-d-y] Copie uniquement les fichiers nouveaux ou ceux modifiés après la date spécifiée.\n\
 \t\tSi aucune date n'est spécifiée, copie uniquement lorsque le fichier de destination est plus vieux\n\

reactos/base/applications/cmdutils/xcopy/Ko.rc

@@ -48,12 +48,12 @@ STRINGTABLE
 "XCOPY - 원본 파일이나 디렉토리 구조를 목적지로 복사\n\
 \n\
 문법:\n\
-XCOPY 원본 [대상] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY 원본 [대상] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Where:\n\
 \n\
-[/I]  Assume directory if destination does not exist and copying 2 or \n\
+[/I]  Assume directory if destination does not exist and copying 2 or\n\
 \tmore files\n\
 [/S]  디렉토리하고 하위 디렉토리 복사\n\
 [/E]  빈 디렉토리를 포함해서 디렉토리와 하위 디렉토리 복사\n\
@@ -71,10 +71,10 @@ Where:\n\
 [/H]  숨은 파일이나 시스템 파일도 포함해서 복사\n\
 [/C]  복사하는 동안에 에러가 발생해도 계속 진행\n\
 [/A]  오직 압축 속성이 설정되어있는 파일만 복사\n\
-[/M]  오직 압축 속성을 제거하면서  압축 속성이 설정되어있는  \n\
+[/M]  오직 압축 속성을 제거하면서  압축 속성이 설정되어있는\n\
-\파일만 복사 \n\
+\파일만 복사\n\
 [/D | /D:m-d-y] 지정된 날짜 후에 수정되거나 새로운 파일 복사.\n\
-\t\tI만약 어떠한 날짜도 지정되지 않으면,오직 원본보다 \n\
+\t\tI만약 어떠한 날짜도 지정되지 않으면,오직 원본보다\n\
 \t\t대상이 오래된 것만 복사\n\n"
 
 }

reactos/base/applications/cmdutils/xcopy/Nl.rc

@@ -47,7 +47,7 @@ STRINGTABLE
 "XCOPY - Copiëerd bron bestanden of directory bomen naar een bestemming\n\
 \n\
 Gebruik:\n\
-XCOPY bron [bestemming] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY bron [bestemming] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Parameters:\n\
@@ -70,7 +70,7 @@ Parameters:\n\
 [/H]  Inclusief verborgen en systeem bestanden\n\
 [/C]  Ga door zelfs als er een fout optreed tijdens het copiëren\n\
 [/A]  Copiëer alleen bestanden met archiverings attribuut aan\n\
-[/M]  Copiëer alleen bestanden met archiverings attribuut aan, verwijderd \n\
+[/M]  Copiëer alleen bestanden met archiverings attribuut aan, verwijderd\n\
 \tdit archiverings attribuut\n\
 [/D | /D:m-d-y] Copiëer nieuwe bestanden of die gewijzigd zijn na de opgegeven\n\
 \t\tdatum. Als geen detum wordt gegeven, copiëer alleen als bron nieuwer is.\n\n"

reactos/base/applications/cmdutils/xcopy/No.rc

@@ -47,7 +47,7 @@ STRINGTABLE
 "XCOPY - Kopierer filer eller katalogtre til en målplassering\n\
 \n\
 Syntax:\n\
-XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Where:\n\
@@ -70,7 +70,7 @@ Where:\n\
 [/H]  Kopier skjulte filer og systemfiler\n\
 [/C]  Fortsett selv om det oppstår feil under kopieringen\n\
 [/A]  Ikke kopier filer som er markert som arkiv\n\
-[/M]  Bare kopier filer som er markert som akriv; fjerner denne merkingen \n\
+[/M]  Bare kopier filer som er markert som akriv; fjerner denne merkingen\n\
 [/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n\
       \t\tden oppgitte datoen.\n\
       \t\tHvis ingen dato oppgis kopieres bare de filene som er\n\

reactos/base/applications/cmdutils/xcopy/Pl.rc

@@ -48,7 +48,7 @@ STRINGTABLE
 "XCOPY - kopiuje pliki lub drzewa katalogów\n\
 \n\
 Składnia:\n\
-XCOPY 坧鏚這 [cel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY 坧鏚這 [cel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Gdzie:\n\

reactos/base/applications/cmdutils/xcopy/Ru.rc

@@ -51,12 +51,12 @@ STRINGTABLE
 "XCOPY - Копирует файлы и деревья папок\n\
 \n\
 Синтаксис:\n\
-XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Где:\n\
 \n\
-[/I]  Если конечная папка отсутствует и копируется более одного файла, \n\
+[/I]  Если конечная папка отсутствует и копируется более одного файла,\n\
       то предполагается папка в качестве места назначения.\n\
 [/S]  Копирует папки и подпапки.\n\
 [/E]  Копирует папки и подпапки, включая пустые.\n\
@@ -73,7 +73,7 @@ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
 [/R]  Перезаписывает файлы, доступные только для чтения.\n\
 [/H]  Копирует скрытые и системные файлы.\n\
 [/C]  Продолжает работу, даже если произошла ошибка.\n\
-[/A]  Копирует только те файлы, для которых установлен атрибут \"архивный\". \n\
+[/A]  Копирует только те файлы, для которых установлен атрибут \"архивный\".\n\
 [/M]  Копирует только те файлы, для которых установлен атрибут \"архивный\",\n\
       при этом атрибут удаляется.\n\
 [/D | /D:m-d-y] Копирует только новые файлы или те, которые были изменены\n\

reactos/base/applications/cmdutils/xcopy/Si.rc

@@ -30,7 +30,7 @@ STRINGTABLE
     STRING_PAUSE,    "Za začetek kopiranja pritisnite <enter>\n"
     STRING_SIMCOPY,  "Prekopiral bom %d datotek\n"
     STRING_COPY,     "Prekopiral sem %d datotek\n"
-    STRING_QISDIR,   "Ali je '%s' ime ciljne datoteke \n" \
+    STRING_QISDIR,   "Ali je '%s' ime ciljne datoteke\n" \
                      "ali mape?\n" \
                      "(D - Datoteka, M - Mapa)\n"
     STRING_SRCPROMPT,"%s? (Da|Ne)\n"
@@ -48,12 +48,12 @@ STRINGTABLE
 "XCOPY - kopira navedene izvorne datoteke oz. mape v naveden cilj\n\
 \n\
 Sintaksa:\n\
-XCOPY izvor [cilj] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY izvor [cilj] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Where:\n\
 \n\
-[/I]  Če cilj ne obstaja in gre za kopiranje dveh ali več datotek, predpostavi, \n\
+[/I]  Če cilj ne obstaja in gre za kopiranje dveh ali več datotek, predpostavi,\n\
 \da je cilj mapa\n\
 [/S]  Kopiraj mape in podmape\n\
 [/E]  Kopiraj mape in podmape, vključno s praznimi mapami\n\

reactos/base/applications/winhlp32/lang/bg-BG.rc

@@ -38,6 +38,22 @@ MAIN_MENU MENU LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
  POPUP "&Îòìåòêè" {
    MENUITEM "&Çàäàé...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Ïîìîù" {
    MENUITEM "Ïîìîù &çà ïîìîùòà", MNID_HELP_HELPON
    MENUITEM "Âèíàãè îò&ãîðå", MNID_HELP_HELPTOP
@@ -61,7 +77,6 @@ STID_HLPFILE_ERROR_s, 	"
 STID_CONTENTS, 		"&Ñúäúðæàíèå"
 STID_SEARCH, 		"&Òúðñè"
 STID_BACK, 		"&Íàçàä"
-STID_HISTORY, 		"&Čńňîđč˙"
 STID_TOPICS,		"&Òåìè"
 STID_ALL_FILES, 	"Âñè÷êè ôàéëîâå (*.*)"
 STID_HELP_FILES_HLP, 	"Ïîìîùíè ôàéëîâå (*.hlp)"

reactos/base/applications/winhlp32/lang/cs-CZ.rc

@@ -43,6 +43,22 @@ MAIN_MENU MENU LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
  POPUP "&Záložka" {
    MENUITEM "Pøi&dat...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Nápovìda" {
    MENUITEM "Náp&ovìda k nápovìdì", MNID_HELP_HELPON
    MENUITEM "Vždy na &vrchu", MNID_HELP_HELPTOP
@@ -66,7 +82,6 @@ STID_HLPFILE_ERROR_s, 	"Nelze p
 STID_CONTENTS, 		"&Obsah"
 STID_SEARCH, 		"&Hledat"
 STID_BACK, 		"&Zpìt"
-STID_HISTORY, 		"&Historie"
 STID_TOPICS,		"&Témata"
 STID_ALL_FILES, 	"Všechny soubory (*.*)"
 STID_HELP_FILES_HLP, 	"Soubory nápovìdy (*.hlp)"

reactos/base/applications/winhlp32/lang/da-DK.rc

@@ -40,6 +40,22 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
  POPUP "Bog&mærke" {
    MENUITEM "&Definer...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Hjælp" {
    MENUITEM "&Brug af Hjælp", MNID_HELP_HELPON
    MENUITEM "Altid &øverst", MNID_HELP_HELPTOP
@@ -73,7 +89,6 @@ STID_HLPFILE_ERROR_s, 	"Fejl ved indl
 STID_CONTENTS, 		"&Indhold"
 STID_SEARCH, 		"&Søg"
 STID_BACK, 		"&Tilbage"
-STID_HISTORY, 		"&Oversigt"
 STID_TOPICS, 		"&Emner"
 STID_ALL_FILES, 	"Alle filer (*.*)"
 STID_HELP_FILES_HLP, 	"Hjælpe filer (*.hlp)"

reactos/base/applications/winhlp32/lang/de-DE.rc

@@ -39,6 +39,22 @@ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
  POPUP "&Lesezeichen" {
    MENUITEM "&Definieren...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Hilfe" {
    MENUITEM "&Hilfe benutzen", MNID_HELP_HELPON
    MENUITEM "Immer im &Vordergrund", MNID_HELP_HELPTOP
@@ -73,7 +89,6 @@ STID_HLPFILE_ERROR_s, 	"Fehler beim Lesen der Hilfe-Datei `%s'"
 STID_CONTENTS, 		"&Inhalt"
 STID_SEARCH, 		"&Suchen"
 STID_BACK, 		"&Zurück"
-STID_HISTORY, 		"&Chronik"
 STID_TOPICS, 		"&Themen"
 STID_ALL_FILES, 	"Alle Dateien (*.*)"
 STID_HELP_FILES_HLP, 	"Hilfe-Dateien (*.hlp)"

reactos/base/applications/winhlp32/lang/el-GR.rc

@@ -69,7 +69,6 @@ STID_HLPFILE_ERROR_s, 	"
 STID_CONTENTS, 		"&Ðåñéå÷üìåíá"
 STID_SEARCH, 		"&ÁíáæÞôçóç"
 STID_BACK, 		"&Ðñïçãïýìåíï"
-STID_HISTORY, 		"&Éóôďńéęü"
 STID_TOPICS,		"&ÈÝìáôá"
 STID_ALL_FILES, 	"¼ëá ôá áñ÷åßá (*.*)"
 STID_HELP_FILES_HLP, 	"Áñ÷åßá âïÞèåéáò (*.hlp)"

reactos/base/applications/winhlp32/lang/en-US.rc

@@ -39,6 +39,22 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
  POPUP "&Bookmark" {
    MENUITEM "&Define...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Help" {
    MENUITEM "Help &on help", MNID_HELP_HELPON
    MENUITEM "Always on &top", MNID_HELP_HELPTOP
@@ -72,7 +88,6 @@ STID_HLPFILE_ERROR_s, 	"Error while reading the help file `%s'"
 STID_CONTENTS, 		"&Contents"
 STID_SEARCH, 		"&Search"
 STID_BACK, 		"&Back"
-STID_HISTORY, 		"&History"
 STID_TOPICS,		"&Topics"
 STID_ALL_FILES, 	"All files (*.*)"
 STID_HELP_FILES_HLP, 	"Help files (*.hlp)"

reactos/base/applications/winhlp32/lang/eo-EO.rc

@@ -41,6 +41,22 @@ MAIN_MENU MENU LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
  POPUP "&Legosigno" {
    MENUITEM "&Difinu...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Helpo" {
    MENUITEM "&Helpu pri helpo", MNID_HELP_HELPON
    MENUITEM "Æiam &supre", MNID_HELP_HELPTOP
@@ -64,7 +80,6 @@ STID_HLPFILE_ERROR_s, 	"Eraro dum la legado de helpdosiero `%s'"
 STID_CONTENTS, 	"&Enhavo"
 STID_SEARCH, 		"&Seræu"
 STID_BACK, 		"&Retro"
-STID_HISTORY, 		"Krono&logio"
 STID_TOPICS,		"&Temoj"
 STID_ALL_FILES, 	"Tutaj dosieroj (*.*)"
 STID_HELP_FILES_HLP, 	"Helpaj dosieroj (*.hlp)"

reactos/base/applications/winhlp32/lang/es-ES.rc

@@ -40,6 +40,22 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
  POPUP "&Marcador" {
    MENUITEM "&Definir...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "A&yuda" {
    MENUITEM "&Ayuda sobre la ayuda", MNID_HELP_HELPON
    MENUITEM "&Siempre visible", MNID_HELP_HELPTOP
@@ -63,7 +79,6 @@ STID_HLPFILE_ERROR_s, 	"Error al leer el archivo de ayuda `%s'"
 STID_CONTENTS, 		"&Índice"
 STID_SEARCH, 		"&Buscar"
 STID_BACK, 		"&Anterior"
-STID_HISTORY, 		"&Historial"
 STID_TOPICS,		"&Temas"
 STID_ALL_FILES, 	"Todos los archivos (*.*)"
 STID_HELP_FILES_HLP, 	"Archivos de ayuda (*.hlp)"

reactos/base/applications/winhlp32/lang/fi-FI.rc

@@ -40,6 +40,22 @@ MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
  POPUP "&Kirjanmerkki" {
    MENUITEM "&Aseta...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Ohje" {
    MENUITEM "&Ohjeen käyttö", MNID_HELP_HELPON
    MENUITEM "&Aina päällimmäisenä", MNID_HELP_HELPTOP
@@ -64,7 +80,6 @@ STID_HLPFILE_ERROR_s, 	"Virhe luettaessa ohjetiedostoa `%s'"
 STID_CONTENTS, 		"&Sisällys"
 STID_SEARCH, 		"&Etsi"
 STID_BACK, 		"&Takaisin"
-STID_HISTORY, 		"&Luetut"
 STID_TOPICS,		"T&opics"
 STID_ALL_FILES, 	"Kaikki tiedostot (*.*)"
 STID_HELP_FILES_HLP, 	"Ohjetiedostot (*.hlp)"

reactos/base/applications/winhlp32/lang/fr-FR.rc

@@ -42,6 +42,22 @@ MAIN_MENU MENU
  POPUP "&Signet" {
    MENUITEM "&Définir...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Aide toujours visible"
+   BEGIN
+     MENUITEM "Par défaut",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "Historique",	MNID_OPTS_HISTORY
+  POPUP    "Polices"
+  BEGIN
+    MENUITEM "Petite",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normale",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Grande",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Utiliser les couleurs système", MNID_OPTS_SYSTEM_COLORS
+}
  POPUP "Aid&e" {
    MENUITEM "&Utiliser l'aide", MNID_HELP_HELPON
    MENUITEM "&Toujours visible", MNID_HELP_HELPTOP
@@ -75,7 +91,6 @@ STID_HLPFILE_ERROR_s, 	"Une erreur est survenue en lisant le fichier d'aide
 STID_CONTENTS, 		"&Index"
 STID_SEARCH, 		"&Rechercher"
 STID_BACK, 		"&Précédent"
-STID_HISTORY, 		"&Historique"
 STID_TOPICS,		"&Sujets"
 STID_ALL_FILES, 	"Tous fichiers (*.*)"
 STID_HELP_FILES_HLP, 	"Fichiers d'aide (*.hlp)"

reactos/base/applications/winhlp32/lang/hu-HU.rc

@@ -40,6 +40,22 @@ MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
  POPUP "&Könyvjelzõ" {
    MENUITEM "&Definiálás...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Súgó" {
    MENUITEM "&Használat", MNID_HELP_HELPON
    MENUITEM "Mindig &legfelül", MNID_HELP_HELPTOP
@@ -64,7 +80,6 @@ STID_HLPFILE_ERROR_s, 	"Hiba a `%s' file olvas
 STID_CONTENTS, 		"&Tartalom"
 STID_SEARCH, 		"&Keresés"
 STID_BACK, 		"&Vissza"
-STID_HISTORY, 		"&Előzmény"
 STID_TOPICS,		"&Témakörök"
 STID_ALL_FILES, 	"Minden fájl (*.*)"
 STID_HELP_FILES_HLP, 	"Súgó fájlok (*.hlp)"

reactos/base/applications/winhlp32/lang/it-IT.rc

@@ -39,6 +39,22 @@ MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
  POPUP "&Segnalibro" {
    MENUITEM "&Definisci...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&?" {
    MENUITEM "&Aiuto sulla guida", MNID_HELP_HELPON
    MENUITEM "Sempre in primo &piano", MNID_HELP_HELPTOP
@@ -63,7 +79,6 @@ STID_HLPFILE_ERROR_s, 	"Errore di lettura del file della Guida `%s'"
 STID_CONTENTS, 		"&Sommario"
 STID_SEARCH, 		"&Trova"
 STID_BACK, 		"&Precedente"
-STID_HISTORY, 		"&Cronologia"
 STID_TOPICS,		"&Argomenti"
 STID_ALL_FILES, 	"Tutti i file (*.*)"
 STID_HELP_FILES_HLP, 	"File della Guida (*.hlp)"

reactos/base/applications/winhlp32/lang/ko-KR.rc

@@ -39,6 +39,22 @@ MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
  POPUP "책갈피(&B)" {
    MENUITEM "정의(&D)...", MNID_BKMK_DEFINE
  }
+ POPUP "옵션(&O)" {
+   POPUP	"가능한 도움말 보이기"
+   BEGIN
+     MENUITEM "기본",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "보이기",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "보여주지 않기",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "기록",		MNID_OPTS_HISTORY
+  POPUP    "글꼴"
+  BEGIN
+    MENUITEM "작게",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "보통",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "크게",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "시스템 색상 사용",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "도움말(&H)" {
    MENUITEM "도움말 사용법(&O)", MNID_HELP_HELPON
    MENUITEM "항상 위(&T)", MNID_HELP_HELPTOP
@@ -75,7 +91,6 @@ STID_HLPFILE_ERROR_s, 	"
 STID_CONTENTS, 		"목차(&C)"
 STID_SEARCH, 		"찾기(&S)"
 STID_BACK, 		"뒤로(&B)"
-STID_HISTORY, 		"히스토리(&H)"
 STID_TOPICS,		"목차(&T)"
 STID_ALL_FILES, 	"모든 파일 (*.*)"
 STID_HELP_FILES_HLP, 	"도움말 파일 (*.hlp)"

reactos/base/applications/winhlp32/lang/lt-LT.rc

@@ -71,7 +71,6 @@ STID_HLPFILE_ERROR_s, 	"
 STID_CONTENTS, 		"&Turinys"
 STID_SEARCH, 		"&Paieðka"
 STID_BACK, 		"&Atgal"
-STID_HISTORY, 		"&Istorija"
 STID_TOPICS,		"&Temos"
 STID_ALL_FILES, 	"Visos bylos (*.*)"
 STID_HELP_FILES_HLP, 	"Pagalbos bylos (*.hlp)"

reactos/base/applications/winhlp32/lang/nb-NO.rc

@@ -38,6 +38,22 @@ MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
  POPUP "&Bokmerke" {
    MENUITEM "&Definer...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Hjelp" {
    MENUITEM "&Hjelp til Hjelp", MNID_HELP_HELPON
    MENUITEM "All&tid øverst", MNID_HELP_HELPTOP
@@ -71,7 +87,6 @@ STID_HLPFILE_ERROR_s, 	"Feil ved lesing av hjelpefilen '%s'"
 STID_CONTENTS, 		"&Innhold"
 STID_SEARCH, 		"&Søk"
 STID_BACK, 		"Til&bake"
-STID_HISTORY, 		"&Historikk"
 STID_TOPICS,		"&Emner"
 STID_ALL_FILES, 	"Alle filer (*.*)"
 STID_HELP_FILES_HLP, 	"Hjelp-filer (*.hlp)"

reactos/base/applications/winhlp32/lang/nl-NL.rc

@@ -39,6 +39,22 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
  POPUP "&Favorieten" {
    MENUITEM "&Aanmaken...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Help" {
    MENUITEM "Hulp &bij help", MNID_HELP_HELPON
    MENUITEM "Altijd &zichtbaar", MNID_HELP_HELPTOP
@@ -72,7 +88,6 @@ STID_HLPFILE_ERROR_s, 	"Fout bij het lezen van het helpbestand `%s'"
 STID_CONTENTS, 		"&Inhoud"
 STID_SEARCH, 		"&Zoeken"
 STID_BACK, 		"&Terug"
-STID_HISTORY, 		"&Geschiedenis"
 STID_TOPICS,		"&Onderwerpen"
 STID_ALL_FILES, 	"Alle bestanden (*.*)"
 STID_HELP_FILES_HLP, 	"Helpbestanden (*.hlp)"

reactos/base/applications/winhlp32/lang/pl-PL.rc

@@ -40,6 +40,22 @@ MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
  POPUP "&Zak³adka" {
    MENUITEM "&Zdefiniuj...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "Pomo&c" {
    MENUITEM "&Pomoc", MNID_HELP_HELPON
    MENUITEM "&Zawsze na wierzchu", MNID_HELP_HELPTOP
@@ -73,12 +89,11 @@ STID_HLPFILE_ERROR_s, 	"B
 STID_CONTENTS, 		"&ZawartoϾ"
 STID_SEARCH, 		"&Szukaj"
 STID_BACK, 		"&Wstecz"
-STID_HISTORY, 		"&Historia"
 STID_TOPICS,		"&Tematy"
 STID_ALL_FILES, 	"Wszystkie pliki (*.*)"
 STID_HELP_FILES_HLP, 	"Pliki pomocy (*.hlp)"
-STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
+STID_FILE_NOT_FOUND_s	"Nie znaleziono pliku '%s'. Czy chcesz poszukaæ tego pliku samodzielnie?"
-STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_NO_RICHEDIT	"Nie uda³o siê znaleŸæ modu³u richedit... Wyœwietlenie pomocy nie jest mo¿liwe"
 }
 
 

reactos/base/applications/winhlp32/lang/pt-BR.rc

@@ -45,6 +45,22 @@ MAIN_MENU MENU
  POPUP "In&dicador" {
    MENUITEM "&Definir...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "Aj&uda" {
    MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON
    MENUITEM "Sempre &visível", MNID_HELP_HELPTOP
@@ -76,6 +92,22 @@ MAIN_MENU MENU
  POPUP "In&dicador" {
    MENUITEM "&Definir...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "Aj&uda" {
    MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON
    MENUITEM "Sempre &visível", MNID_HELP_HELPTOP
@@ -102,7 +134,6 @@ STID_HLPFILE_ERROR_s, 	"Erro encontrado na leitura do arquivo de ajuda '%s'"
 STID_CONTENTS, 		"&Conteúdo"
 STID_SEARCH, 		"&Procurar"
 STID_BACK, 		"&Voltar"
-STID_HISTORY, 		"&Histórico"
 STID_TOPICS,		"&Tópicos"
 STID_ALL_FILES, 	"Todos os arquivos (*.*)"
 STID_HELP_FILES_HLP, 	"Arquivos de ajuda (*.hlp)"
@@ -123,7 +154,6 @@ STID_HLPFILE_ERROR_s, 	"Erro encontrado na leitura do ficheiro de ajuda '%s'"
 STID_CONTENTS, 		"&Conteúdo"
 STID_SEARCH, 		"&Procurar"
 STID_BACK, 		"&Voltar"
-STID_HISTORY, 		"&Histórico"
 STID_TOPICS,		"&Tópicos"
 STID_ALL_FILES, 	"Todos os ficheiros (*.*)"
 STID_HELP_FILES_HLP, 	"Ficheiros de ajuda (*.hlp)"

reactos/base/applications/winhlp32/lang/rm-RM.rc

@@ -43,6 +43,22 @@ MAIN_MENU MENU LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT
  POPUP "&Marca" {
    MENUITEM "&Definir...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Ag<41>d" {
    MENUITEM "&Douvrar l'ag<61>d", MNID_HELP_HELPON
    MENUITEM "Ad<41>na da&vant", MNID_HELP_HELPTOP
@@ -66,7 +82,6 @@ STID_HLPFILE_ERROR_s,   "Sbagl cun leger la datoteca d'ag<61>d `%s'"
 STID_CONTENTS,          "&Cuntgn<67>"
 STID_SEARCH,            "&Tscherchar"
 STID_BACK,              "&Inavo"
-STID_HISTORY,           "&Fin qua"
 STID_TOPICS,            "T&opics"
 STID_ALL_FILES,         "Tuot las datotecas (*.*)"
 STID_HELP_FILES_HLP,    "Datotecas d'ag<61>d (*.hlp)"

reactos/base/applications/winhlp32/lang/ru-RU.rc

@@ -38,6 +38,22 @@ MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
  POPUP "&Çàêëàäêà" {
    MENUITEM "&Îïðåäåëèòü...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Ñïðàâêà" {
    MENUITEM "Ïîìîùü &ïî ïîìîùè", MNID_HELP_HELPON
    MENUITEM "Âñåãäà &ñâåðõó", MNID_HELP_HELPTOP
@@ -71,7 +87,6 @@ STID_HLPFILE_ERROR_s, 	"
 STID_CONTENTS, 		"&Ñîäåðæàíèå"
 STID_SEARCH, 		"&Íàéòè"
 STID_BACK, 		"&Íàçàä"
-STID_HISTORY, 		"&Čńňîđč˙"
 STID_TOPICS,		"&Óêàçàòåëü"
 STID_ALL_FILES, 	"Âñå ôàéëû (*.*)"
 STID_HELP_FILES_HLP, 	"Ôàéëû ñïðàâêè (*.hlp)"

reactos/base/applications/winhlp32/lang/sk-SK.rc

@@ -36,6 +36,22 @@ MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
  POPUP "&Záložka" {
    MENUITEM "&Definovať...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Pomoc" {
    MENUITEM "Pomoc &na pomoci", MNID_HELP_HELPON
    MENUITEM "Vždy na &vrchu", MNID_HELP_HELPTOP
@@ -59,7 +75,6 @@ STID_HLPFILE_ERROR_s,       "Chyba po
 STID_CONTENTS,              "&Obsah"
 STID_SEARCH,                "&Hľadať"
 STID_BACK,                  "&Späť"
-STID_HISTORY,               "&História"
 STID_TOPICS,		    "&Topics"
 STID_ALL_FILES,             "Všetky súbory (*.*)"
 STID_HELP_FILES_HLP,        "Súbory pomoci (*.hlp)"

reactos/base/applications/winhlp32/lang/sl-SI.rc

@@ -40,7 +40,23 @@ MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
  POPUP "&Zaznamki" {
    MENUITEM "Do&loči ...", MNID_BKMK_DEFINE
  }
- POPUP "&Pomoč" {
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+   END
+   MENUITEM "History",		MNID_OPTS_HISTORY
+   POPUP    "Fonts"
+   BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+   END
+   MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+  }
+  POPUP "&Pomoč" {
    MENUITEM "&O pomoči", MNID_HELP_HELPON
    MENUITEM "Vedno na &vrhu", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -73,7 +89,6 @@ STID_HLPFILE_ERROR_s, 	"Napaka pri branju datoteke s pomočjo `%s'"
 STID_CONTENTS, 		"&Teme pomoči"
 STID_SEARCH, 		"&Iskanje"
 STID_BACK, 		"&Nazaj"
-STID_HISTORY, 		"&Zgodovina"
 STID_TOPICS,		"&Vsebina"
 STID_ALL_FILES, 	"Vse datoteke (*.*)"
 STID_HELP_FILES_HLP, 	"Datoteke s pomočjo (*.hlp)"

reactos/base/applications/winhlp32/lang/sv-SE.rc

@@ -41,6 +41,22 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
  POPUP "&Bokmärke" {
    MENUITEM "&Definiera...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Hjälp" {
    MENUITEM "Hjälp &för hjälp", MNID_HELP_HELPON
    MENUITEM "Alltid &överst", MNID_HELP_HELPTOP
@@ -64,7 +80,6 @@ STID_HLPFILE_ERROR_s, 	"Fel vid läsning av hjälpfilen `%s'"
 STID_CONTENTS, 		"&Innehåll"
 STID_SEARCH, 		"&Sök"
 STID_BACK, 		"&Bakåt"
-STID_HISTORY, 		"&Historik"
 STID_TOPICS,		"&Ämnen"
 STID_ALL_FILES, 	"Alla filer (*.*)"
 STID_HELP_FILES_HLP, 	"Hjälpfiler (*.hlp)"

reactos/base/applications/winhlp32/lang/tr-TR.rc

@@ -38,6 +38,22 @@ MAIN_MENU MENU LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
  POPUP "Yer Ý&mleri" {
    MENUITEM "&Tanýmla...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Yardým" {
    MENUITEM "&Yardým Kullanýmý", MNID_HELP_HELPON
    MENUITEM "&Her Zaman Üstte", MNID_HELP_HELPTOP
@@ -61,7 +77,6 @@ STID_HLPFILE_ERROR_s, 	"'%s' yard
 STID_CONTENTS, 		"&Ýçindekiler"
 STID_SEARCH, 		"&Ara"
 STID_BACK, 		"&Geri"
-STID_HISTORY, 		"Ge&çmiţ"
 STID_TOPICS,		"&Konular"
 STID_ALL_FILES, 	"Tüm dosyalar (*.*)"
 STID_HELP_FILES_HLP, 	"Yardým dosyalarý (*.hlp)"

reactos/base/applications/winhlp32/lang/uk-UA.rc

@@ -56,7 +56,6 @@ STID_HLPFILE_ERROR_s, 	"
 STID_CONTENTS, 		"&Çì³ñò"
 STID_SEARCH, 		"&Ïîøóê"
 STID_BACK, 		"&Íàçàä"
-STID_HISTORY, 		"&˛ńňîđł˙"
 STID_TOPICS,		"&Ðîçä³ëè"
 STID_ALL_FILES, 	"Âñ³ ôàéëè (*.*)"
 STID_HELP_FILES_HLP, 	"Ôàéëè äîïîìîãè (*.hlp)"

reactos/base/applications/winhlp32/lang/wa-WA.rc

@@ -42,6 +42,22 @@ MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT
  POPUP "&Rimårkes" {
    MENUITEM "&Defini...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "&Aide" {
    MENUITEM "&Aide so l' Aide", MNID_HELP_HELPON
    MENUITEM "Todi &Visibe", MNID_HELP_HELPTOP
@@ -66,7 +82,6 @@ STID_HLPFILE_ERROR_s, 	"Y
 STID_CONTENTS, 		"Å&dvins"
 STID_SEARCH, 		"C&werî"
 STID_BACK, 		"Èn &Erî"
-STID_HISTORY, 		"&Istwere"
 STID_TOPICS,		"&Topics"
 STID_ALL_FILES, 	"Tos les fitchîs (*.*)"
 STID_HELP_FILES_HLP, 	"Fitchîs d' aide (*.hlp)"

reactos/base/applications/winhlp32/lang/zh-CN.rc

@@ -39,6 +39,22 @@ MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
  POPUP "书签（&B）" {
    MENUITEM "定义（&D）...", MNID_BKMK_DEFINE
  }
+ POPUP "&Options" {
+   POPUP	"Help always visible"
+   BEGIN
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+  END
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
+  BEGIN
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+  END
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+ }
  POPUP "帮助（&H）" {
    MENUITEM "如何使用帮助（&O）", MNID_HELP_HELPON
    MENUITEM "总是在最前面（&T）", MNID_HELP_HELPTOP
@@ -62,7 +78,6 @@ STID_HLPFILE_ERROR_s, 	"
 STID_CONTENTS, 		"内容（&C）"
 STID_SEARCH, 		"搜索（&S）"
 STID_BACK, 		"返回（&B）"
-STID_HISTORY, 		"ŔúʡŁ¨&HŁŠ"
 STID_TOPICS,		"主题（&T）"
 STID_ALL_FILES, 	"所有文件 (*.*)"
 STID_HELP_FILES_HLP, 	"帮助文件 (*.hlp)"

reactos/base/applications/winhlp32/winhelp.c

@@ -376,6 +376,13 @@ typedef struct
     WORD ofsData;
 } WINHELP,*LPWINHELP;
 
+static BOOL WINHELP_HasWorkingWindow(void)
+{
+    if (!Globals.active_win) return FALSE;
+    if (Globals.active_win->next || Globals.win_list != Globals.active_win) return TRUE;
+    return Globals.active_win->page != NULL && Globals.active_win->page->file != NULL;
+}
+
 /******************************************************************
  *		WINHELP_HandleCommand
  *
@@ -407,6 +414,7 @@ static LRESULT  WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam)
             {
                 MACRO_JumpContext(ptr, "main", wh->data);
             }
+            if (!WINHELP_HasWorkingWindow()) MACRO_Exit();
             break;
         case HELP_QUIT:
             MACRO_Exit();
@@ -416,9 +424,11 @@ static LRESULT  WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam)
             {
                 MACRO_JumpContents(ptr, "main");
             }
+            if (!WINHELP_HasWorkingWindow()) MACRO_Exit();
             break;
         case HELP_HELPONHELP:
             MACRO_HelpOn();
+            if (!WINHELP_HasWorkingWindow()) MACRO_Exit();
             break;
         /* case HELP_SETINDEX: */
         case HELP_SETCONTENTS:
@@ -618,8 +628,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe
         LoadString(Globals.hInstance, STID_BACK, buffer, sizeof(buffer));
         MACRO_CreateButton("BTN_BACK", buffer, "Back()");
         if (win->back.index <= 1) MACRO_DisableButton("BTN_BACK");
-        LoadString(Globals.hInstance, STID_HISTORY, buffer, sizeof(buffer));
-        MACRO_CreateButton("BTN_HISTORY", buffer, "History()");
         LoadString(Globals.hInstance, STID_TOPICS, buffer, sizeof(buffer));
         MACRO_CreateButton("BTN_TOPICS", buffer, "Finder()");
     }
@@ -868,6 +876,8 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
         case MNID_CTXT_ANNOTATE:MACRO_Annotate();       break;
         case MNID_CTXT_COPY:    MACRO_CopyDialog();     break;
         case MNID_CTXT_PRINT:   MACRO_Print();          break;
+        case MNID_OPTS_HISTORY: MACRO_History();        break;
+        case MNID_OPTS_FONTS_SMALL:
         case MNID_CTXT_FONTS_SMALL:
             win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0);
             if (win->font_scale != 0)
@@ -876,6 +886,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
                 WINHELP_SetupText(GetDlgItem(hWnd, CTL_ID_TEXT), win, 0 /* FIXME */);
             }
             break;
+        case MNID_OPTS_FONTS_NORMAL:
         case MNID_CTXT_FONTS_NORMAL:
             win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0);
             if (win->font_scale != 1)
@@ -884,6 +895,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
                 WINHELP_SetupText(GetDlgItem(hWnd, CTL_ID_TEXT), win, 0 /* FIXME */);
             }
             break;
+        case MNID_OPTS_FONTS_LARGE:
         case MNID_CTXT_FONTS_LARGE:
             win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0);
             if (win->font_scale != 2)
@@ -892,6 +904,10 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
                 WINHELP_SetupText(GetDlgItem(hWnd, CTL_ID_TEXT), win, 0 /* FIXME */);
             }
             break;
+        case MNID_OPTS_HELP_DEFAULT:
+        case MNID_OPTS_HELP_VISIBLE:
+        case MNID_OPTS_HELP_NONVISIBLE:
+        case MNID_OPTS_SYSTEM_COLORS:
         case MNID_CTXT_HELP_DEFAULT:
         case MNID_CTXT_HELP_VISIBLE:
         case MNID_CTXT_HELP_NONVISIBLE:
@@ -1028,6 +1044,16 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
         }
         break;
 
+    case WM_INITMENUPOPUP:
+        win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0);
+        CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_SMALL,
+                      MF_BYCOMMAND | (win->font_scale == 0) ? MF_CHECKED : 0);
+        CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_NORMAL,
+                      MF_BYCOMMAND | (win->font_scale == 1) ? MF_CHECKED : 0);
+        CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_LARGE,
+                      MF_BYCOMMAND | (win->font_scale == 2) ? MF_CHECKED : 0);
+        break;
+
     case WM_NCDESTROY:
         {
             BOOL bExit;

reactos/base/applications/winhlp32/winhelp_res.h

@@ -8,10 +8,19 @@
 
 #define MNID_BKMK_DEFINE        0x121
 
-#define MNID_HELP_HELPON        0x131
+#define MNID_OPTS_HELP_DEFAULT  0x131
-#define MNID_HELP_HELPTOP       0x132
+#define MNID_OPTS_HELP_VISIBLE  0x132
-#define MNID_HELP_ABOUT         0x141
+#define MNID_OPTS_HELP_NONVISIBLE 0x133
-#define MNID_HELP_WINE          0x142
+#define MNID_OPTS_HISTORY       0x134
+#define MNID_OPTS_FONTS_SMALL   0x135
+#define MNID_OPTS_FONTS_NORMAL  0x136
+#define MNID_OPTS_FONTS_LARGE   0x137
+#define MNID_OPTS_SYSTEM_COLORS 0x138
+
+#define MNID_HELP_HELPON        0x141
+#define MNID_HELP_HELPTOP       0x142
+#define MNID_HELP_ABOUT         0x143
+#define MNID_HELP_WINE          0x144
 
 #define MNID_CTXT_ANNOTATE      0x200
 #define MNID_CTXT_COPY          0x201
@@ -36,7 +45,6 @@
 #define STID_CONTENTS 		0x126
 #define STID_SEARCH	 	0x127
 #define STID_BACK 		0x128
-#define STID_HISTORY 		0x129
 #define STID_TOPICS 		0x12A
 #define STID_ALL_FILES 		0x12B
 #define STID_HELP_FILES_HLP	0x12C

reactos/base/applications/wordpad/Da.rc

@@ -23,13 +23,13 @@ BEGIN
     POPUP "&Fil"
     BEGIN
         MENUITEM "&Ny...\tCtrl+N",            ID_FILE_NEW
-        MENUITEM "&Åben ...\tCtrl+O",         ID_FILE_OPEN
+        MENUITEM "&Åben...\tCtrl+O",          ID_FILE_OPEN
         MENUITEM "&Gemme\tCtrl+S",            ID_FILE_SAVE
-        MENUITEM "Gemme &som ...",            ID_FILE_SAVEAS
+        MENUITEM "Gemme &som...",             ID_FILE_SAVEAS
         MENUITEM SEPARATOR
-        MENUITEM "&Udskriv  ...\tCtrl+P",     ID_PRINT
+        MENUITEM "&Udskriv...\tCtrl+P",       ID_PRINT
-        MENUITEM "&Forhåndsvisning ...",      ID_PREVIEW
+        MENUITEM "&Forhåndsvisning...",       ID_PREVIEW
-        MENUITEM "&Side indstillinger ...",   ID_PRINTSETUP
+        MENUITEM "&Side indstillinger...",    ID_PRINTSETUP
         MENUITEM SEPARATOR
         MENUITEM "&Afslut",                   ID_FILE_EXIT
     END
@@ -44,9 +44,9 @@ BEGIN
         MENUITEM "&Fjern\tDEL",               ID_EDIT_CLEAR
         MENUITEM "&Marker alt\tCtrl+A",       ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
-        MENUITEM "&Søg efter ...\tCrtl+F",    ID_FIND
+        MENUITEM "&Søg efter...\tCrtl+F",     ID_FIND
         MENUITEM "Søg efter &næste\tF3",      ID_FIND_NEXT
-        MENUITEM "E&rstat ...\tCtrl+H",       ID_REPLACE
+        MENUITEM "E&rstat...\tCtrl+H",        ID_REPLACE
         MENUITEM SEPARATOR
         MENUITEM "S&krivebeskyttet",          ID_EDIT_READONLY
         MENUITEM "Æ&ndret",                   ID_EDIT_MODIFIED
@@ -67,18 +67,18 @@ BEGIN
         MENUITEM "&Lineal",                   ID_TOGGLE_RULER
         MENUITEM "&Statuslinie",              ID_TOGGLE_STATUSBAR
         MENUITEM SEPARATOR
-        MENUITEM "&Alternativer ...",         ID_VIEWPROPERTIES
+        MENUITEM "&Alternativer...",          ID_VIEWPROPERTIES
     END
     POPUP "&Indsæt"
     BEGIN
-        MENUITEM "&Dato og tid ...",          ID_DATETIME
+        MENUITEM "&Dato og tid...",           ID_DATETIME
     END
     POPUP "F&ormat"
     BEGIN
-        MENUITEM "&Skrifttype ...",           ID_FONTSETTINGS
+        MENUITEM "&Skrifttype...",            ID_FONTSETTINGS
         MENUITEM "&Bullets"                   ID_BULLET
-        MENUITEM "&Afsnit ..."                ID_PARAFORMAT
+        MENUITEM "&Afsnit..."                 ID_PARAFORMAT
-        MENUITEM "&Tabulatorer ..."           ID_TABSTOPS
+        MENUITEM "&Tabulatorer..."            ID_TABSTOPS
         POPUP "&Baggrund"
         BEGIN
             MENUITEM "&System\tCtrl+1",       ID_BACK_1
@@ -100,7 +100,7 @@ BEGIN
         MENUITEM "&Indsæt"              ID_EDIT_PASTE
         MENUITEM SEPARATOR
         MENUITEM "&Bullets"             ID_BULLET
-        MENUITEM "&Afsnit ..."          ID_PARAFORMAT
+        MENUITEM "&Afsnit..."           ID_PARAFORMAT
     END
 END
 
@@ -139,7 +139,7 @@ BEGIN
     LTEXT "Første linie", 0, 15, 58, 40, 13
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
     LTEXT "Justering", 0, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST
+    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
     PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
     PUSHBUTTON "&Annuller", IDCANCEL, 137, 33, 50, 15
 END

reactos/base/applications/wordpad/De.rc

@@ -139,7 +139,7 @@ BEGIN
     LTEXT "Erste Zeile", 0, 15, 58, 40, 13
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
     LTEXT "Ausrichtung", 0, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST
+    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
     PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
     PUSHBUTTON "A&bbrechen", IDCANCEL, 137, 33, 50, 15
 END

reactos/base/applications/wordpad/En.rc

@@ -139,7 +139,7 @@ BEGIN
     LTEXT "First line", 0, 15, 58, 40, 13
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
     LTEXT "Alignment", 0, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST
+    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
     PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
     PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
 END

reactos/base/applications/wordpad/Fr.rc

@@ -139,7 +139,7 @@ BEGIN
     LTEXT "First line", 0, 15, 58, 40, 13
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
     LTEXT "Alignment", 0, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST
+    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
     PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
     PUSHBUTTON "&Annuler", IDCANCEL, 137, 33, 50, 15
 END

reactos/base/applications/wordpad/Hu.rc

@@ -139,7 +139,7 @@ BEGIN
     LTEXT "First line", 0, 15, 58, 40, 13
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
     LTEXT "Alignment", 0, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST
+    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
     PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
     PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
 END

reactos/base/applications/wordpad/Ko.rc

@@ -141,7 +141,7 @@ BEGIN
     LTEXT "첫째 줄", 0, 15, 58, 40, 13
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
     LTEXT "정렬", 0, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST
+    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
     PUSHBUTTON "확인(&O)", IDOK, 137, 15, 50, 15
     PUSHBUTTON "취소(&C)", IDCANCEL, 137, 33, 50, 15
 END

reactos/base/applications/wordpad/Nl.rc

@@ -139,7 +139,7 @@ BEGIN
     LTEXT "First line", 0, 15, 58, 40, 13
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
     LTEXT "Alignment", 0, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST
+    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
     PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
     PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
 END

reactos/base/applications/wordpad/No.rc

@@ -139,7 +139,7 @@ BEGIN
     LTEXT "Første linje", 0, 15, 58, 40, 13
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
     LTEXT "Justering", 0, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST
+    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
     PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
     PUSHBUTTON "&Avbryt", IDCANCEL, 137, 33, 50, 15
 END

reactos/base/applications/wordpad/Pl.rc

@@ -140,7 +140,7 @@ BEGIN
     LTEXT "Pierwszy wiersz", 0, 15, 55, 40, 19
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
     LTEXT "Wyrównanie", 0, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST
+    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
     PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
     PUSHBUTTON "&Anuluj", IDCANCEL, 137, 33, 50, 15
 END

reactos/base/applications/wordpad/Ru.rc

@@ -139,7 +139,7 @@ BEGIN
     LTEXT "Ïåðâàÿ ñòðîêà", 0, 15, 58, 40, 13
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
     LTEXT "Âûðàâíèâàíèå", 0, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST
+    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
     PUSHBUTTON "&ÎÊ", IDOK, 137, 15, 50, 15
     PUSHBUTTON "Î&òìåíà", IDCANCEL, 137, 33, 50, 15
 END

reactos/base/applications/wordpad/Si.rc

@@ -141,7 +141,7 @@ BEGIN
     LTEXT "Prva vrstica", 0, 15, 58, 40, 13
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
     LTEXT "Poravnava", 0, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST
+    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
     PUSHBUTTON "&V redu", IDOK, 137, 15, 50, 15
     PUSHBUTTON "&Prekliči", IDCANCEL, 137, 33, 50, 15
 END

reactos/base/applications/wordpad/Tr.rc

@@ -141,7 +141,7 @@ BEGIN
     LTEXT "First line", 0, 15, 58, 40, 13
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
     LTEXT "Alignment", 0, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST
+    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
     PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
     PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
 END

reactos/base/applications/wordpad/registry.c

@@ -285,7 +285,7 @@ void registry_set_filelist(LPCWSTR newFile, HWND hMainWnd)
                 pFiles[0] = newFile;
             } else
             {
-                for(i = 0; pFiles[i] && i < FILELIST_ENTRIES-1; i++)
+                for(i = 0; i < FILELIST_ENTRIES-1; i++)
                     pFiles[FILELIST_ENTRIES-1-i] = pFiles[FILELIST_ENTRIES-2-i];
 
                 pFiles[0] = newFile;

reactos/base/applications/wordpad/wordpad.c

@@ -219,20 +219,22 @@ static void set_caption(LPCWSTR wszNewFileName)
 
 static BOOL validate_endptr(LPCSTR endptr, BOOL units)
 {
-    if(!endptr || !*endptr)
+    if(!endptr)
+        return FALSE;
+    if(!*endptr)
         return TRUE;
 
     while(*endptr == ' ')
         endptr++;
 
     if(!units)
-        return *endptr != '\0';
+        return *endptr == '\0';
 
     /* FIXME: Allow other units and convert between them */
     if(!lstrcmpA(endptr, units_cmA))
         endptr += 2;
 
-    return *endptr != '\0';
+    return *endptr == '\0';
 }
 
 static BOOL number_from_string(LPCWSTR string, float *num, BOOL units)
@@ -246,7 +248,7 @@ static BOOL number_from_string(LPCWSTR string, float *num, BOOL units)
     errno = 0;
     ret = strtod(buffer, &endptr);
 
-    if((ret == 0 && errno != 0) || endptr == buffer || validate_endptr(endptr, units))
+    if((ret == 0 && errno != 0) || endptr == buffer || !validate_endptr(endptr, units))
     {
         return FALSE;
     } else
@@ -267,6 +269,32 @@ static void set_size(float size)
     SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt);
 }
 
+static void on_sizelist_modified(HWND hwndSizeList, LPWSTR wszNewFontSize)
+{
+    WCHAR sizeBuffer[MAX_STRING_LEN];
+    CHARFORMAT2W format;
+
+    ZeroMemory(&format, sizeof(format));
+    format.cbSize = sizeof(format);
+    SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);
+
+    wsprintfW(sizeBuffer, stringFormat, format.yHeight / 20);
+    if(lstrcmpW(sizeBuffer, wszNewFontSize))
+    {
+        float size = 0;
+        if(number_from_string((LPCWSTR) wszNewFontSize, &size, FALSE)
+           && size > 0)
+        {
+            set_size(size);
+        } else
+        {
+            SetWindowTextW(hwndSizeList, sizeBuffer);
+            MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER),
+                        wszAppTitle, MB_OK | MB_ICONINFORMATION);
+        }
+    }
+}
+
 static void add_size(HWND hSizeListWnd, unsigned size)
 {
     WCHAR buffer[3];
@@ -439,6 +467,17 @@ static void set_default_font(void)
     SendMessageW(hEditorWnd, EM_SETCHARFORMAT,  SCF_DEFAULT, (LPARAM)&fmt);
 }
 
+static void on_fontlist_modified(HWND hwndFontList, LPWSTR wszNewFaceName)
+{
+    CHARFORMAT2W format;
+    ZeroMemory(&format, sizeof(format));
+    format.cbSize = sizeof(format);
+    SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);
+
+    if(lstrcmpW(format.szFaceName, wszNewFaceName))
+        set_font((LPCWSTR) wszNewFaceName);
+}
+
 static void add_font(LPCWSTR fontName, DWORD fontType, HWND hListWnd, NEWTEXTMETRICEXW *ntmc)
 {
     COMBOBOXEXITEMW cbItem;
@@ -1215,6 +1254,45 @@ static void number_with_units(LPWSTR buffer, int number)
     MultiByteToWideChar(CP_ACP, 0, string, -1, buffer, MAX_STRING_LEN);
 }
 
+static BOOL get_comboexlist_selection(HWND hComboEx, LPWSTR wszBuffer, UINT bufferLength)
+{
+    HANDLE hHeap;
+    COMBOBOXEXITEM cbItem;
+    COMBOBOXINFO cbInfo;
+    HWND hCombo, hList;
+    int idx, result;
+    char *szBuffer;
+    hCombo = (HWND)SendMessage(hComboEx, CBEM_GETCOMBOCONTROL, 0, 0);
+    if (!hCombo)
+        return FALSE;
+    cbInfo.cbSize = sizeof(COMBOBOXINFO);
+    result = SendMessage(hCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbInfo);
+    if (!result)
+        return FALSE;
+    hList = cbInfo.hwndList;
+    idx = SendMessage(hList, LB_GETCURSEL, 0, 0);
+    if (idx < 0)
+        return FALSE;
+
+    hHeap = GetProcessHeap();
+    szBuffer = HeapAlloc(hHeap, HEAP_ZERO_MEMORY, bufferLength);
+    ZeroMemory(&cbItem, sizeof(cbItem));
+    cbItem.mask = CBEIF_TEXT;
+    cbItem.iItem = idx;
+    cbItem.pszText = szBuffer;
+    cbItem.cchTextMax = bufferLength-1;
+    result = SendMessage(hComboEx, CBEM_GETITEM, 0, (LPARAM)&cbItem);
+    if (!result)
+    {
+        HeapFree(hHeap, 0, szBuffer);
+        return FALSE;
+    }
+
+    result = MultiByteToWideChar(CP_ACP, 0, szBuffer, -1, wszBuffer, bufferLength);
+    HeapFree(hHeap, 0, szBuffer);
+    return result != 0;
+}
+
 static INT_PTR CALLBACK datetime_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
     switch(message)
@@ -1311,6 +1389,8 @@ static INT_PTR CALLBACK newfile_proc(HWND hWnd, UINT message, WPARAM wParam, LPA
 
 static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
+    static const WORD ALIGNMENT_VALUES[] = {PFA_LEFT, PFA_RIGHT, PFA_CENTER};
+
     switch(message)
     {
         case WM_INITDIALOG:
@@ -1337,7 +1417,7 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam,
 
                 pf.cbSize = sizeof(pf);
                 pf.dwMask = PFM_ALIGNMENT | PFM_OFFSET | PFM_RIGHTINDENT |
-                            PFM_OFFSETINDENT;
+                            PFM_STARTINDENT;
                 SendMessageW(hEditorWnd, EM_GETPARAFORMAT, 0, (LPARAM)&pf);
 
                 if(pf.wAlignment == PFA_RIGHT)
@@ -1347,11 +1427,11 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam,
 
                 SendMessageW(hListWnd, CB_SETCURSEL, index, 0);
 
-                number_with_units(buffer, pf.dxOffset);
+                number_with_units(buffer, pf.dxStartIndent + pf.dxOffset);
                 SetWindowTextW(hLeftWnd, buffer);
                 number_with_units(buffer, pf.dxRightIndent);
                 SetWindowTextW(hRightWnd, buffer);
-                number_with_units(buffer, pf.dxStartIndent - pf.dxOffset);
+                number_with_units(buffer, -pf.dxOffset);
                 SetWindowTextW(hFirstWnd, buffer);
             }
             break;
@@ -1361,14 +1441,19 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam,
             {
                 case IDOK:
                     {
+                        HWND hListWnd = GetDlgItem(hWnd, IDC_PARA_ALIGN);
                         HWND hLeftWnd = GetDlgItem(hWnd, IDC_PARA_LEFT);
                         HWND hRightWnd = GetDlgItem(hWnd, IDC_PARA_RIGHT);
                         HWND hFirstWnd = GetDlgItem(hWnd, IDC_PARA_FIRST);
                         WCHAR buffer[MAX_STRING_LEN];
+                        int index;
                         float num;
                         int ret = 0;
                         PARAFORMAT pf;
 
+                        index = SendMessageW(hListWnd, CB_GETCURSEL, 0, 0);
+                        pf.wAlignment = ALIGNMENT_VALUES[index];
+
                         GetWindowTextW(hLeftWnd, buffer, MAX_STRING_LEN);
                         if(number_from_string(buffer, &num, TRUE))
                             ret++;
@@ -1389,9 +1474,31 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam,
                             return FALSE;
                         } else
                         {
+                            if (pf.dxOffset + pf.dxStartIndent < 0
+                                && pf.dxStartIndent < 0)
+                            {
+                                /* The first line is before the left edge, so
+                                 * make sure it is at the left edge. */
+                                pf.dxOffset = -pf.dxStartIndent;
+                            } else if (pf.dxOffset < 0) {
+                                /* The second and following lines are before
+                                 * the left edge, so set it to be at the left
+                                 * edge, and adjust the first line since it
+                                 * is relative to it. */
+                                pf.dxStartIndent = max(pf.dxStartIndent + pf.dxOffset, 0);
+                                pf.dxOffset = 0;
+                            }
+                            /* Internally the dxStartIndent is the absolute
+                             * offset for the first line and dxOffset is
+                             * to it value as opposed how it is displayed with
+                             * the first line being the relative value.
+                             * These two lines make the adjustments. */
                             pf.dxStartIndent = pf.dxStartIndent + pf.dxOffset;
+                            pf.dxOffset = pf.dxOffset - pf.dxStartIndent;
+
                             pf.cbSize = sizeof(pf);
-                            pf.dwMask = PFM_OFFSET | PFM_OFFSETINDENT | PFM_RIGHTINDENT;
+                            pf.dwMask = PFM_ALIGNMENT | PFM_OFFSET | PFM_RIGHTINDENT |
+                                        PFM_STARTINDENT;
                             SendMessageW(hEditorWnd, EM_SETPARAFORMAT, 0, (LPARAM)&pf);
                         }
                     }
@@ -1682,7 +1789,8 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam)
     }
 
     hEditorWnd = CreateWindowExW(WS_EX_CLIENTEDGE, wszRichEditClass, NULL,
-      WS_CHILD|WS_VISIBLE|ECO_SELECTIONBAR|ES_MULTILINE|ES_AUTOVSCROLL|ES_WANTRETURN|WS_VSCROLL,
+      WS_CHILD|WS_VISIBLE|ES_SELECTIONBAR|ES_MULTILINE|ES_AUTOVSCROLL
+      |ES_WANTRETURN|WS_VSCROLL|ES_NOHIDESEL,
       0, 0, 1000, 100, hWnd, (HMENU)IDC_EDITOR, hInstance, NULL);
 
     if (!hEditorWnd)
@@ -1771,38 +1879,18 @@ static LRESULT OnNotify( HWND hWnd, WPARAM wParam, LPARAM lParam)
     NMHDR *pHdr = (NMHDR *)lParam;
     HWND hwndFontList = GetDlgItem(hwndReBar, IDC_FONTLIST);
     HWND hwndSizeList = GetDlgItem(hwndReBar, IDC_SIZELIST);
-    WCHAR sizeBuffer[MAX_PATH];
 
     if (pHdr->hwndFrom == hwndFontList || pHdr->hwndFrom == hwndSizeList)
     {
         if (pHdr->code == CBEN_ENDEDITW)
         {
-            CHARFORMAT2W format;
             NMCBEENDEDIT *endEdit = (NMCBEENDEDIT *)lParam;
-
-            ZeroMemory(&format, sizeof(format));
-            format.cbSize = sizeof(format);
-            SendMessageW(hwndEditor, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&format);
-
             if(pHdr->hwndFrom == hwndFontList)
             {
-                if(lstrcmpW(format.szFaceName, (LPWSTR)endEdit->szText))
+                on_fontlist_modified(hwndFontList, (LPWSTR)endEdit->szText);
-                    set_font((LPCWSTR) endEdit->szText);
             } else if (pHdr->hwndFrom == hwndSizeList)
             {
-                wsprintfW(sizeBuffer, stringFormat, format.yHeight / 20);
+                on_sizelist_modified(hwndSizeList, (LPWSTR)endEdit->szText);
-                if(lstrcmpW(sizeBuffer, (LPWSTR)endEdit->szText))
-                {
-                    float size = 0;
-                    if(number_from_string((LPWSTR)endEdit->szText, &size, FALSE))
-                    {
-                        set_size(size);
-                    } else
-                    {
-                        SetWindowTextW(hwndSizeList, sizeBuffer);
-                        MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), wszAppTitle, MB_OK | MB_ICONINFORMATION);
-                    }
-                }
             }
         }
         return 0;
@@ -2190,6 +2278,26 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
         dialog_viewproperties();
         break;
 
+    case IDC_FONTLIST:
+        if (HIWORD(wParam) == CBN_SELENDOK)
+        {
+            WCHAR buffer[LF_FACESIZE];
+            HWND hwndFontList = (HWND)lParam;
+            get_comboexlist_selection(hwndFontList, buffer, LF_FACESIZE);
+            on_fontlist_modified(hwndFontList, buffer);
+        }
+        break;
+
+    case IDC_SIZELIST:
+        if (HIWORD(wParam) == CBN_SELENDOK)
+        {
+            WCHAR buffer[MAX_STRING_LEN+1];
+            HWND hwndSizeList = (HWND)lParam;
+            get_comboexlist_selection(hwndSizeList, buffer, MAX_STRING_LEN+1);
+            on_sizelist_modified(hwndSizeList, buffer);
+        }
+        break;
+
     default:
         SendMessageW(hwndEditor, WM_COMMAND, wParam, lParam);
         break;