[ros-diffs] [dreimer] 41850: Revert the sync, it breaks build. further investigation will be made next week. 2/2 Sry for the 4 stolen rev numbers ; -)

Author: dreimer
Date: Fri Jul 10 21:25:11 2009
New Revision: 41850

URL: http://svn.reactos.org/svn/reactos?rev=41850&view=rev
Log:
Revert the sync, it breaks build. further investigation will be made next week. 2/2
Sry for the 4 stolen rev numbers ;-)

Removed:
    trunk/reactos/base/applications/winhlp32/lang/Lt.rc
    trunk/reactos/base/applications/wordpad/Lt.rc
Modified:
    trunk/reactos/base/applications/cmdutils/xcopy/Da.rc
    trunk/reactos/base/applications/cmdutils/xcopy/De.rc
    trunk/reactos/base/applications/cmdutils/xcopy/En.rc
    trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc
    trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc
    trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc
    trunk/reactos/base/applications/cmdutils/xcopy/No.rc
    trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc
    trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc
    trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc
    trunk/reactos/base/applications/cmdutils/xcopy/Si.rc
    trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h
    trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc
    trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc
    trunk/reactos/base/applications/winhlp32/lang/da-DK.rc
    trunk/reactos/base/applications/winhlp32/lang/de-DE.rc
    trunk/reactos/base/applications/winhlp32/lang/en-US.rc
    trunk/reactos/base/applications/winhlp32/lang/es-ES.rc
    trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc
    trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc
    trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc
    trunk/reactos/base/applications/winhlp32/lang/it-IT.rc
    trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc
    trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc
    trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc
    trunk/reactos/base/applications/winhlp32/lang/no-NO.rc
    trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc
    trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc
    trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc
    trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc
    trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc
    trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc
    trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc
    trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc
    trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc
    trunk/reactos/base/applications/winhlp32/lex.yy.c
    trunk/reactos/base/applications/winhlp32/winhelp.c
    trunk/reactos/base/applications/winhlp32/winhelp_res.h
    trunk/reactos/base/applications/wordpad/Da.rc
    trunk/reactos/base/applications/wordpad/De.rc
    trunk/reactos/base/applications/wordpad/En.rc
    trunk/reactos/base/applications/wordpad/Fr.rc
    trunk/reactos/base/applications/wordpad/Hu.rc
    trunk/reactos/base/applications/wordpad/Ja.rc
    trunk/reactos/base/applications/wordpad/Ko.rc
    trunk/reactos/base/applications/wordpad/Nl.rc
    trunk/reactos/base/applications/wordpad/No.rc
    trunk/reactos/base/applications/wordpad/Pl.rc
    trunk/reactos/base/applications/wordpad/Pt.rc
    trunk/reactos/base/applications/wordpad/Ru.rc
    trunk/reactos/base/applications/wordpad/Si.rc
    trunk/reactos/base/applications/wordpad/Sv.rc
    trunk/reactos/base/applications/wordpad/Tr.rc
    trunk/reactos/base/applications/wordpad/Zh.rc
    trunk/reactos/base/applications/wordpad/rsrc.rc
    trunk/reactos/base/applications/wordpad/wordpad.h

Modified: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Da.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Da.rc [iso-8859-1] Fri Jul 10 21:25:11
2009
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "xcopy.h"
 
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/base/applications/cmdutils/xcopy/De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] Fri Jul 10 21:25:11
2009
@@ -20,9 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "xcopy.h"
-
-#pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
@@ -30,16 +27,16 @@
 {
     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"
@@ -61,20 +58,20 @@
 [/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"

Modified: trunk/reactos/base/applications/cmdutils/xcopy/En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] Fri Jul 10 21:25:11
2009
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "xcopy.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc [iso-8859-1] Fri Jul 10 21:25:11
2009
@@ -18,9 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "xcopy.h"
-
 #pragma code_page(65001)
 
 
@@ -33,12 +30,12 @@
     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,   "« %s » est-il un fichier ou un répertoire\n" \
+    STRING_QISDIR,   "Est-ce que « %s » est 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 code
de retour %d\n"
+    STRING_COPYFAIL, "La copie de « %s » vers « %s » a échoué avec le c/r
%d\n"
     STRING_OPENFAIL, "Impossible d'ouvrir « %s »\n"
     STRING_READFAIL, "Impossible de lire « %s »\n"
     STRING_YES_CHAR, "O"
@@ -48,36 +45,38 @@
     STRING_DIR_CHAR, "R"
 
     STRING_HELP,
-"XCOPY - Copie les fichiers ou répertoires sources vers une destination\n\
+"XCOPY - Copie les fichiers ou répertoires source vers une destination\n\
 \n\
 Syntaxe :\n\
-XCOPY source [destination] [/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\
+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 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\
+[/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\
 [/W]  Demande avant de démarrer la copie\n\
-[/T]  Créer une structure de répertoires vides, mais ne pas copier les fichiers\n\
+[/T]  Créer une structure de répertoires vides, mais ne copie pas 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]  Interroge l'utilisateur avant de copier chaque fichier source\n\
-[/N]  Copie en utilisant les noms courts\n\
+[/P]  Demande avant de copier chaque fichier source\n\
+[/N]  Copie en utilisant des 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 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\
+[/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\
 \t\tque le fichier source\n\n"
 
 }
+
+#pragma code_page(default)

Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] Fri Jul 10 21:25:11
2009
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "xcopy.h"
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc [iso-8859-1] Fri Jul 10 21:25:11
2009
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "xcopy.h"
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/base/applications/cmdutils/xcopy/No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/No.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/No.rc [iso-8859-1] Fri Jul 10 21:25:11
2009
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "xcopy.h"
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 

Modified: trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] Fri Jul 10 21:25:11
2009
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "xcopy.h"
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc [iso-8859-1] Fri Jul 10 21:25:11
2009
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "xcopy.h"
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] Fri Jul 10 21:25:11
2009
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "xcopy.h"
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/base/applications/cmdutils/xcopy/Si.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] Fri Jul 10 21:25:11
2009
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "xcopy.h"
 
 #pragma code_page(65001)
 
@@ -80,3 +78,5 @@
 \t\tod izvora\n\n"
 
 }
+
+#pragma code_page(default)

Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include <windef.h>
 
 /* Local #defines */
 #define RC_OK         0

Removed: trunk/reactos/base/applications/winhlp32/lang/Lt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/Lt.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/Lt.rc (removed)
@@ -1,131 +1,0 @@
-/*
- * Help Viewer
- *
- * Copyright 2009 Aurimas Fišeras &lt;aurimas(a)gmail.com&gt;
- *
- * 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
- */
-
-#include "winhelp_res.h"
-
-/* UTF-8 */
-#pragma code_page(65001)
-
-LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
-
-/* Menu */
-
-MAIN_MENU MENU
-{
- POPUP "&Failas" {
-   MENUITEM "&Atverti",                   MNID_FILE_OPEN
-   MENUITEM SEPARATOR
-   MENUITEM "&Spausdinti",                MNID_FILE_PRINT
-   MENUITEM "Spaus&dintuvo nuostatos...", MNID_FILE_SETUP
-   MENUITEM SEPARATOR
-   MENUITEM "IÅ¡&eiti",                    MNID_FILE_EXIT
- }
- 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    "Žinynas visuomet matomas"
-   BEGIN
-     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 "&Žinynas" {
-   MENUITEM "Pa&galba apie žinyną",       MNID_HELP_HELPON
-   MENUITEM "&Visada viršuje",            MNID_HELP_HELPTOP
-   MENUITEM SEPARATOR
-   MENUITEM "&Informacija...",            MNID_HELP_ABOUT
-#ifdef WINELIB
-   MENUITEM "&Apie Wine",                 MNID_HELP_WINE
-#endif
- }
-}
-
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-FONT 8, "MS Shell Dlg"
-CAPTION "Indeksas"
-{
-    LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
WS_BORDER
-}
-
-IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-FONT 8, "MS Shell Dlg"
-CAPTION "Paieška"
-{
-    LTEXT  "Dar nerealizuota", -1, 10, 10, 180, 150
-}
-
-/* Strings */
-STRINGTABLE DISCARDABLE
-{
-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 "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

Modified: trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* Menu */
 

Modified: trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -20,8 +20,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* Czech strings in CP1250 */
 

Modified: trunk/reactos/base/applications/winhlp32/lang/da-DK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/da-DK.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/da-DK.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -19,8 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* Menu */
 

Modified: trunk/reactos/base/applications/winhlp32/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/de-DE.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -19,16 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
-#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
@@ -65,7 +61,7 @@
    MENUITEM SEPARATOR
    MENUITEM "&Info...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&Über WINE", MNID_HELP_WINE
+   MENUITEM "&Über WINE", MNID_HELP_WINE
 #endif
  }
 }
@@ -98,7 +94,7 @@
 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?"
@@ -113,11 +109,11 @@
 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

Modified: trunk/reactos/base/applications/winhlp32/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/en-US.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* Menu */
 
@@ -56,51 +54,6 @@
     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
-   MENUITEM SEPARATOR
-   MENUITEM "&Info...", MNID_HELP_ABOUT
-#ifdef WINELIB
-   MENUITEM "&About Wine", MNID_HELP_WINE
-#endif
- }
-}
-
-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
@@ -170,26 +123,3 @@
 		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

Modified: trunk/reactos/base/applications/winhlp32/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/es-ES.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -19,8 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* Menu */
 

Modified: trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -19,8 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* Menu */
 

Modified: trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -20,11 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
-/* UTF-8 */
-#pragma code_page(65001)
-
 /* Menu */
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
@@ -39,18 +34,18 @@
    MENUITEM SEPARATOR
   MENUITEM "&Quitter", MNID_FILE_EXIT
  }
- POPUP "É&dition" {
+ POPUP "É&dition" {
    MENUITEM "&Copier...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Annoter...", MNID_EDIT_ANNOTATE
+   MENUITEM "&Annotation...", MNID_EDIT_ANNOTATE
  }
- POPUP "&Signets" {
-   MENUITEM "&Définir...", MNID_BKMK_DEFINE
+ POPUP "&Signet" {
+   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
@@ -61,7 +56,7 @@
     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
@@ -69,7 +64,7 @@
    MENUITEM SEPARATOR
    MENUITEM "&Info...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "À &propos de Wine", MNID_HELP_WINE
+   MENUITEM "À &propos de Wine", MNID_HELP_WINE
 #endif
  }
 }
@@ -87,7 +82,7 @@
 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 */
@@ -97,15 +92,15 @@
 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 les fichiers (*.*)"
+STID_BACK, 		"&Précédent"
+STID_ALL_FILES, 	"Tous 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 : "
 }
 
@@ -124,10 +119,10 @@
 		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

Modified: trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -19,8 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* Menu */
 

Modified: trunk/reactos/base/applications/winhlp32/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/it-IT.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* Menu */
 

Modified: trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* UTF-8 */
 #pragma code_page(65001)
@@ -128,3 +126,5 @@
 		MENUITEM "システム カラーを使う",   MNID_CTXT_SYSTEM_COLORS
 	END
 END
+
+#pragma code_page(default)

Modified: trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* Menu */
 

Modified: trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -19,10 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
-#pragma code_page(65001)
-
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
@@ -36,28 +32,28 @@
   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 "&Opties" {
-   POPUP	"Help altijd zichtbaar"
+ POPUP "&Options" {
+   POPUP	"Help always visible"
    BEGIN
-     MENUITEM "Standaard",	MNID_OPTS_HELP_DEFAULT
-     MENUITEM "Zichtbaar",	MNID_OPTS_HELP_VISIBLE
-     MENUITEM "Niet zichtbaar",	MNID_OPTS_HELP_NONVISIBLE
+     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
   END
-  MENUITEM "Historie",		MNID_OPTS_HISTORY
-  POPUP    "Lettertype"
+  MENUITEM "History",		MNID_OPTS_HISTORY
+  POPUP    "Fonts"
   BEGIN
-    MENUITEM "Klein",		MNID_OPTS_FONTS_SMALL
-    MENUITEM "Standaard",    	MNID_OPTS_FONTS_NORMAL
-    MENUITEM "Groot",     	MNID_OPTS_FONTS_LARGE
+    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
   END
-  MENUITEM "Gebruik systeemkleuren",	MNID_OPTS_SYSTEM_COLORS
+  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
  }
  POPUP "&Help" {
    MENUITEM "Hulp &bij help", MNID_HELP_HELPON
@@ -65,7 +61,7 @@
    MENUITEM SEPARATOR
    MENUITEM "&Info...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&Over Wine", MNID_HELP_WINE
+   MENUITEM "&Over WINE", MNID_HELP_WINE
 #endif
  }
 }
@@ -83,26 +79,26 @@
 FONT 8, "MS Shell Dlg"
 CAPTION "Zoeken"
 {
-    LTEXT  "Nog niet geïmplementeerd", -1, 10, 10, 180, 150
+    LTEXT  "Nog niet geimplementeerd", -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, 		"Inde&x"
-STID_CONTENTS,		"&Inhoudsopgave"
+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_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	"Kan geen richedit implementatie vinden... Actie afgebroken"
-STID_PSH_INDEX,		"Help onderwerpen: "
+STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }
 
 CONTEXT_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
@@ -110,7 +106,7 @@
 	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

Modified: trunk/reactos/base/applications/winhlp32/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/no-NO.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* Menu */
 

Modified: trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -19,8 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* Menu */
 

Modified: trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -22,8 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* Menu */
 

Modified: trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -19,8 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* FIXME: This file is in the Vallader Romansh dialect and not in the
    official Rumantsch Grischun. */

Modified: trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* Menu */
 

Modified: trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 {

Modified: trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 #pragma code_page(65001)
 
@@ -126,3 +124,5 @@
 		MENUITEM "Uporabi sistemske barve",   MNID_CTXT_SYSTEM_COLORS
 	END
 END
+
+#pragma code_page(default)

Modified: trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -21,8 +21,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* Menu */
 

Modified: trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* Menu */
 

Modified: trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -19,8 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "winhelp_res.h"
 
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
@@ -160,3 +158,5 @@
 STID_NO_RICHEDIT	"找不到 richedit... 終止"
 STID_PSH_INDEX,		"幫助內容: "
 }
+
+#pragma code_page(default)

Modified: trunk/reactos/base/applications/winhlp32/lex.yy.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] Fri Jul 10 21:25:11
2009
@@ -380,9 +380,9 @@
 #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 @@
 #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 @@
 	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 @@
 
 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_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 @@
 	return 0;
 	}
 #endif
-#line 111 "macro.lex.l"
+#line 111 ".\\macro.lex.l"
 
 
 #if 0

Modified: trunk/reactos/base/applications/winhlp32/winhelp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Fri Jul 10 21:25:11
2009
@@ -1736,7 +1736,7 @@
                            WINHELP_GetWindowInfo(hlpfile, wndname), show);
 
     /* Message loop */
-    while ((Globals.win_list || Globals.active_popup) && GetMessage(&msg, 0,
0, 0))
+    while (GetMessage(&msg, 0, 0, 0))
     {
         TranslateMessage(&msg);
         DispatchMessage(&msg);

Modified: trunk/reactos/base/applications/winhlp32/winhelp_res.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/winhelp_res.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/winhelp_res.h [iso-8859-1] Fri Jul 10
21:25:11 2009
@@ -1,6 +1,3 @@
-#include <windef.h>
-#include <winuser.h>
-
 #define MNID_FILE_OPEN          0x101
 #define MNID_FILE_PRINT         0x104
 #define MNID_FILE_SETUP         0x106

Modified: trunk/reactos/base/applications/wordpad/Da.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Da.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Da.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wordpad.h"
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 IDM_MAINMENU MENU DISCARDABLE

Modified: trunk/reactos/base/applications/wordpad/De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wordpad.h"
-
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
@@ -246,3 +244,5 @@
     STRING_PRINTING_NOT_IMPLEMENTED, "Drucken ist nicht implementiert"
     STRING_MAX_TAB_STOPS,            "Es können nur maximal 32 Tabstopps definiert
werden."
 END
+
+#pragma code_page(default)

Modified: trunk/reactos/base/applications/wordpad/En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wordpad.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 IDM_MAINMENU MENU DISCARDABLE
@@ -244,12 +242,3 @@
     STRING_PRINTING_NOT_IMPLEMENTED,  "Printing not implemented"
     STRING_MAX_TAB_STOPS,             "Cannot add more than 32 tab stops."
 END
-
-LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_ALIGN_LEFT,            "Left"
-    STRING_ALIGN_RIGHT,           "Right"
-    STRING_ALIGN_CENTER,          "Centre"
-END

Modified: trunk/reactos/base/applications/wordpad/Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -16,11 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wordpad.h"
-
-/* UTF-8 */
-#pragma code_page(65001)
-
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 IDM_MAINMENU MENU DISCARDABLE
@@ -33,44 +28,44 @@
         MENUITEM "Enregistrer &sous...",    ID_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "&Imprimer...\tCtrl+P",    ID_PRINT
-        MENUITEM "A&perçu avant impression...",    ID_PREVIEW
+        MENUITEM "A&perçu avant impression...",    ID_PREVIEW
         MENUITEM "&Mise en page...",        ID_PRINTSETUP
         MENUITEM SEPARATOR
         MENUITEM "&Quitter",        ID_FILE_EXIT
     END
-    POPUP "É&dition"
+    POPUP "É&dition"
     BEGIN
         MENUITEM "&Annuler\tCtrl+Z",                ID_EDIT_UNDO
-        MENUITEM "&Rétablir\tCtrl+Y",                ID_EDIT_REDO
+        MENUITEM "&Rétablir\tCtrl+Y",                ID_EDIT_REDO
         MENUITEM SEPARATOR
         MENUITEM "&Couper\tCtrl+X",                 ID_EDIT_CUT
         MENUITEM "Co&pier\tCtrl+C",                 ID_EDIT_COPY
         MENUITEM "C&oller\tCtrl+V",                 ID_EDIT_PASTE
         MENUITEM "&Effacer\tDel",                   ID_EDIT_CLEAR
-        MENUITEM "&Sélectionner tout\tCtrl+A",      ID_EDIT_SELECTALL
+        MENUITEM "&Sélectionner tout\tCtrl+A",      ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "&Rechercher...\tCrtl+F",             ID_FIND
         MENUITEM "Rechercher le &suivant\tF3",                 
ID_FIND_NEXT
         MENUITEM "&Remplacer...\tCtrl+H",          ID_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Lecture &seule",                  ID_EDIT_READONLY
-        MENUITEM "&Modifié",                        ID_EDIT_MODIFIED
-        MENUITEM SEPARATOR
-        POPUP "&Avancé"
+        MENUITEM "Lecture-&seule",                  ID_EDIT_READONLY
+        MENUITEM "&Modifié",                        ID_EDIT_MODIFIED
+        MENUITEM SEPARATOR
+        POPUP "&Avancés"
         BEGIN
-            MENUITEM "&Information sélection",      ID_EDIT_SELECTIONINFO
-            MENUITEM "&Format caractères",          ID_EDIT_CHARFORMAT
-            MENUITEM "&Déf. format car.",           ID_EDIT_DEFCHARFORMAT
+            MENUITEM "&Information sélection",      ID_EDIT_SELECTIONINFO
+            MENUITEM "&Format caractères",          ID_EDIT_CHARFORMAT
+            MENUITEM "&Déf. format car.",           ID_EDIT_DEFCHARFORMAT
             MENUITEM "Format paragrap&he",          ID_EDIT_PARAFORMAT
-            MENUITEM "Texte &complet",              ID_EDIT_GETTEXT
+            MENUITEM "&Recevoir texte",             ID_EDIT_GETTEXT
         END
     END
     POPUP "&Affichage"
     BEGIN
         MENUITEM "&Barre d'outils",        ID_TOGGLE_TOOLBAR
         MENUITEM "&Barre de format",      ID_TOGGLE_FORMATBAR
-        MENUITEM "&Règle",             ID_TOGGLE_RULER
-        MENUITEM "&Barre d'état",      ID_TOGGLE_STATUSBAR
+        MENUITEM "&Règle",             ID_TOGGLE_RULER
+        MENUITEM "&Barre d'état",      ID_TOGGLE_STATUSBAR
         MENUITEM SEPARATOR
         MENUITEM "&Options...",  ID_VIEWPROPERTIES
     END
@@ -81,18 +76,18 @@
     POPUP "Forma&t"
     BEGIN
         MENUITEM "&Police...",                  ID_FONTSETTINGS
-        MENUITEM "Pu&ces"                ID_BULLET
-        MENUITEM "Para&graphe..."              ID_PARAFORMAT
+        MENUITEM "&Puces"                ID_BULLET
+        MENUITEM "&Paragraphe..."              ID_PARAFORMAT
         MENUITEM "&Tabulations..."                   ID_TABSTOPS
-        POPUP "&Arrière-plan"
+        POPUP "&Fond"
         BEGIN
-            MENUITEM "&Système\tCtrl+1",         ID_BACK_1
-            MENUITEM "&Jaune pâle\tCtrl+2",           ID_BACK_2
+            MENUITEM "&Système\tCtrl+1",         ID_BACK_1
+            MENUITEM "&Jaunasse\tCtrl+2",           ID_BACK_2
         END
     END
     POPUP "Aid&e"
     BEGIN
-        MENUITEM "À &propos du Wordpad de Wine"       ID_ABOUT
+        MENUITEM "À &propos du Wordpad de Wine"       ID_ABOUT
     END
 END
 
@@ -104,8 +99,8 @@
         MENUITEM "Co&pier",             ID_EDIT_COPY
         MENUITEM "C&oller",             ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "P&uces"       ID_BULLET
-        MENUITEM "Para&graphe"     ID_PARAFORMAT
+        MENUITEM "&Puces"       ID_BULLET
+        MENUITEM "&Paragraphe"     ID_PARAFORMAT
     END
 END
 
@@ -141,7 +136,7 @@
     EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
     LTEXT "Droite", -1, 15, 40, 40, 13
     EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
-    LTEXT "Première ligne", -1, 15, 58, 40, 18
+    LTEXT "Première ligne", -1, 15, 58, 40, 18
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
     LTEXT "Alignement", -1, 15, 87, 40, 13
     COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
@@ -154,13 +149,13 @@
 Caption "Tabulations"
 FONT 8, "MS SHell DLg"
 BEGIN
-    GROUPBOX "Taquets de tabulation", -1, 10, 10, 120, 90
+    GROUPBOX "Arrêts de tabulation", -1, 10, 10, 120, 90
     COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
-    DEFPUSHBUTTON "A&jouter", ID_TAB_ADD, 20, 80, 45, 15
+    DEFPUSHBUTTON "&Ajouter", ID_TAB_ADD, 20, 80, 45, 15
     PUSHBUTTON "&Supprimer", ID_TAB_DEL, 72, 80, 45, 15
-    PUSHBUTTON "&OK", IDOK, 137, 15, 56, 15
-    PUSHBUTTON "&Annuler", IDCANCEL, 137, 33, 56, 15
-    PUSHBUTTON "Supprimer &tous", ID_TAB_EMPTY, 137, 51, 56, 15
+    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
+    PUSHBUTTON "&Annuler", IDCANCEL, 137, 33, 50, 15
+    PUSHBUTTON "Supprimer &tous", ID_TAB_EMPTY, 137, 51, 50, 15
 END
 
 IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110
@@ -168,23 +163,23 @@
 Caption ""
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Passage à la ligne automatique", -1, 10, 10, 140, 85
-    RADIOBUTTON "&Aucun", IDC_PAGEFMT_WN, 18, 25, 127, 15
-    RADIOBUTTON "Au niveau de la bordure de fe&nêtre", IDC_PAGEFMT_WW, 18,
45, 127, 15
-    RADIOBUTTON "Au niveau de la &marge", IDC_PAGEFMT_WM, 18, 65, 127, 15
-    GROUPBOX "Barres d'outils", -1, 156, 10, 115, 85
-    CHECKBOX "&Barre d'outils", IDC_PAGEFMT_TB, 166, 20, 80, 15
-    CHECKBOX "Barre de &format", IDC_PAGEFMT_FB, 166, 38, 80, 15
-    CHECKBOX "&Règle", IDC_PAGEFMT_RU, 166, 56, 80, 15
-    CHECKBOX "Barre de &statut", IDC_PAGEFMT_SB, 166, 74, 80, 15
+    GROUPBOX "Enveloppement de ligne", -1, 10, 10, 170, 85
+    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 145, 15
+    RADIOBUTTON "Enveloppe le texte à partir de la bordure de fenêtre",
IDC_PAGEFMT_WW, 18, 45, 145, 15
+    RADIOBUTTON "Enveloppe le texte à partir de la &marge", IDC_PAGEFMT_WM,
18, 65, 145, 15
+    GROUPBOX "Barres d'outils", -1, 170, 10, 120, 85
+    CHECKBOX "&Barre d'outils", IDC_PAGEFMT_TB, 180, 20, 80, 15
+    CHECKBOX "Barre de &format", IDC_PAGEFMT_FB, 180, 38, 80, 15
+    CHECKBOX "&Règle", IDC_PAGEFMT_RU, 180, 56, 80, 15
+    CHECKBOX "Barre de &statut", IDC_PAGEFMT_SB, 180, 74, 80, 15
     LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_RICHTEXT_FILES_RTF,     "Format de texte enrichi (*.rtf)"
+    STRING_RICHTEXT_FILES_RTF,     "Documents texte riche (*.rtf)"
     STRING_TEXT_FILES_TXT,         "Documents texte (*.txt)"
-    STRING_TEXT_FILES_UNICODE_TXT, "Documents texte Unicode (*.txt)"
+    STRING_TEXT_FILES_UNICODE_TXT, "Documents texte unicode (*.txt)"
     STRING_ALL_FILES,              "Tous les documents (*.*)"
 END
 
@@ -197,9 +192,9 @@
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_NEWFILE_RICHTEXT,     "Format de texte enrichi (RTF)"
+    STRING_NEWFILE_RICHTEXT,     "Document texte riche"
     STRING_NEWFILE_TXT,          "Document texte"
-    STRING_NEWFILE_TXT_UNICODE,  "Document texte Unicode"
+    STRING_NEWFILE_TXT_UNICODE,  "Document texte unicode"
 END
 
 STRINGTABLE DISCARDABLE
@@ -218,7 +213,7 @@
 BEGIN
     STRING_PREVIEW_PRINT,            "Imprimer"
     STRING_PREVIEW_NEXTPAGE,         "Page suivante"
-    STRING_PREVIEW_PREVPAGE,         "Page précédente"
+    STRING_PREVIEW_PREVPAGE,         "Page précédente"
     STRING_PREVIEW_TWOPAGES,         "Deux pages"
     STRING_PREVIEW_ONEPAGE,          "Une page"
     STRING_PREVIEW_CLOSE,            "Fermer"
@@ -232,18 +227,18 @@
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_DEFAULT_FILENAME,     "Document"
-    STRING_PROMPT_SAVE_CHANGES,  "Enregistrer les modifications de
« %s » ?"
-    STRING_SEARCH_FINISHED,      "Recherche terminée dans le document."
-    STRING_LOAD_RICHED_FAILED,   "Impossible de charger la bibliothèque
RichEdit."
+    STRING_PROMPT_SAVE_CHANGES,  "Enregistrer les modifications de « %s » ?"
+    STRING_SEARCH_FINISHED,      "Recherche terminée dans le document."
+    STRING_LOAD_RICHED_FAILED,   "Impossible de charger la bibliothèque
RichEdit."
     STRING_SAVE_LOSEFORMATTING,  "Vous avez choisi d'enregistrer en texte
simple, " \
                                  "ce qui causera la perte de tout formattage. "
\
-                                 "Voulez-vous vraiment continuer ?"
+                                 "Voulez-vous vraiment continuer ?"
     STRING_INVALID_NUMBER,       "Format de nombre invalide"
-    STRING_OLE_STORAGE_NOT_SUPPORTED, "Les documents conteneur OLE ne sont pas
supportés"
+    STRING_OLE_STORAGE_NOT_SUPPORTED, "Les documents conteneur OLE ne sont pas
supportés"
     STRING_WRITE_FAILED,              "Impossible d'enregistrer le
fichier."
-    STRING_WRITE_ACCESS_DENIED,       "Vous ne disposez pas des accès nécessaires
à l'enregistrement du fichier."
+    STRING_WRITE_ACCESS_DENIED,       "Vous ne disposez pas des accès nécessaires à
l'enregistrement du fichier."
     STRING_OPEN_FAILED,               "Impossible d'ouvrir le fichier."
-    STRING_OPEN_ACCESS_DENIED,        "Vous ne disposez pas des accès nécessaires
à l'ouverture du fichier."
-    STRING_PRINTING_NOT_IMPLEMENTED, "L'impression n'est pas
implémentée"
+    STRING_OPEN_ACCESS_DENIED,        "Vous ne disposez pas des accès nécessaires à
l'ouverture du fichier."
+    STRING_PRINTING_NOT_IMPLEMENTED, "L'impression n'est pas
implémentée"
     STRING_MAX_TAB_STOPS,             "Impossible d'ajouter plus de 32 taquets
de tabulation."
 END

Modified: trunk/reactos/base/applications/wordpad/Hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wordpad.h"
-
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 IDM_MAINMENU MENU DISCARDABLE

Modified: trunk/reactos/base/applications/wordpad/Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wordpad.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -244,6 +242,6 @@
     STRING_WRITE_ACCESS_DENIED,      
"ファイルに保存する権限がありません。"
     STRING_OPEN_FAILED,               "ファイルを開けません。"
     STRING_OPEN_ACCESS_DENIED,       
"ファイルを開く権限がありません。"
-    STRING_PRINTING_NOT_IMPLEMENTED,  "プリントが実装されていません。"
-    STRING_MAX_TAB_STOPS,            
"32ä»¥ä¸Šãªã‚¿ãƒ–ã‚’è¿½åŠ ã§ãã¾ã›ã‚“ã€‚"
-END
+END
+
+#pragma code_page(default)

Modified: trunk/reactos/base/applications/wordpad/Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wordpad.h"
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 

Removed: trunk/reactos/base/applications/wordpad/Lt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Lt.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Lt.rc (removed)
@@ -1,249 +1,0 @@
-/*
- * Copyright 2009 Aurimas Fišeras &lt;aurimas(a)gmail.com&gt;
- *
- * 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
- */
-
-#include "wordpad.h"
-
-/* UTF-8 */
-#pragma code_page(65001)
-
-LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&Failas"
-    BEGIN
-        MENUITEM "&Naujas...\tCtrl+N",              ID_FILE_NEW
-        MENUITEM "&Atverti...\tCtrl+O",             ID_FILE_OPEN
-        MENUITEM "&IÅ¡saugoti\tCtrl+S",              ID_FILE_SAVE
-        MENUITEM "IÅ¡saugoti &kaip...",              ID_FILE_SAVEAS
-        MENUITEM SEPARATOR
-        MENUITEM "S&pausdinti...\tCtrl+P",          ID_PRINT
-        MENUITEM "Spaudinio pe&ržiūra...",          ID_PREVIEW
-        MENUITEM "Puslapio n&uostatos...",          ID_PRINTSETUP
-        MENUITEM SEPARATOR
-        MENUITEM "IÅ¡&eiti",                         ID_FILE_EXIT
-    END
-    POPUP "&Taisa"
-    BEGIN
-        MENUITEM "&Atšaukti\tCtrl+Z",               ID_EDIT_UNDO
-        MENUITEM "&Grąžinti\tCtrl+Y",               ID_EDIT_REDO
-        MENUITEM SEPARATOR
-        MENUITEM "&IÅ¡kirpti\tCtrl+X",               ID_EDIT_CUT
-        MENUITEM "&Kopijuoti\tCtrl+C",              ID_EDIT_COPY
-        MENUITEM "Į&dėti\tCtrl+V",                  ID_EDIT_PASTE
-        MENUITEM "&Å alinti\tDEL",                   ID_EDIT_CLEAR
-        MENUITEM "&Pažymėti viską\tCtrl+A",         ID_EDIT_SELECTALL
-        MENUITEM SEPARATOR
-        MENUITEM "I&eškoti...\tCrtl+F",             ID_FIND
-        MENUITEM "Iešk&oti kito\tF3",               ID_FIND_NEXT
-        MENUITEM "Pa&keisti...\tCtrl+H",            ID_REPLACE
-        MENUITEM SEPARATOR
-        MENUITEM "Tik skait&ymui",                  ID_EDIT_READONLY
-        MENUITEM "&Modifikuotas",                   ID_EDIT_MODIFIED
-        MENUITEM SEPARATOR
-        POPUP "Papi&ldomi"
-        BEGIN
-            MENUITEM "Žymėjimo &informacija",      
ID_EDIT_SELECTIONINFO
-            MENUITEM "Rašmenų &formatas",           ID_EDIT_CHARFORMAT
-            MENUITEM "&Numatytas rašmenų formatas",
ID_EDIT_DEFCHARFORMAT
-            MENUITEM "&Pastraipos formatas",        ID_EDIT_PARAFORMAT
-            MENUITEM "&Gauti tekstą",               ID_EDIT_GETTEXT
-        END
-    END
-    POPUP "&Rodymas"
-    BEGIN
-        MENUITEM "&Įrankių juosta",                 ID_TOGGLE_TOOLBAR
-        MENUITEM "&Formatų juosta",                 ID_TOGGLE_FORMATBAR
-        MENUITEM "&Liniuotė",                       ID_TOGGLE_RULER
-        MENUITEM "&BÅ«senos juosta",                 ID_TOGGLE_STATUSBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Parinktys...",                   ID_VIEWPROPERTIES
-    END
-    POPUP "Įter&pimas"
-    BEGIN
-        MENUITEM "&Data ir laikas...",              ID_DATETIME
-    END
-    POPUP "F&ormatas"
-    BEGIN
-        MENUITEM "&Å riftas...",                     ID_FONTSETTINGS
-        MENUITEM "&Ženkleliai"                      ID_BULLET
-        MENUITEM "&Pastraipa..."                    ID_PARAFORMAT
-        MENUITEM "&Tabuliavimo žymės..."            ID_TABSTOPS
-        POPUP "&Fonas"
-        BEGIN
-            MENUITEM "&Sistemos\tCtrl+1",           ID_BACK_1
-            MENUITEM "&Gelsvas\tCtrl+2",            ID_BACK_2
-        END
-    END
-    POPUP "&Žinynas"
-    BEGIN
-        MENUITEM "&Apie Wine Wordpad"               ID_ABOUT
-    END
-END
-
-IDM_POPUP MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "&IÅ¡kirpti",    ID_EDIT_CUT
-        MENUITEM "&Kopijuoti",   ID_EDIT_COPY
-        MENUITEM "Į&dėti",       ID_EDIT_PASTE
-        MENUITEM SEPARATOR
-        MENUITEM "&Ženkleliai"   ID_BULLET
-        MENUITEM "&Pastraipa..." ID_PARAFORMAT
-    END
-END
-
-IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Data ir laikas"
-FONT 10, "MS Sans Serif"
-BEGIN
-    LTEXT        "Galimi formatai",-1,3,2,100,15
-    LISTBOX      IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY
-    PUSHBUTTON   "&Gerai",IDOK,87,12,40,12
-    PUSHBUTTON   "&Atsisakyti",IDCANCEL,87,26,40,12
-END
-
-IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Naujas"
-FONT 10, "MS Sans Serif"
-BEGIN
-    LTEXT        "Naujo dokumento tipas",-1,3,2,100,15
-    LISTBOX      IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT
-    PUSHBUTTON   "&Gerai",IDOK,97,12,40,12
-    PUSHBUTTON   "&Atsisakyti",IDCANCEL,97,26,40,12
-END
-
-IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-Caption "Pastraipos formatas"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "Įtrauka", -1, 10, 10, 120, 68
-    LTEXT "Iš kairės", -1, 15, 22, 45, 13
-    EDITTEXT IDC_PARA_LEFT, 60, 20, 55, 13
-    LTEXT "Iš dešinės", -1, 15, 40, 45, 13
-    EDITTEXT IDC_PARA_RIGHT, 60, 38, 55, 13
-    LTEXT "Pirmoji eilutė", -1, 15, 58, 45, 13
-    EDITTEXT IDC_PARA_FIRST, 60, 56, 55, 13
-    LTEXT "Lygiuotė", -1, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
-    PUSHBUTTON "&Gerai", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Atsisakyti", IDCANCEL, 137, 33, 50, 15
-END
-
-IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-Caption "Tabuliavimo žymės"
-FONT 8, "MS SHell DLg"
-BEGIN
-    GROUPBOX "Tabuliavimo pozicija", -1, 10, 10, 120, 90
-    COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
-    DEFPUSHBUTTON "&Pridėti", ID_TAB_ADD, 20, 80, 45, 15
-    PUSHBUTTON "Pa&Å¡alinti", ID_TAB_DEL, 72, 80, 45, 15
-    PUSHBUTTON "&Gerai", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Atsisakyti", IDCANCEL, 137, 33, 50, 15
-    PUSHBUTTON "Pašalinti &visas", ID_TAB_EMPTY, 137, 51, 50, 15
-END
-
-IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110
-STYLE DS_SYSMODAL
-Caption ""
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "Eilutės skaidymas", -1, 10, 10, 130, 85
-    RADIOBUTTON "&Eilutės neskaidomos", IDC_PAGEFMT_WN, 18, 25, 117, 15
-    RADIOBUTTON "Skaidyti tekstą prie lango &rėmelio", IDC_PAGEFMT_WW, 18, 45, 117, 15
-    RADIOBUTTON "Skaidyti tekstą prie &paraštės", IDC_PAGEFMT_WM, 18, 65, 117, 15
-    GROUPBOX "Įrankių juostos", -1, 150, 10, 120, 85
-    CHECKBOX "Įran&kių juosta", IDC_PAGEFMT_TB, 160, 20, 80, 15
-    CHECKBOX "&Formatų juosta", IDC_PAGEFMT_FB, 160, 38, 80, 15
-    CHECKBOX "&Liniuotė", IDC_PAGEFMT_RU, 160, 56, 80, 15
-    CHECKBOX "&BÅ«senos juosta", IDC_PAGEFMT_SB, 160, 74, 80, 15
-    LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_RICHTEXT_FILES_RTF,     "Raiškiojo teksto dokumentai (*.rtf)"
-    STRING_TEXT_FILES_TXT,         "Tekstiniai dokumentai (*.txt)"
-    STRING_TEXT_FILES_UNICODE_TXT, "Teksto unikodu dokumentai (*.txt)"
-    STRING_ALL_FILES,              "Visi dokumentai (*.*)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_ALIGN_LEFT,            "Kairinė"
-    STRING_ALIGN_RIGHT,           "Dešininė"
-    STRING_ALIGN_CENTER,          "Centrinė"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_NEWFILE_RICHTEXT,     "Raiškiojo teksto dokumentas"
-    STRING_NEWFILE_TXT,          "Tekstinis dokumentas"
-    STRING_NEWFILE_TXT_UNICODE,  "Teksto unikodu dokumentas"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PRINTER_FILES_PRN,        "Spausdintuvo failai (*.PRN)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_VIEWPROPS_TITLE,          "Parinktys"
-    STRING_VIEWPROPS_TEXT,           "Tekstas"
-    STRING_VIEWPROPS_RICHTEXT,       "Raiškusis tekstas"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PREVIEW_PRINT,            "Spausdinti"
-    STRING_PREVIEW_NEXTPAGE,         "Tolesnis puslapis"
-    STRING_PREVIEW_PREVPAGE,         "Ankstesnis puslapis"
-    STRING_PREVIEW_TWOPAGES,         "Du puslapiai"
-    STRING_PREVIEW_ONEPAGE,          "Vienas puslapis"
-    STRING_PREVIEW_CLOSE,            "Užverti"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_DEFAULT_FILENAME,     "Dokumentas"
-    STRING_PROMPT_SAVE_CHANGES,  "Išsaugoti „%s“ pakeitimus?"
-    STRING_SEARCH_FINISHED,      "Paieška dokumente baigta."
-    STRING_LOAD_RICHED_FAILED,   "Nepavyko įkelti RichEdit bibliotekos."
-    STRING_SAVE_LOSEFORMATTING,  "Jūs pasirinkote išsaugoti paprasto teksto
formatu, " \
-                                 "todėl bus prarastas visas formatavimas. " \
-                                 "Ar tikrai norite tai padaryti?"
-    STRING_INVALID_NUMBER,       "Neteisingas skaičiaus formatas"
-    STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE saugyklos dokumentai yra
nepalaikomi"
-    STRING_WRITE_FAILED,              "Nepavyko išsaugoti failo."
-    STRING_WRITE_ACCESS_DENIED,       "JÅ«s neturite prieigos failui
išsaugoti."
-    STRING_OPEN_FAILED,               "Nepavyko atverti failo."
-    STRING_OPEN_ACCESS_DENIED,        "JÅ«s neturite prieigos failui atverti."
-    STRING_PRINTING_NOT_IMPLEMENTED,  "Spausdinimas nerealizuotas"
-    STRING_MAX_TAB_STOPS,             "Negalima pridėti daugiau negu 32-jų
tabuliavimo pozicijų."
-END

Modified: trunk/reactos/base/applications/wordpad/Nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wordpad.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 IDM_MAINMENU MENU DISCARDABLE

Modified: trunk/reactos/base/applications/wordpad/No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2009 by Alexander N. Sørnes &lt;alex(a)thehandofagony.com&gt;
+ * Copyright 2006-2008 by Alexander N. Sørnes &lt;alex(a)thehandofagony.com&gt;
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,10 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wordpad.h"
-
-#pragma code_page(65001)
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 IDM_MAINMENU MENU DISCARDABLE
@@ -27,12 +23,12 @@
     POPUP "&Fil"
     BEGIN
         MENUITEM "&Ny...\tCtrl+N",            ID_FILE_NEW
-        MENUITEM "&Åpne...\tCtrl+O",       ID_FILE_OPEN
+        MENUITEM "&Åpne...\tCtrl+O",       ID_FILE_OPEN
         MENUITEM "&Lagre\tCtrl+S",            ID_FILE_SAVE
         MENUITEM "Lagre &som...",          ID_FILE_SAVEAS
         MENUITEM SEPARATOR
         MENUITEM "&Skriv ut...\tCtrl+P",   ID_PRINT
-        MENUITEM "&Forhåndsvisning...",    ID_PREVIEW
+        MENUITEM "&Forhåndsvisning...",    ID_PREVIEW
         MENUITEM "&Utskriftformat...",     ID_PRINTSETUP
         MENUITEM SEPARATOR
         MENUITEM "&Avslutt",                  ID_FILE_EXIT
@@ -48,8 +44,8 @@
         MENUITEM "&Fjern\tDEL",               ID_EDIT_CLEAR
         MENUITEM "&Merk alt\tCtrl+A",         ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
-        MENUITEM "&Søk etter...\tCrtl+F",  ID_FIND
-        MENUITEM "Søk etter &neste\tF3",      ID_FIND_NEXT
+        MENUITEM "&Søk etter...\tCrtl+F",  ID_FIND
+        MENUITEM "Søk etter &neste\tF3",      ID_FIND_NEXT
         MENUITEM "E&rstatt...\tCtrl+H",    ID_REPLACE
         MENUITEM SEPARATOR
         MENUITEM "S&krivebeskyttet",          ID_EDIT_READONLY
@@ -57,7 +53,7 @@
         MENUITEM SEPARATOR
         POPUP "&Ekstra"
         BEGIN
-            MENUITEM "&Info om merket område",            
ID_EDIT_SELECTIONINFO
+            MENUITEM "&Info om merket område",            
ID_EDIT_SELECTIONINFO
             MENUITEM "Tegn&format",           ID_EDIT_CHARFORMAT
             MENUITEM "Stan&dard tegnformat",          
ID_EDIT_DEFCHARFORMAT
             MENUITEM "&Avsnittformat",           ID_EDIT_PARAFORMAT
@@ -66,7 +62,7 @@
     END
     POPUP "&Vis"
     BEGIN
-        MENUITEM "Verk&tøylinje",     ID_TOGGLE_TOOLBAR
+        MENUITEM "Verk&tøylinje",     ID_TOGGLE_TOOLBAR
         MENUITEM "&Formatlinje",      ID_TOGGLE_FORMATBAR
         MENUITEM "&Linjal",           ID_TOGGLE_RULER
         MENUITEM "&Statuslinje",      ID_TOGGLE_STATUSBAR
@@ -138,9 +134,9 @@
     GROUPBOX "Innrykk", -1, 10, 10, 120, 68
     LTEXT "Venstre", -1, 15, 22, 40, 13
     EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
-    LTEXT "Høyre", -1, 15, 40, 40, 13
+    LTEXT "Høyre", -1, 15, 40, 40, 13
     EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
-    LTEXT "Første linje", -1, 15, 58, 40, 13
+    LTEXT "Første linje", -1, 15, 58, 40, 13
     EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
     LTEXT "Justering", -1, 15, 87, 40, 13
     COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
@@ -171,8 +167,8 @@
     RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
     RADIOBUTTON "Bryt tekst etter v&indusbredden", IDC_PAGEFMT_WW, 18, 45,
117, 15
     RADIOBUTTON "Bryt tekst etter &margen", IDC_PAGEFMT_WM, 18, 65, 117,
15
-    GROUPBOX "Verktøylinjer", -1, 150, 10, 120, 85
-    CHECKBOX "&Verktøylinje", IDC_PAGEFMT_TB, 160, 20, 80, 15
+    GROUPBOX "Verktøylinjer", -1, 150, 10, 120, 85
+    CHECKBOX "&Verktøylinje", IDC_PAGEFMT_TB, 160, 20, 80, 15
     CHECKBOX "&Formatlinje", IDC_PAGEFMT_FB, 160, 38, 80, 15
     CHECKBOX "&Linjal", IDC_PAGEFMT_RU, 160, 56, 80, 15
     CHECKBOX "&Statuslinje", IDC_PAGEFMT_SB, 160, 74, 80, 15
@@ -197,7 +193,7 @@
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_ALIGN_LEFT,            "Venstrestilt"
-    STRING_ALIGN_RIGHT,           "Høyrestilt"
+    STRING_ALIGN_RIGHT,           "Høyrestilt"
     STRING_ALIGN_CENTER,          "Midtstilt"
 END
 
@@ -219,7 +215,7 @@
     STRING_PREVIEW_NEXTPAGE,         "Neste side"
     STRING_PREVIEW_PREVPAGE,         "Forrige side"
     STRING_PREVIEW_TWOPAGES,         "To sider"
-    STRING_PREVIEW_ONEPAGE,          "Én side"
+    STRING_PREVIEW_ONEPAGE,          "Én side"
     STRING_PREVIEW_CLOSE,            "Lukk"
 END
 
@@ -231,18 +227,16 @@
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_DEFAULT_FILENAME,     "Dokument"
-    STRING_PROMPT_SAVE_CHANGES,  "Lagre endringer i «%s»?"
-    STRING_SEARCH_FINISHED,      "Ferdig med å søke i dokumentet."
+    STRING_PROMPT_SAVE_CHANGES,  "Lagre endringer i «%s»?"
+    STRING_SEARCH_FINISHED,      "Ferdig med å søke i dokumentet."
     STRING_LOAD_RICHED_FAILED,   "Klarte ikke laste RichEdit-biblioteket."
-    STRING_SAVE_LOSEFORMATTING,  "Du har valgt å lagre i rent tekstformat, noe som
" \
-                                 "vil føre til at all formatering går tapt. Er du
" \
-                                 "sikker på at du vil fortsette?"
+    STRING_SAVE_LOSEFORMATTING,  "Du har valgt å lagre i rent tekstformat, noe som
" \
+                                 "vil føre til at all formatering går tapt. Er du
" \
+                                 "sikker på at du vil fortsette?"
     STRING_INVALID_NUMBER,       "Ugyldig tallformat"
     STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not
supported"
     STRING_WRITE_FAILED,              "Klarte ikke lagre filen."
-    STRING_WRITE_ACCESS_DENIED,       "Du har ikke tilgang til å lagre
filen."
-    STRING_OPEN_FAILED,               "Klarte ikke åpne filen."
-    STRING_OPEN_ACCESS_DENIED,        "Du har ikke tilgang til å åpne
filen."
-    STRING_PRINTING_NOT_IMPLEMENTED,  "Utskriftfunksjonen er ikke laget
ennå."
-    STRING_MAX_TAB_STOPS,             "Kan ikke legge til mer enn 32
tabulatorstopp."
-END
+    STRING_WRITE_ACCESS_DENIED,       "Du har ikke tilgang til å lagre filen."
+    STRING_OPEN_FAILED,               "Klarte ikke åpne filen."
+    STRING_OPEN_ACCESS_DENIED,        "Du har ikke tilgang til å åpne filen."
+END

Modified: trunk/reactos/base/applications/wordpad/Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Pl.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Pl.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wordpad.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 IDM_MAINMENU MENU DISCARDABLE

Modified: trunk/reactos/base/applications/wordpad/Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Pt.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Pt.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "wordpad.h"
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/base/applications/wordpad/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wordpad.h"
-
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 IDM_MAINMENU MENU DISCARDABLE

Modified: trunk/reactos/base/applications/wordpad/Si.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wordpad.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -247,3 +245,5 @@
     STRING_PRINTING_NOT_IMPLEMENTED,  "Tiskanje (Å¡e) ni na voljo"
     STRING_MAX_TAB_STOPS,             "Ne morem vstaviti več kot 32 položajev
tabulatorja."
 END
+
+#pragma code_page(default)

Modified: trunk/reactos/base/applications/wordpad/Sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Sv.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Sv.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wordpad.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
@@ -246,3 +244,5 @@
     STRING_PRINTING_NOT_IMPLEMENTED, "Utskrift ej implementerat."
     STRING_MAX_TAB_STOPS,            "Kan ej lägga till mer än 32
tabbstopp."
 END
+
+#pragma code_page(default)

Modified: trunk/reactos/base/applications/wordpad/Tr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "wordpad.h"
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/base/applications/wordpad/Zh.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wordpad.h"
-
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
@@ -471,3 +469,5 @@
     STRING_OPEN_FAILED,               "不能開啟檔案."
     STRING_OPEN_ACCESS_DENIED,        "ä½ æ²’æœ‰é–‹å•Ÿæª”æ¡ˆçš„æ¬ŠåŠ›."
 END
+
+#pragma code_page(default)

Modified: trunk/reactos/base/applications/wordpad/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] Fri Jul 10 21:25:11 2009
@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include <windef.h>
+#include <winuser.h>
 
 #include "wordpad.h"
 
@@ -60,3 +63,20 @@
 
 /* @makedep: txt.ico */
 IDI_TXT ICON "txt.ico"
+
+#include "Da.rc"
+#include "De.rc"
+#include "En.rc"
+#include "Fr.rc"
+#include "Hu.rc"
+#include "Ja.rc"
+#include "Ko.rc"
+#include "Nl.rc"
+#include "No.rc"
+#include "Pl.rc"
+#include "Pt.rc"
+#include "Ru.rc"
+#include "Si.rc"
+#include "Sv.rc"
+#include "Tr.rc"
+#include "Zh.rc"

Modified: trunk/reactos/base/applications/wordpad/wordpad.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] Fri Jul 10 21:25:11
2009
@@ -17,9 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
-#include <winuser.h>
-
 #define MAX_STRING_LEN 255
 
 #define TWIPS_PER_INCH 1440