diff --git a/reactos/base/applications/cmdutils/xcopy/Bg.rc b/reactos/base/applications/cmdutils/xcopy/Bg.rc
index d62a20a104f..e8501bb701b 100644
--- a/reactos/base/applications/cmdutils/xcopy/Bg.rc
+++ b/reactos/base/applications/cmdutils/xcopy/Bg.rc
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/base/applications/cmdutils/xcopy/Da.rc b/reactos/base/applications/cmdutils/xcopy/Da.rc
index 239b3a71d63..1e5a4403dd5 100644
--- a/reactos/base/applications/cmdutils/xcopy/Da.rc
+++ b/reactos/base/applications/cmdutils/xcopy/Da.rc
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/base/applications/cmdutils/xcopy/De.rc b/reactos/base/applications/cmdutils/xcopy/De.rc
index 1af64183b49..966352e9cf1 100644
--- a/reactos/base/applications/cmdutils/xcopy/De.rc
+++ b/reactos/base/applications/cmdutils/xcopy/De.rc
@@ -1,4 +1,4 @@
-/*
+/*
  * XCOPY - Wine-compatible xcopy program
  * German language support
  *
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
@@ -27,16 +28,16 @@ STRINGTABLE
 {
     STRING_INVPARMS, "Falsche Parameteranzahl -  xcopy /? zeigt Hilfe an\n"
     STRING_INVPARM,  "Unbekannter Parameter '%s' - xcopy /? zeigt Hilfe an\n"
-    STRING_PAUSE,    "Eingabetaste bet�tigen, um mit dem Kopieren zu beginnen\n"
-    STRING_SIMCOPY,  "%d Datei(en) w�rden kopiert\n"
+    STRING_PAUSE,    "Eingabetaste betätigen, um mit dem Kopieren zu beginnen\n"
+    STRING_SIMCOPY,  "%d Datei(en) würden kopiert\n"
     STRING_COPY,     "%d Datei(en) kopiert\n"
     STRING_QISDIR,   "Ist '%s' eine Datei oder ein Verzeichnis\n" \
                      "am Zielsort?\n" \
                      "(D - Datei, V - Verzeichnis)\n"
     STRING_SRCPROMPT,"%s? (Ja|Nein)\n"
-    STRING_OVERWRITE,"%s �berschreiben? (Ja|Nein|Alle)\n"
+    STRING_OVERWRITE,"%s überschreiben? (Ja|Nein|Alle)\n"
     STRING_COPYFAIL, "Kopieren von '%s' nach '%s' fehlgeschlagen. Fehlernummer: %d\n"
-    STRING_OPENFAIL, "Fehler beim �ffnen von '%s'\n"
+    STRING_OPENFAIL, "Fehler beim Öffnen von '%s'\n"
     STRING_READFAIL, "Fehler beim Lesen von '%s'\n"
     STRING_YES_CHAR, "J"
     STRING_NO_CHAR,  "N"
@@ -58,20 +59,20 @@ Mit:\n\
 [/S]  Kopiere Verzeichnisse und Unterverzeichnisse\n\
 [/E]  Kopiere Verzeichnisse und Unterverzeichnisse, auch leere\n\
 [/Q]  Zeige die Dateinamen beim Kopieren nicht an\n\
-[/F]  Zeige vollst�ndige Dateinamen von Quelle und Ziel an\n\
-[/L]  Simulation: Zeige die Namen der Datein, die kopiert w�rden\n\
-[/W]  Wartet vor Beginn des Kopierens auf Best�tigung\n\
+[/F]  Zeige vollständige Dateinamen von Quelle und Ziel an\n\
+[/L]  Simulation: Zeige die Namen der Datein, die kopiert würden\n\
+[/W]  Wartet vor Beginn des Kopierens auf Bestätigung\n\
 [/T]  Erzeuge eine leere Verzeichnisstruktur, ohne Dateien zu kopieren\n\
-[/Y]  Keine Nachfrage vor dem �berschreiben von Dateien\n\
-[/-Y] Nachrage vor dem �berschreiben von Dateien\n\
-[/P]  Fragt f�r jede Quelldatei, ob sie kopiert werden soll\n\
+[/Y]  Keine Nachfrage vor dem Überschreiben von Dateien\n\
+[/-Y] Nachrage vor dem Überschreiben von Dateien\n\
+[/P]  Fragt für jede Quelldatei, ob sie kopiert werden soll\n\
 [/N]  Kopiert die Dateien unter ihrem Kurznamen\n\
 [/U]  Kopiert nur Dateien, die am Ziel bereits existieren\n\
-[/R]  �berschreibt schreibgesch�tzte Dateien\n\
+[/R]  Überschreibt schreibgeschützte Dateien\n\
 [/H]  Kopiere auch versteckte und Systemdateien\n\
 [/C]  Nach Fehlern den Kopiervorgang fortsetzen\n\
 [/A]  Nur Dateien mit Archivbit kopieren\n\
-[/M]  Nur Dateien mit Archivbit kopieren, danach Archivbit l�schen\n\
+[/M]  Nur Dateien mit Archivbit kopieren, danach Archivbit löschen\n\
 [/D | /D:m-d-y] Kopiere neue Dateien und Dateien, die neuer als das\n\
 \t\tangegebene Datum sind. Wird kein Datum angegegebn, werden nur\n\
 \t\tQuelldateien kopiert, die neuer sind als die Zieldatei\n\n"
diff --git a/reactos/base/applications/cmdutils/xcopy/El.rc b/reactos/base/applications/cmdutils/xcopy/El.rc
index df56a069945..e2787ad22b2 100644
--- a/reactos/base/applications/cmdutils/xcopy/El.rc
+++ b/reactos/base/applications/cmdutils/xcopy/El.rc
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/base/applications/cmdutils/xcopy/En.rc b/reactos/base/applications/cmdutils/xcopy/En.rc
index 33324ac9f4e..b988004b7ec 100644
--- a/reactos/base/applications/cmdutils/xcopy/En.rc
+++ b/reactos/base/applications/cmdutils/xcopy/En.rc
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/base/applications/cmdutils/xcopy/Fr.rc b/reactos/base/applications/cmdutils/xcopy/Fr.rc
index 7fe8f691cb4..333b8f5cf13 100644
--- a/reactos/base/applications/cmdutils/xcopy/Fr.rc
+++ b/reactos/base/applications/cmdutils/xcopy/Fr.rc
@@ -1,4 +1,4 @@
-/*
+/*
  * XCOPY - Wine-compatible xcopy program
  * French language support
  *
@@ -18,6 +18,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
 #pragma code_page(65001)
 
 
@@ -30,12 +31,12 @@ STRINGTABLE
     STRING_PAUSE,    "Appuyez sur ENTRÉE pour démarrer la copie\n"
     STRING_SIMCOPY,  "%d fichier(s) seront copiés\n"
     STRING_COPY,     "%d fichier(s) copiés\n"
-    STRING_QISDIR,   "Est-ce que « %s » est un fichier ou un répertoire\n" \
+    STRING_QISDIR,   "« %s » est-il un fichier ou un répertoire\n" \
                      "dans la destination ?\n" \
                      "(F - Fichier, R - Répertoire)\n"
     STRING_SRCPROMPT,"%s ? (Oui|Non)\n"
     STRING_OVERWRITE,"Écraser  %s ? (Oui|Non|Tous)\n"
-    STRING_COPYFAIL, "La copie de « %s » vers « %s » a échoué avec le c/r %d\n"
+    STRING_COPYFAIL, "La copie de « %s » vers « %s » a échoué avec le code de retour %d\n"
     STRING_OPENFAIL, "Impossible d'ouvrir « %s »\n"
     STRING_READFAIL, "Impossible de lire « %s »\n"
     STRING_YES_CHAR, "O"
@@ -45,38 +46,36 @@ STRINGTABLE
     STRING_DIR_CHAR, "R"
 
     STRING_HELP,
-"XCOPY - Copie les fichiers ou répertoires source vers une destination\n\
+"XCOPY - Copie les fichiers ou répertoires sources vers une destination\n\
 \n\
 Syntaxe :\n\
-XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
+XCOPY source [destination] [/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\
+où :\n\
 \n\
 [/I]  Suppose que la destination est un répertoire si elle n'existe pas et que l'on copie plus\n\
 \td'un fichier\n\
 [/S]  Copie les répertoires et sous-répertoires\n\
 [/E]  Copie les répertoires et sous-répertoires, y compris ceux qui sont vides\n\
 [/Q]  Ne pas afficher la liste des fichiers copiés (mode silencieux)\n\
-[/F]  Afficher la source et la destination complète lors de la copie\n\
-[/L]  Simuler l'opération, en montrant le nom des fichiers qui auraient été copiés\n\
+[/F]  Afficher les source et destination complètes lors de la copie\n\
+[/L]  Simuler la copie, en montrant le nom des fichiers qui seraient copiés\n\
 [/W]  Demande avant de démarrer la copie\n\
-[/T]  Créer une structure de répertoires vides, mais ne copie pas les fichiers\n\
+[/T]  Créer une structure de répertoires vides, mais ne pas copier les fichiers\n\
 [/Y]  Ne demande pas de confirmation lors de l'écrasement des fichiers\n\
 [/-Y] Demande une confirmation lors de l'écrasement des fichiers\n\
-[/P]  Demande avant de copier chaque fichier source\n\
-[/N]  Copie en utilisant des noms courts\n\
+[/P]  Interroge l'utilisateur avant de copier chaque fichier source\n\
+[/N]  Copie en utilisant les noms courts\n\
 [/U]  Copie uniquement les fichiers qui existent déjà dans la destination\n\
 [/R]  Écrase même les fichiers en lecture seule\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\
+[/D | /D:m-d-y] Copie uniquement les nouveaux fichiers, 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 ancien\n\
 \t\tque le fichier source\n\n"
 
 }
-
-#pragma code_page(default)
diff --git a/reactos/base/applications/cmdutils/xcopy/It.rc b/reactos/base/applications/cmdutils/xcopy/It.rc
index f1487bf891a..4e3bc322964 100644
--- a/reactos/base/applications/cmdutils/xcopy/It.rc
+++ b/reactos/base/applications/cmdutils/xcopy/It.rc
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/reactos/base/applications/cmdutils/xcopy/Ko.rc b/reactos/base/applications/cmdutils/xcopy/Ko.rc
index a3a89f99e24..ab70c35ae32 100644
--- a/reactos/base/applications/cmdutils/xcopy/Ko.rc
+++ b/reactos/base/applications/cmdutils/xcopy/Ko.rc
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/base/applications/cmdutils/xcopy/Lt.rc b/reactos/base/applications/cmdutils/xcopy/Lt.rc
new file mode 100644
index 00000000000..7a8a6770899
--- /dev/null
+++ b/reactos/base/applications/cmdutils/xcopy/Lt.rc
@@ -0,0 +1,81 @@
+/*
+ * XCOPY - Wine-compatible xcopy program
+ * Lithuanian language support
+ *
+ * Copyright 2009 Aurimas Fišeras <aurimas@gmail.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
+ */
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    STRING_INVPARMS, "Neteisingas parametrų skaičius - pagalba: xcopy /?\n"
+    STRING_INVPARM,  "Neteisingas parametras '%s' - pagalba: xcopy /?\n"
+    STRING_PAUSE,    "Spauskite <enter> kopijavimui pradėti\n"
+    STRING_SIMCOPY,  "bus nukopijuota failų: %d\n"
+    STRING_COPY,     "nukopijuota failų: %d\n"
+    STRING_QISDIR,   "Ar '%s' yra failas, ar katalogas,\n" \
+                     "ar paskirtis?\n" \
+                     "(F - failas, K - katalogas)\n"
+    STRING_SRCPROMPT,"%s? (Taip|Ne)\n"
+    STRING_OVERWRITE,"Perrašyti %s? (Taip|Ne|Visus)\n"
+    STRING_COPYFAIL, "'%s' kopijavimas į '%s' nepavyko su r/c %d\n"
+    STRING_OPENFAIL, "Nepavyko atverti '%s'\n"
+    STRING_READFAIL, "Klaida skaitant '%s'\n"
+    STRING_YES_CHAR, "T"
+    STRING_NO_CHAR,  "N"
+    STRING_ALL_CHAR, "V"
+    STRING_FILE_CHAR,"F"
+    STRING_DIR_CHAR, "K"
+
+    STRING_HELP,
+"XCOPY - Kopijuoja šaltinio failus ir katalogų medžius į paskirties vietą\n\
+\n\
+Sintaksė:\n\
+XCOPY šaltinis [paskirtis] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
+\t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
+\n\
+Kur:\n\
+\n\
+[/I]  Tarti, kad katalogas, jei paskirtis neegzistuoja ir kopijuojami\n\
+\t2 ar daugiau failų\n\
+[/S]  Kopijuoti katalogus ir pakatalogius\n\
+[/E]  Kopijuoti katalogus ir pakatalogius, taip pat ir tuščius\n\
+[/Q]  Kopijuojant nerodyti vardų, kopijuoti tyliai.\n\
+[/F]  Kopijuojant rodyti pilnus šaltinio ir paskirties vardus\n\
+[/L]  Modeliuoti veikimą rodant failus, kurie būtų kopijuojami\n\
+[/W]  Raginti prieš pradedant kopijavimo operaciją\n\
+[/T]  Sukuria tuščią katalogų struktūrą, bet nekopijuoja jokių failų\n\
+[/Y]  Nerodyti raginimų, kai perrašomi failai\n\
+[/-Y] Įjungti raginimus, kai perrašomi failai\n\
+[/P]  Ragina prieš kopijuojant kiekvieną šaltinio failą\n\
+[/N]  Kopijuoti naudojant trumpus vardus\n\
+[/U]  Kopijuoti tik tuos failus, kurie jau egzistuoja paskirties vietoje\n\
+[/R]  Perrašyti visus nekeičiamus failus\n\
+[/H]  Kopijuoti paslėptus ir sisteminius failus\n\
+[/C]  Tęsti, net jei įvyksta klaida kopijuojant\n\
+[/A]  Kopijuoti tik failus su nustatytu archyvavimo požymiu\n\
+[/M]  Kopijuoti tik failus su nustatytu archyvavimo požymiu, pašalinti\n\
+\tarchyvavimo požymį\n\
+[/D | /D:m-d-y] Kopijuoti naujus failus arba modifikuotos po nurodytos datos.\n\
+\t\tJei data nenurodyta, kopijuoti tik jei paskirties failas yra\n\
+\t\tsenesnis už šaltinio failą\n\n"
+
+}
diff --git a/reactos/base/applications/cmdutils/xcopy/Nl.rc b/reactos/base/applications/cmdutils/xcopy/Nl.rc
index f994cdd8f7e..bd1d946112b 100644
--- a/reactos/base/applications/cmdutils/xcopy/Nl.rc
+++ b/reactos/base/applications/cmdutils/xcopy/Nl.rc
@@ -1,4 +1,4 @@
-/*
+/*
  * XCOPY - Wine-compatible xcopy program
  * Dutch language support
  *
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/reactos/base/applications/cmdutils/xcopy/No.rc b/reactos/base/applications/cmdutils/xcopy/No.rc
index ddcccf78fef..9b501ba13cf 100644
--- a/reactos/base/applications/cmdutils/xcopy/No.rc
+++ b/reactos/base/applications/cmdutils/xcopy/No.rc
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE
diff --git a/reactos/base/applications/cmdutils/xcopy/Pl.rc b/reactos/base/applications/cmdutils/xcopy/Pl.rc
index 3d094a933ed..9d711380858 100644
--- a/reactos/base/applications/cmdutils/xcopy/Pl.rc
+++ b/reactos/base/applications/cmdutils/xcopy/Pl.rc
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/base/applications/cmdutils/xcopy/Pt.rc b/reactos/base/applications/cmdutils/xcopy/Pt.rc
index 47e9609bd7f..a5a775a617b 100644
--- a/reactos/base/applications/cmdutils/xcopy/Pt.rc
+++ b/reactos/base/applications/cmdutils/xcopy/Pt.rc
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/reactos/base/applications/cmdutils/xcopy/Ru.rc b/reactos/base/applications/cmdutils/xcopy/Ru.rc
index 1d86ff46f8c..a3f2cbb49e7 100644
--- a/reactos/base/applications/cmdutils/xcopy/Ru.rc
+++ b/reactos/base/applications/cmdutils/xcopy/Ru.rc
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/base/applications/cmdutils/xcopy/Si.rc b/reactos/base/applications/cmdutils/xcopy/Si.rc
index 092282c1636..1a0020654e3 100644
--- a/reactos/base/applications/cmdutils/xcopy/Si.rc
+++ b/reactos/base/applications/cmdutils/xcopy/Si.rc
@@ -1,4 +1,4 @@
-/*
+/*
  * XCOPY - Wine-compatible xcopy program
  * Slovenian language support
  *
@@ -78,5 +78,3 @@ Where:\n\
 \t\tod izvora\n\n"
 
 }
-
-#pragma code_page(default)
diff --git a/reactos/base/applications/cmdutils/xcopy/rsrc.rc b/reactos/base/applications/cmdutils/xcopy/rsrc.rc
index a62f34cf19a..533ba3b3e61 100644
--- a/reactos/base/applications/cmdutils/xcopy/rsrc.rc
+++ b/reactos/base/applications/cmdutils/xcopy/rsrc.rc
@@ -30,6 +30,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "Fr.rc"
 #include "It.rc"
 #include "Ko.rc"
+#include "Lt.rc"
 #include "Nl.rc"
 #include "No.rc"
 #include "Pl.rc"
diff --git a/reactos/base/applications/cmdutils/xcopy/xcopy.h b/reactos/base/applications/cmdutils/xcopy/xcopy.h
index ee4bd910cde..1c933951284 100644
--- a/reactos/base/applications/cmdutils/xcopy/xcopy.h
+++ b/reactos/base/applications/cmdutils/xcopy/xcopy.h
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+
 /* Local #defines */
 #define RC_OK         0
 #define RC_NOFILES    1
diff --git a/reactos/base/applications/winhlp32/lang/de-DE.rc b/reactos/base/applications/winhlp32/lang/de-DE.rc
index c8ee650ccca..2f5bf4b9595 100644
--- a/reactos/base/applications/winhlp32/lang/de-DE.rc
+++ b/reactos/base/applications/winhlp32/lang/de-DE.rc
@@ -1,4 +1,4 @@
-/*
+/*
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
@@ -19,12 +19,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma code_page(65001)
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 {
  POPUP "&Datei" {
-  MENUITEM "�&ffnen...", MNID_FILE_OPEN
+  MENUITEM "Ö&ffnen...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "Thema &drucken", MNID_FILE_PRINT
   MENUITEM "Drucker&einrichtung...", MNID_FILE_SETUP
@@ -61,7 +63,7 @@ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
    MENUITEM SEPARATOR
    MENUITEM "&Info...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&�ber WINE", MNID_HELP_WINE
+   MENUITEM "&Über WINE", MNID_HELP_WINE
 #endif
  }
 }
@@ -94,7 +96,7 @@ STID_NOT_IMPLEMENTED, 	"Nicht implementiert"
 STID_HLPFILE_ERROR_s, 	"Fehler beim Lesen der Hilfe-Datei `%s'"
 STID_INDEX, 		"&Inhalt"
 STID_CONTENTS,		"Summary"
-STID_BACK, 		"&Zur�ck"
+STID_BACK, 		"&Zurück"
 STID_ALL_FILES, 	"Alle Dateien (*.*)"
 STID_HELP_FILES_HLP, 	"Hilfe-Dateien (*.hlp)"
 STID_FILE_NOT_FOUND_s	"'%s' konnte nicht gefunden werden. Wollen Sie selber nach dieser Datei suchen?"
@@ -109,11 +111,11 @@ BEGIN
 MENUITEM "Anmerken...",       MNID_CTXT_ANNOTATE
 MENUITEM "Kopieren",                MNID_CTXT_COPY
 MENUITEM "Drucken...",            MNID_CTXT_PRINT
-POPUP    "Schriftgr��e"
+POPUP    "Schriftgröße"
 BEGIN
 MENUITEM "Klein",       MNID_CTXT_FONTS_SMALL
 MENUITEM "Normal",      MNID_CTXT_FONTS_NORMAL
-MENUITEM "Gro�",       MNID_CTXT_FONTS_LARGE
+MENUITEM "Groß",       MNID_CTXT_FONTS_LARGE
 END
 POPUP   "Hilfe immer sichtbar"
 BEGIN
diff --git a/reactos/base/applications/winhlp32/lang/en-US.rc b/reactos/base/applications/winhlp32/lang/en-US.rc
index 2a11e1a33c2..b730566b526 100644
--- a/reactos/base/applications/winhlp32/lang/en-US.rc
+++ b/reactos/base/applications/winhlp32/lang/en-US.rc
@@ -66,6 +66,51 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
  }
 }
 
+MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+{
+ POPUP "&File" {
+  MENUITEM "&Open", MNID_FILE_OPEN
+  MENUITEM SEPARATOR
+  MENUITEM "&Print", MNID_FILE_PRINT
+  MENUITEM "Printer &setup...", MNID_FILE_SETUP
+   MENUITEM SEPARATOR
+  MENUITEM "E&xit", MNID_FILE_EXIT
+ }
+ POPUP "&Edit" {
+   MENUITEM "&Copy...", MNID_EDIT_COPYDLG
+   MENUITEM SEPARATOR
+   MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE
+ }
+ 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 colours",	MNID_OPTS_SYSTEM_COLORS
+ }
+ POPUP "&Help" {
+   MENUITEM "Help &on help", MNID_HELP_HELPON
+   MENUITEM "Always on &top", MNID_HELP_HELPTOP
+   MENUITEM SEPARATOR
+   MENUITEM "&Info...", MNID_HELP_ABOUT
+#ifdef WINELIB
+   MENUITEM "&About Wine", MNID_HELP_WINE
+#endif
+ }
+}
+
 IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
@@ -123,3 +168,26 @@ BEGIN
 		MENUITEM "Use system colors",   MNID_CTXT_SYSTEM_COLORS
 	END
 END
+
+CONTEXT_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+BEGIN
+	POPUP ""
+	BEGIN
+		MENUITEM "Annotation...",       MNID_CTXT_ANNOTATE
+		MENUITEM "Copy",                MNID_CTXT_COPY
+		MENUITEM "Print...",            MNID_CTXT_PRINT
+		POPUP    "Fonts"
+		BEGIN
+			MENUITEM "Small",       MNID_CTXT_FONTS_SMALL
+			MENUITEM "Normal",      MNID_CTXT_FONTS_NORMAL
+			MENUITEM "Large",       MNID_CTXT_FONTS_LARGE
+		END
+		POPUP   "Help always visible"
+		BEGIN
+			MENUITEM "Default",     MNID_CTXT_HELP_DEFAULT
+			MENUITEM "Visible",     MNID_CTXT_HELP_VISIBLE
+			MENUITEM "Non visible", MNID_CTXT_HELP_NONVISIBLE
+		END
+		MENUITEM "Use system colours",   MNID_CTXT_SYSTEM_COLORS
+	END
+END
diff --git a/reactos/base/applications/winhlp32/lang/fr-FR.rc b/reactos/base/applications/winhlp32/lang/fr-FR.rc
index 0c5eea63f12..4bbfca6d10b 100644
--- a/reactos/base/applications/winhlp32/lang/fr-FR.rc
+++ b/reactos/base/applications/winhlp32/lang/fr-FR.rc
@@ -1,4 +1,4 @@
-/*
+/*
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+/* UTF-8 */
+#pragma code_page(65001)
+
 /* Menu */
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
@@ -34,18 +37,18 @@ MAIN_MENU MENU
    MENUITEM SEPARATOR
   MENUITEM "&Quitter", MNID_FILE_EXIT
  }
- POPUP "�&dition" {
+ POPUP "É&dition" {
    MENUITEM "&Copier...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Annotation...", MNID_EDIT_ANNOTATE
+   MENUITEM "&Annoter...", MNID_EDIT_ANNOTATE
  }
- POPUP "&Signet" {
-   MENUITEM "&D�finir...", MNID_BKMK_DEFINE
+ POPUP "&Signets" {
+   MENUITEM "&Définir...", MNID_BKMK_DEFINE
  }
  POPUP "&Options" {
    POPUP	"Aide toujours visible"
    BEGIN
-     MENUITEM "Par d�faut",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Par défaut",	MNID_OPTS_HELP_DEFAULT
      MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
      MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
   END
@@ -56,7 +59,7 @@ MAIN_MENU MENU
     MENUITEM "Normale",    	MNID_OPTS_FONTS_NORMAL
     MENUITEM "Grande",     	MNID_OPTS_FONTS_LARGE
   END
-  MENUITEM "Utiliser les couleurs syst�me", MNID_OPTS_SYSTEM_COLORS
+  MENUITEM "Utiliser les couleurs système", MNID_OPTS_SYSTEM_COLORS
 }
  POPUP "Aid&e" {
    MENUITEM "&Utiliser l'aide", MNID_HELP_HELPON
@@ -64,7 +67,7 @@ MAIN_MENU MENU
    MENUITEM SEPARATOR
    MENUITEM "&Info...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "� &propos de Wine", MNID_HELP_WINE
+   MENUITEM "À &propos de Wine", MNID_HELP_WINE
 #endif
  }
 }
@@ -82,7 +85,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Recherche"
 {
-    LTEXT  "Pas encore impl�ment�", -1, 10, 10, 180, 150
+    LTEXT  "Pas encore implémenté", -1, 10, 10, 180, 150
 }
 
 /* Strings */
@@ -92,15 +95,15 @@ STID_WINE_HELP, 	"Aide de Wine"
 STID_WHERROR, 		"ERREUR"
 STID_WARNING,  		"ATTENTION"
 STID_INFO,  		"Information"
-STID_NOT_IMPLEMENTED, 	"Non impl�ment�"
-STID_HLPFILE_ERROR_s, 	"Une erreur est survenue en lisant le fichier d'aide ��%s��"
+STID_NOT_IMPLEMENTED, 	"Non implémenté"
+STID_HLPFILE_ERROR_s, 	"Une erreur est survenue en lisant le fichier d'aide « %s »"
 STID_INDEX, 		"&Index"
 STID_CONTENTS,		"Sommaire"
-STID_BACK, 		"&Pr�c�dent"
-STID_ALL_FILES, 	"Tous fichiers (*.*)"
+STID_BACK, 		"&Précédent"
+STID_ALL_FILES, 	"Tous les fichiers (*.*)"
 STID_HELP_FILES_HLP, 	"Fichiers d'aide (*.hlp)"
-STID_FILE_NOT_FOUND_s	"Impossible de trouver ��%s��. Souhaitez-vous rechercher ce fichier vous-m�me�?"
-STID_NO_RICHEDIT	"La biblioth�que RichEdit n'a pu �tre localis�e... Abandon"
+STID_FILE_NOT_FOUND_s	"Impossible de trouver « %s ». Souhaitez-vous rechercher ce fichier vous-même ?"
+STID_NO_RICHEDIT	"La bibliothèque RichEdit n'a pu être localisée... Abandon"
 STID_PSH_INDEX,		"Rubriques d'aide : "
 }
 
@@ -119,10 +122,10 @@ BEGIN
 		END
 		POPUP   "Aide toujours visible"
 		BEGIN
-			MENUITEM "Par d�faut",  MNID_CTXT_HELP_DEFAULT
+			MENUITEM "Par défaut",  MNID_CTXT_HELP_DEFAULT
 			MENUITEM "Visible",     MNID_CTXT_HELP_VISIBLE
 			MENUITEM "Non visible", MNID_CTXT_HELP_NONVISIBLE
 		END
-		MENUITEM "Utiliser les couleurs syst�me", MNID_CTXT_SYSTEM_COLORS
+		MENUITEM "Utiliser les couleurs système", MNID_CTXT_SYSTEM_COLORS
 	END
 END
diff --git a/reactos/base/applications/winhlp32/lang/it-IT.rc b/reactos/base/applications/winhlp32/lang/it-IT.rc
index 70c158780e9..3db6faf23fe 100644
--- a/reactos/base/applications/winhlp32/lang/it-IT.rc
+++ b/reactos/base/applications/winhlp32/lang/it-IT.rc
@@ -1,4 +1,4 @@
-/*
+/*
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
diff --git a/reactos/base/applications/winhlp32/lang/ja-JP.rc b/reactos/base/applications/winhlp32/lang/ja-JP.rc
index bd88b5d6fad..33f4d0ccd44 100644
--- a/reactos/base/applications/winhlp32/lang/ja-JP.rc
+++ b/reactos/base/applications/winhlp32/lang/ja-JP.rc
@@ -1,4 +1,4 @@
-/*
+/*
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
@@ -126,5 +126,3 @@ BEGIN
 		MENUITEM "システム カラーを使う",   MNID_CTXT_SYSTEM_COLORS
 	END
 END
-
-#pragma code_page(default)
diff --git a/reactos/base/applications/winhlp32/lang/lt-LT.rc b/reactos/base/applications/winhlp32/lang/lt-LT.rc
index 6bf6cb33e61..228d944a5ca 100644
--- a/reactos/base/applications/winhlp32/lang/lt-LT.rc
+++ b/reactos/base/applications/winhlp32/lang/lt-LT.rc
@@ -1,8 +1,7 @@
-/*
+/*
  * Help Viewer
  *
- * Copyright 1996 Ulrich Schmid
- * Copyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>
+ * Copyright 2009 Aurimas Fišeras <aurimas@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,55 +16,56 @@
  * 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
- *  
- * Translation by Vytis "CMan" Gird�ijauskas (cman@cman.us) 
  */
 
-LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
 
 /* Menu */
 
 MAIN_MENU MENU
 {
- POPUP "&Byla" {
-  MENUITEM "&Atverti", MNID_FILE_OPEN
-  MENUITEM SEPARATOR
-  MENUITEM "&Spausdinti", MNID_FILE_PRINT
-  MENUITEM "S&pausdintuvo nuostatos...", MNID_FILE_SETUP
+ POPUP "&Failas" {
+   MENUITEM "&Atverti",                   MNID_FILE_OPEN
    MENUITEM SEPARATOR
-  MENUITEM "&Baigti", MNID_FILE_EXIT
- }
- POPUP "&Redaguoti" {
-   MENUITEM "&Kopijuoti...", MNID_EDIT_COPYDLG
+   MENUITEM "&Spausdinti",                MNID_FILE_PRINT
+   MENUITEM "Spaus&dintuvo nuostatos...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-   MENUITEM "&Komentarai...", MNID_EDIT_ANNOTATE
+   MENUITEM "Iš&eiti",                    MNID_FILE_EXIT
  }
- POPUP "&�ym�s" {
-   MENUITEM "&Kurti...", MNID_BKMK_DEFINE
+ POPUP "&Taisa" {
+   MENUITEM "&Kopijuoti...",              MNID_EDIT_COPYDLG
+   MENUITEM SEPARATOR
+   MENUITEM "Ko&mentuoti...",             MNID_EDIT_ANNOTATE
+ }
+ POPUP "&Adresynas" {
+   MENUITEM "&Apibrėžti...",              MNID_BKMK_DEFINE
  }
  POPUP "&Parinktys" {
-   POPUP	"Pagalba visada matoma"
+   POPUP    "Žinynas visuomet matomas"
    BEGIN
-     MENUITEM "Numatyta",	MNID_OPTS_HELP_DEFAULT
-     MENUITEM "Matoma",	MNID_OPTS_HELP_VISIBLE
-     MENUITEM "Nematoma",	MNID_OPTS_HELP_NONVISIBLE
-  END
-  MENUITEM "Istorija",		MNID_OPTS_HISTORY
-  POPUP    "�riftas"
-  BEGIN
-    MENUITEM "Ma�as",		MNID_OPTS_FONTS_SMALL
-    MENUITEM "Normalus",    	MNID_OPTS_FONTS_NORMAL
-    MENUITEM "Didelis",     	MNID_OPTS_FONTS_LARGE
-  END
-  MENUITEM "Naudoti sistemos spalvas",	MNID_OPTS_SYSTEM_COLORS
+     MENUITEM "Numatyta",                 MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Matomas",                  MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Nematomas",                MNID_OPTS_HELP_NONVISIBLE
+   END
+   MENUITEM "Istorija",                   MNID_OPTS_HISTORY
+   POPUP    "Šriftas"
+   BEGIN
+     MENUITEM "&Mažas",                   MNID_OPTS_FONTS_SMALL
+     MENUITEM "&Normalus",                MNID_OPTS_FONTS_NORMAL
+     MENUITEM "&Didelis",                 MNID_OPTS_FONTS_LARGE
+   END
+   MENUITEM "Naudoti &sistemos spalvas",  MNID_OPTS_SYSTEM_COLORS
  }
- POPUP "&Pagalba" {
-   MENUITEM "&Turinys", MNID_HELP_HELPON
-   MENUITEM "Visada &vir�uje", MNID_HELP_HELPTOP
+ POPUP "&Žinynas" {
+   MENUITEM "Pa&galba apie žinyną",       MNID_HELP_HELPON
+   MENUITEM "&Visada viršuje",            MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Apie", MNID_HELP_ABOUT
+   MENUITEM "&Informacija...",            MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "Apie &Wine", MNID_HELP_WINE
+   MENUITEM "&Apie Wine",                 MNID_HELP_WINE
 #endif
  }
 }
@@ -73,7 +73,7 @@ MAIN_MENU MENU
 IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
-CAPTION "Rodykl�"
+CAPTION "Indeksas"
 {
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
@@ -81,49 +81,49 @@ CAPTION "Rodykl
 IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
-CAPTION "Paie�ka"
+CAPTION "Paieška"
 {
-    LTEXT  "Dar nesukurta", -1, 10, 10, 180, 150
+    LTEXT  "Dar nerealizuota", -1, 10, 10, 180, 150
 }
 
 /* Strings */
 STRINGTABLE DISCARDABLE
 {
-STID_WINE_HELP, 	"Wine Pagalba"
-STID_WHERROR, 		"KLAIDA"
-STID_WARNING,  		"D�MESIO"
-STID_INFO,  		"Informacija"
-STID_NOT_IMPLEMENTED, 	"Dar nesukurta"
-STID_HLPFILE_ERROR_s, 	"�vyko klaida skaitant pagalbos byl� '%s'."
-STID_INDEX, 		"&Rodykl�"
-STID_CONTENTS, 		"&Turinys"
-STID_BACK, 		"&Atgal"
-STID_ALL_FILES, 	"Visos bylos (*.*)"
-STID_HELP_FILES_HLP, 	"Pagalbos bylos (*.hlp)"
-STID_FILE_NOT_FOUND_s	"Nepavyko rasti '%s'. Ar nor�tum�te pabandyti surasti �ia byl� patys?"
-STID_NO_RICHEDIT	"Nerastas richedit palaikymas... Darbas nutraukiamas"
-STID_PSH_INDEX,		"Pagalbos temos: "
+STID_WINE_HELP,       "Wine žinynas"
+STID_WHERROR,         "KLAIDA"
+STID_WARNING,         "ĮSPĖJIMAS"
+STID_INFO,            "Informacija"
+STID_NOT_IMPLEMENTED, "Nerealizuota"
+STID_HLPFILE_ERROR_s, "Klaida skaitant žinyno failą „%s“"
+STID_INDEX,           "&Rodyklė"
+STID_CONTENTS,        "Santrauka"
+STID_BACK,            "&Atgal"
+STID_ALL_FILES,       "Visi failai (*.*)"
+STID_HELP_FILES_HLP,  "Žinyno failai (*.hlp)"
+STID_FILE_NOT_FOUND_s "Nepavyko rasti „%s“. Ar norite rasti šį failą patys?"
+STID_NO_RICHEDIT      "Nepavyko rasti RichEdit realizacijos... Nutraukiama"
+STID_PSH_INDEX,       "Žinyno temos: "
 }
 
 CONTEXT_MENU MENU
 BEGIN
-	POPUP ""
-	BEGIN
-		MENUITEM "Komentarai...",       MNID_CTXT_ANNOTATE
-		MENUITEM "Kopijuoti",                MNID_CTXT_COPY
-		MENUITEM "Spausdinti...",            MNID_CTXT_PRINT
-		POPUP    "�riftas"
-		BEGIN
-			MENUITEM "Ma�as",       MNID_CTXT_FONTS_SMALL
-			MENUITEM "Normalus",      MNID_CTXT_FONTS_NORMAL
-			MENUITEM "Didelis",       MNID_CTXT_FONTS_LARGE
-		END
-		POPUP   "Pagalba visada matoma"
-		BEGIN
-			MENUITEM "Numatyta",     MNID_CTXT_HELP_DEFAULT
-			MENUITEM "Matoma",     MNID_CTXT_HELP_VISIBLE
-			MENUITEM "Nematoma", MNID_CTXT_HELP_NONVISIBLE
-		END
-		MENUITEM "Naudoti sistemos spalvas",   MNID_CTXT_SYSTEM_COLORS
-	END
+  POPUP ""
+  BEGIN
+    MENUITEM "Komentuoti...",            MNID_CTXT_ANNOTATE
+    MENUITEM "Kopijuoti",                MNID_CTXT_COPY
+    MENUITEM "Spausdinti...",            MNID_CTXT_PRINT
+    POPUP    "Šriftas"
+    BEGIN
+      MENUITEM "Mažas",                  MNID_CTXT_FONTS_SMALL
+      MENUITEM "Normalus",               MNID_CTXT_FONTS_NORMAL
+      MENUITEM "Didelis",                MNID_CTXT_FONTS_LARGE
+    END
+    POPUP   "Žinynas visuomet matomas"
+    BEGIN
+      MENUITEM "Numatyta",               MNID_CTXT_HELP_DEFAULT
+      MENUITEM "Matomas",                MNID_CTXT_HELP_VISIBLE
+      MENUITEM "Nematomas",              MNID_CTXT_HELP_NONVISIBLE
+    END
+    MENUITEM "Naudoti sistemos spalvas", MNID_CTXT_SYSTEM_COLORS
+  END
 END
diff --git a/reactos/base/applications/winhlp32/lang/nl-NL.rc b/reactos/base/applications/winhlp32/lang/nl-NL.rc
index 6a8747a859e..f65c98acf05 100644
--- a/reactos/base/applications/winhlp32/lang/nl-NL.rc
+++ b/reactos/base/applications/winhlp32/lang/nl-NL.rc
@@ -1,4 +1,4 @@
-/*
+/*
  * Help Viewer (Dutch resources)
  *
  * Copyright 2003 Hans Leidekker
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma code_page(65001)
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
@@ -32,28 +34,28 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
   MENUITEM "&Afsluiten", MNID_FILE_EXIT
  }
  POPUP "&Bewerken" {
-   MENUITEM "&Kopi�ren...", MNID_EDIT_COPYDLG
+   MENUITEM "&Kopiëren...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Annoteren...", MNID_EDIT_ANNOTATE
  }
  POPUP "&Favorieten" {
    MENUITEM "&Aanmaken...", MNID_BKMK_DEFINE
  }
- POPUP "&Options" {
-   POPUP	"Help always visible"
+ POPUP "&Opties" {
+   POPUP	"Help altijd zichtbaar"
    BEGIN
-     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
-     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
-     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+     MENUITEM "Standaard",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Zichtbaar",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Niet zichtbaar",	MNID_OPTS_HELP_NONVISIBLE
   END
-  MENUITEM "History",		MNID_OPTS_HISTORY
-  POPUP    "Fonts"
+  MENUITEM "Historie",		MNID_OPTS_HISTORY
+  POPUP    "Lettertype"
   BEGIN
-    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
-    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
-    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+    MENUITEM "Klein",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Standaard",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Groot",     	MNID_OPTS_FONTS_LARGE
   END
-  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+  MENUITEM "Gebruik systeemkleuren",	MNID_OPTS_SYSTEM_COLORS
  }
  POPUP "&Help" {
    MENUITEM "Hulp &bij help", MNID_HELP_HELPON
@@ -61,7 +63,7 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
    MENUITEM SEPARATOR
    MENUITEM "&Info...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&Over WINE", MNID_HELP_WINE
+   MENUITEM "&Over Wine", MNID_HELP_WINE
 #endif
  }
 }
@@ -79,26 +81,26 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Zoeken"
 {
-    LTEXT  "Nog niet geimplementeerd", -1, 10, 10, 180, 150
+    LTEXT  "Nog niet geïmplementeerd", -1, 10, 10, 180, 150
 }
 
 /* Strings */
 STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 {
-STID_WINE_HELP, 	"WINE Help"
+STID_WINE_HELP, 	"Wine Help"
 STID_WHERROR, 		"FOUT"
 STID_WARNING,  		"WAARSCHUWING"
 STID_INFO,  		"Informatie"
-STID_NOT_IMPLEMENTED, 	"Niet ge�mplementeerd"
-STID_HLPFILE_ERROR_s, 	"Fout bij het lezen van het helpbestand `%s'"
-STID_INDEX, 		"&Inhoud"
-STID_CONTENTS,		"Summary"
+STID_NOT_IMPLEMENTED, 	"Niet geïmplementeerd"
+STID_HLPFILE_ERROR_s, 	"Fout bij het lezen van het helpbestand '%s'"
+STID_INDEX, 		"Inde&x"
+STID_CONTENTS,		"&Inhoudsopgave"
 STID_BACK, 		"&Terug"
 STID_ALL_FILES, 	"Alle bestanden (*.*)"
 STID_HELP_FILES_HLP, 	"Helpbestanden (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Kan '%s' niet openen. Wilt u zelf dit bestand zoeken?"
-STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
-STID_PSH_INDEX,		"Help topics: "
+STID_NO_RICHEDIT	"Kan geen richedit implementatie vinden... Actie afgebroken"
+STID_PSH_INDEX,		"Help onderwerpen: "
 }
 
 CONTEXT_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
@@ -106,7 +108,7 @@ BEGIN
 	POPUP ""
 	BEGIN
 		MENUITEM "Annotering...",       MNID_CTXT_ANNOTATE
-		MENUITEM "Kopi�ren",            MNID_CTXT_COPY
+		MENUITEM "Kopiëren",            MNID_CTXT_COPY
 		MENUITEM "Print...",            MNID_CTXT_PRINT
 		POPUP    "Lettertypes"
 		BEGIN
diff --git a/reactos/base/applications/winhlp32/lang/rm-CH.rc b/reactos/base/applications/winhlp32/lang/rm-CH.rc
index 1339b39e189..b64d7c3ed8a 100644
--- a/reactos/base/applications/winhlp32/lang/rm-CH.rc
+++ b/reactos/base/applications/winhlp32/lang/rm-CH.rc
@@ -1,4 +1,4 @@
-/*
+/*
  * Help Viewer
  *
  * Copyright 1996 Ulrich Schmid
diff --git a/reactos/base/applications/winhlp32/lang/ro-RO.rc b/reactos/base/applications/winhlp32/lang/ro-RO.rc
new file mode 100644
index 00000000000..3dc586b9402
--- /dev/null
+++ b/reactos/base/applications/winhlp32/lang/ro-RO.rc
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2007 Mikolaj Zalewski
+ * Copyright (C) 2008 Michael Stefaniuc
+ *
+ * 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
+ */
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+STRINGTABLE
+{
+    IDS_FAILED, "Execuția Wordpad a eșuat"
+}
diff --git a/reactos/base/applications/winhlp32/lang/sl-SI.rc b/reactos/base/applications/winhlp32/lang/sl-SI.rc
index a742cafe05b..01746bb02f8 100644
--- a/reactos/base/applications/winhlp32/lang/sl-SI.rc
+++ b/reactos/base/applications/winhlp32/lang/sl-SI.rc
@@ -1,4 +1,4 @@
-/*
+/*
  * Help Viewer (Slovenian Resources)
  *
  * Copyright 2002, 2003, 2008 Rok Mandeljc
@@ -124,5 +124,3 @@ BEGIN
 		MENUITEM "Uporabi sistemske barve",   MNID_CTXT_SYSTEM_COLORS
 	END
 END
-
-#pragma code_page(default)
diff --git a/reactos/base/applications/winhlp32/lang/zh-CN.rc b/reactos/base/applications/winhlp32/lang/zh-CN.rc
index c0ed0176d77..38d5a565b48 100644
--- a/reactos/base/applications/winhlp32/lang/zh-CN.rc
+++ b/reactos/base/applications/winhlp32/lang/zh-CN.rc
@@ -1,4 +1,4 @@
-/*
+/*
  * Help Viewer
  * Simplified and Traditional Chinese Language Support
  *
@@ -158,5 +158,3 @@ STID_FILE_NOT_FOUND_s	"不能開啟檔案 '%s'. 你想要自己找這個檔案
 STID_NO_RICHEDIT	"找不到 richedit... 終止"
 STID_PSH_INDEX,		"幫助內容: "
 }
-
-#pragma code_page(default)
diff --git a/reactos/base/applications/winhlp32/lex.yy.c b/reactos/base/applications/winhlp32/lex.yy.c
index bf0be672d32..aa6f83c8b78 100644
--- a/reactos/base/applications/winhlp32/lex.yy.c
+++ b/reactos/base/applications/winhlp32/lex.yy.c
@@ -380,9 +380,9 @@ static char *yy_last_accepting_cpos;
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 ".\\macro.lex.l"
+#line 1 "macro.lex.l"
 #define INITIAL 0
-#line 2 ".\\macro.lex.l"
+#line 2 "macro.lex.l"
 /*
  * Help Viewer
  *
@@ -407,7 +407,7 @@ char *yytext;
 #define YY_NO_UNPUT 1
 #define quote 1
 
-#line 26 ".\\macro.lex.l"
+#line 26 "macro.lex.l"
 #include "config.h"
 #include <assert.h>
 #include <stdarg.h>
@@ -593,7 +593,7 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
 
-#line 61 ".\\macro.lex.l"
+#line 61 "macro.lex.l"
 
 
 #line 600 "lex.yy.c"
@@ -681,32 +681,32 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 63 ".\\macro.lex.l"
+#line 63 "macro.lex.l"
 yylval.integer = strtol(yytext, NULL, 10);	return INTEGER;
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 64 ".\\macro.lex.l"
+#line 64 "macro.lex.l"
 yylval.integer = strtol(yytext, NULL, 16);	return INTEGER;
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 66 ".\\macro.lex.l"
+#line 66 "macro.lex.l"
 return MACRO_Lookup(yytext, &yylval);
 	YY_BREAK
 case 4:
-#line 69 ".\\macro.lex.l"
+#line 69 "macro.lex.l"
 case 5:
-#line 70 ".\\macro.lex.l"
+#line 70 "macro.lex.l"
 case 6:
-#line 71 ".\\macro.lex.l"
+#line 71 "macro.lex.l"
 case 7:
-#line 72 ".\\macro.lex.l"
+#line 72 "macro.lex.l"
 case 8:
-#line 73 ".\\macro.lex.l"
+#line 73 "macro.lex.l"
 case 9:
 YY_RULE_SETUP
-#line 73 ".\\macro.lex.l"
+#line 73 "macro.lex.l"
 {
     if (lex_data->quote_stk_idx == 0 ||
         (yytext[0] == '\"' && lex_data->quote_stack[lex_data->quote_stk_idx - 1] != '\"') ||
@@ -741,31 +741,31 @@ YY_RULE_SETUP
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 105 ".\\macro.lex.l"
+#line 105 "macro.lex.l"
 *lex_data->strptr++ = yytext[0];
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 106 ".\\macro.lex.l"
+#line 106 "macro.lex.l"
 *lex_data->strptr++ = yytext[1];
 	YY_BREAK
 case YY_STATE_EOF(quote):
-#line 107 ".\\macro.lex.l"
+#line 107 "macro.lex.l"
 return 0;
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 109 ".\\macro.lex.l"
+#line 109 "macro.lex.l"
 
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 110 ".\\macro.lex.l"
+#line 110 "macro.lex.l"
 return yytext[0];
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 111 ".\\macro.lex.l"
+#line 111 "macro.lex.l"
 ECHO;
 	YY_BREAK
 #line 772 "lex.yy.c"
@@ -1654,7 +1654,7 @@ int main()
 	return 0;
 	}
 #endif
-#line 111 ".\\macro.lex.l"
+#line 111 "macro.lex.l"
 
 
 #if 0
diff --git a/reactos/base/applications/winhlp32/rsrc.rc b/reactos/base/applications/winhlp32/rsrc.rc
index 35db516b15d..a86e3f6db1d 100644
--- a/reactos/base/applications/winhlp32/rsrc.rc
+++ b/reactos/base/applications/winhlp32/rsrc.rc
@@ -32,7 +32,7 @@ IDI_WINHELP ICON DISCARDABLE winhelp.ico
 #include "lang/cs-CZ.rc"
 #include "lang/da-DK.rc"
 #include "lang/de-DE.rc"
-// #include "lang/el-GR.rc"
+#include "lang/el-GR.rc"
 #include "lang/en-US.rc"
 #include "lang/es-ES.rc"
 #include "lang/fi-FI.rc"
@@ -46,7 +46,8 @@ IDI_WINHELP ICON DISCARDABLE winhelp.ico
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/pt-BR.rc"
-// #include "lang/rm-CH.rc"
+#include "lang/rm-CH.rc"
+#include "lang/ro-RO.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sl-SI.rc"
 #include "lang/sk-SK.rc"
diff --git a/reactos/base/applications/winhlp32/winhelp.c b/reactos/base/applications/winhlp32/winhelp.c
index 08d3875aba1..56244d35aec 100644
--- a/reactos/base/applications/winhlp32/winhelp.c
+++ b/reactos/base/applications/winhlp32/winhelp.c
@@ -1736,7 +1736,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
                            WINHELP_GetWindowInfo(hlpfile, wndname), show);
 
     /* Message loop */
-    while (GetMessage(&msg, 0, 0, 0))
+    while ((Globals.win_list || Globals.active_popup) && GetMessage(&msg, 0, 0, 0))
     {
         TranslateMessage(&msg);
         DispatchMessage(&msg);
diff --git a/reactos/base/applications/winhlp32/winhelp_res.h b/reactos/base/applications/winhlp32/winhelp_res.h
index e1c72ff54e0..ba2f9799d25 100644
--- a/reactos/base/applications/winhlp32/winhelp_res.h
+++ b/reactos/base/applications/winhlp32/winhelp_res.h
@@ -1,3 +1,6 @@
+#include <windef.h>
+#include <winuser.h>
+
 #define MNID_FILE_OPEN          0x101
 #define MNID_FILE_PRINT         0x104
 #define MNID_FILE_SETUP         0x106