- Define one LANGUAGE, SUBLANG pair per resource file and not per resource.

  This makes it easier for translators and also fixes a mix-up of languages.
- Move the brazilian translations from pt-PT.rc to a new pt-BR.rc file.
- Remove the "#ifdef LANG_WALON" statement from wa-WA.rc and disable this resource file in rsrc.rc instead like it's done for eo-EO.rc.
  These are WINE-specific LANG defines. We also have them in include/reactos/wine/winnt.h, but this file is not included. It has to be decided later how to handle these languages.

See issue #2523 for more details.

svn path=/trunk/; revision=28148

diff --git a/reactos/base/applications/winhelp/lang/bg-BG.rc b/reactos/base/applications/winhelp/lang/bg-BG.rc
index 1b89c46..a489f6d 100644 (file)
--- a/reactos/base/applications/winhelp/lang/bg-BG.rc
+++ b/reactos/base/applications/winhelp/lang/bg-BG.rc
@@ -19,9 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Ôàéë" {
   MENUITEM "&Îòâàðÿíå", MNID_FILE_OPEN
@@ -51,6 +53,7 @@ MAIN_MENU MENU LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 }
 
 /* Strings */
+
 STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "Ïîìîù"

diff --git a/reactos/base/applications/winhelp/lang/cs-CZ.rc b/reactos/base/applications/winhelp/lang/cs-CZ.rc
index 06c2e17..d71ed78 100644 (file)
--- a/reactos/base/applications/winhelp/lang/cs-CZ.rc
+++ b/reactos/base/applications/winhelp/lang/cs-CZ.rc
@@ -23,9 +23,11 @@
 
 /* Czech strings in CP1250 */
 
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Soubor" {
   MENUITEM "&Otevøít", MNID_FILE_OPEN
@@ -55,7 +57,8 @@ MAIN_MENU MENU LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "Nápovìda WINE"
 STID_WHERROR,          "CHYBA"

diff --git a/reactos/base/applications/winhelp/lang/da-DK.rc b/reactos/base/applications/winhelp/lang/da-DK.rc
index 522cdae..c5001dd 100644 (file)
--- a/reactos/base/applications/winhelp/lang/da-DK.rc
+++ b/reactos/base/applications/winhelp/lang/da-DK.rc
@@ -19,9 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Filer" {
   MENUITEM "Å&bn...", MNID_FILE_OPEN
@@ -53,7 +55,7 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "WINE Hjælp"
 STID_WHERROR,          "FEJL"

diff --git a/reactos/base/applications/winhelp/lang/de-DE.rc b/reactos/base/applications/winhelp/lang/de-DE.rc
index 8ec84cd..46ec232 100644 (file)
--- a/reactos/base/applications/winhelp/lang/de-DE.rc
+++ b/reactos/base/applications/winhelp/lang/de-DE.rc
@@ -19,9 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+MAIN_MENU MENU
 {
  POPUP "&Datei" {
   MENUITEM "Ö&ffnen...", MNID_FILE_OPEN
@@ -52,7 +54,7 @@ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "WINE Hilfe"
 STID_WHERROR,          "FEHLER"

diff --git a/reactos/base/applications/winhelp/lang/en-US.rc b/reactos/base/applications/winhelp/lang/en-US.rc
index 8111f1e..2e7e738 100644 (file)
--- a/reactos/base/applications/winhelp/lang/en-US.rc
+++ b/reactos/base/applications/winhelp/lang/en-US.rc
@@ -19,9 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+MAIN_MENU MENU
 {
  POPUP "&File" {
   MENUITEM "&Open", MNID_FILE_OPEN
@@ -51,7 +53,8 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "WINE Help"
 STID_WHERROR,          "ERROR"

diff --git a/reactos/base/applications/winhelp/lang/eo-EO.rc b/reactos/base/applications/winhelp/lang/eo-EO.rc
index cc8ef66..26f87a3 100644 (file)
--- a/reactos/base/applications/winhelp/lang/eo-EO.rc
+++ b/reactos/base/applications/winhelp/lang/eo-EO.rc
@@ -21,9 +21,11 @@
 
 /* Cxapelitaj literoj estas en Latin-3 iso8859-3 */
 
+LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Dosiero" {
   MENUITEM "&Malfermu", MNID_FILE_OPEN
@@ -53,7 +55,8 @@ MAIN_MENU MENU LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "WINE Helpanto"
 STID_WHERROR,          "ERARO"

diff --git a/reactos/base/applications/winhelp/lang/es-ES.rc b/reactos/base/applications/winhelp/lang/es-ES.rc
index 93d9223..434bc50 100644 (file)
--- a/reactos/base/applications/winhelp/lang/es-ES.rc
+++ b/reactos/base/applications/winhelp/lang/es-ES.rc
@@ -20,9 +20,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+MAIN_MENU MENU
 {
  POPUP "&Archivo" {
   MENUITEM "A&brir...", MNID_FILE_OPEN
@@ -52,7 +54,8 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "Ayuda de WINE"
 STID_WHERROR,          "ERROR"

diff --git a/reactos/base/applications/winhelp/lang/fi-FI.rc b/reactos/base/applications/winhelp/lang/fi-FI.rc
index 90de636..fceeb1c 100644 (file)
--- a/reactos/base/applications/winhelp/lang/fi-FI.rc
+++ b/reactos/base/applications/winhelp/lang/fi-FI.rc
@@ -20,9 +20,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Tiedosto" {
   MENUITEM "&Avaa...", MNID_FILE_OPEN
@@ -53,7 +55,7 @@ MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "WINE Ohje"
 STID_WHERROR,          "VIRHE"

diff --git a/reactos/base/applications/winhelp/lang/hu-HU.rc b/reactos/base/applications/winhelp/lang/hu-HU.rc
index 8f4ef53..30f370c 100644 (file)
--- a/reactos/base/applications/winhelp/lang/hu-HU.rc
+++ b/reactos/base/applications/winhelp/lang/hu-HU.rc
@@ -20,9 +20,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Fájl" {
   MENUITEM "&Megnyitás...", MNID_FILE_OPEN
@@ -53,7 +55,7 @@ MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "WINE súgó"
 STID_WHERROR,          "HIBA"

diff --git a/reactos/base/applications/winhelp/lang/it-IT.rc b/reactos/base/applications/winhelp/lang/it-IT.rc
index bce3f14..6af57cd 100644 (file)
--- a/reactos/base/applications/winhelp/lang/it-IT.rc
+++ b/reactos/base/applications/winhelp/lang/it-IT.rc
@@ -19,9 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+MAIN_MENU MENU
 {
  POPUP "&File" {
   MENUITEM "&Apri...", MNID_FILE_OPEN
@@ -52,7 +54,7 @@ MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "Guida di WINE"
 STID_WHERROR,          "ERRORE"

diff --git a/reactos/base/applications/winhelp/lang/ko-KO.rc b/reactos/base/applications/winhelp/lang/ko-KO.rc
index 5b0be46..e16dace 100644 (file)
--- a/reactos/base/applications/winhelp/lang/ko-KO.rc
+++ b/reactos/base/applications/winhelp/lang/ko-KO.rc
@@ -19,9 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "ÆÄÀÏ(&F)" {
   MENUITEM "¿­±â(&O)...", MNID_FILE_OPEN
@@ -52,7 +54,7 @@ MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "Wine µµ¿ò¸»"
 STID_WHERROR,          "¿À·ù"

diff --git a/reactos/base/applications/winhelp/lang/nb-NO.rc b/reactos/base/applications/winhelp/lang/nb-NO.rc
index d7baf2b..734c41b 100644 (file)
--- a/reactos/base/applications/winhelp/lang/nb-NO.rc
+++ b/reactos/base/applications/winhelp/lang/nb-NO.rc
@@ -18,9 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+MAIN_MENU MENU
 {
  POPUP "&Fil" {
   MENUITEM "&Åpne", MNID_FILE_OPEN
@@ -50,7 +52,7 @@ MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "Hjelp"
 STID_WHERROR,          "FEIL"

diff --git a/reactos/base/applications/winhelp/lang/nl-NL.rc b/reactos/base/applications/winhelp/lang/nl-NL.rc
index 44ecd90..8e545ab 100644 (file)
--- a/reactos/base/applications/winhelp/lang/nl-NL.rc
+++ b/reactos/base/applications/winhelp/lang/nl-NL.rc
@@ -18,9 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+MAIN_MENU MENU
 {
  POPUP "&Bestand" {
   MENUITEM "&Openen", MNID_FILE_OPEN
@@ -50,7 +52,7 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "WINE Help"
 STID_WHERROR,          "FOUT"

diff --git a/reactos/base/applications/winhelp/lang/pl-PL.rc b/reactos/base/applications/winhelp/lang/pl-PL.rc
index 1c90a0c..21370b6 100644 (file)
--- a/reactos/base/applications/winhelp/lang/pl-PL.rc
+++ b/reactos/base/applications/winhelp/lang/pl-PL.rc
@@ -20,9 +20,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Plik" {
   MENUITEM "&Otwórz", MNID_FILE_OPEN
@@ -52,7 +54,7 @@ MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "WINE - Pomoc"
 STID_WHERROR,          "B£¥D"

diff --git a/reactos/base/applications/winhelp/lang/pt-BR.rc b/reactos/base/applications/winhelp/lang/pt-BR.rc
new file mode 100644 (file)
index 0000000..58a55c5
--- /dev/null
+++ b/reactos/base/applications/winhelp/lang/pt-BR.rc
@@ -0,0 +1,77 @@
+/*\r
+ * Help Viewer\r
+ * Portuguese Language Support\r
+ *\r
+ * Copyright 1996 Ulrich Schmid\r
+ * Portuguese translation by Gustavo Junior Alves <alves@correionet.com.br>\r
+ * Copyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r
+ * Copyright 2003 Marcelo Duarte\r
+ * Copyright 2004 Américo José Melo\r
+ *\r
+ * This library is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU Lesser General Public\r
+ * License as published by the Free Software Foundation; either\r
+ * version 2.1 of the License, or (at your option) any later version.\r
+ *\r
+ * This library is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
+ * Lesser General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU Lesser General Public\r
+ * License along with this library; if not, write to the Free Software\r
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA\r
+ */\r
+\r
+/* Menu */\r
+\r
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN\r
+\r
+MAIN_MENU MENU\r
+{\r
+ POPUP "&Arquivo" {\r
+  MENUITEM "&Abrir...", MNID_FILE_OPEN\r
+  MENUITEM SEPARATOR\r
+  MENUITEM "&Imprimir", MNID_FILE_PRINT\r
+  MENUITEM "&Configurar Impressora...", MNID_FILE_SETUP\r
+   MENUITEM SEPARATOR\r
+  MENUITEM "Sai&r", MNID_FILE_EXIT\r
+ }\r
+ POPUP "&Editar" {\r
+   MENUITEM "&Copiar...", MNID_EDIT_COPYDLG\r
+   MENUITEM SEPARATOR\r
+   MENUITEM "&Anotar...", MNID_EDIT_ANNOTATE\r
+ }\r
+ POPUP "In&dicador" {\r
+   MENUITEM "&Definir...", MNID_BKMK_DEFINE\r
+ }\r
+ POPUP "Aj&uda" {\r
+   MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON\r
+   MENUITEM "Sempre &visível", MNID_HELP_HELPTOP\r
+   MENUITEM SEPARATOR\r
+   MENUITEM "&Informações...", MNID_HELP_ABOUT\r
+#ifdef WINELIB\r
+   MENUITEM "&Sobre WINE", MNID_HELP_WINE\r
+#endif\r
+ }\r
+}\r
+\r
+/* Strings */\r
+\r
+STRINGTABLE DISCARDABLE\r
+{\r
+STID_WINE_HELP,        "Ajuda WINE"\r
+STID_WHERROR,          "ERRO"\r
+STID_WARNING,                  "AVISO"\r
+STID_INFO,             "Informação"\r
+STID_NOT_IMPLEMENTED,  "Não implementado"\r
+STID_HLPFILE_ERROR_s,  "Erro encontrado na leitura do arquivo de ajuda '%s'"\r
+STID_CONTENTS,                 "&Conteúdo"\r
+STID_SEARCH,           "&Procurar"\r
+STID_BACK,             "&Voltar"\r
+STID_HISTORY,          "&Histórico"\r
+STID_TOPICS,           "&Tópicos"\r
+STID_ALL_FILES,        "Todos os arquivos (*.*)"\r
+STID_HELP_FILES_HLP,   "Arquivos de ajuda (*.hlp)"\r
+STID_FILE_NOT_FOUND_s   "Cannot find '%s'. Do you want to find this file yourself?"\r
+}\r

diff --git a/reactos/base/applications/winhelp/lang/pt-PT.rc b/reactos/base/applications/winhelp/lang/pt-PT.rc
index d080c19..4c7223a 100644 (file)
--- a/reactos/base/applications/winhelp/lang/pt-PT.rc
+++ b/reactos/base/applications/winhelp/lang/pt-PT.rc
@@ -25,37 +25,6 @@
 
 /* Menu */
 
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
-MAIN_MENU MENU
-{
- POPUP "&Arquivo" {
-  MENUITEM "&Abrir...", MNID_FILE_OPEN
-  MENUITEM SEPARATOR
-  MENUITEM "&Imprimir", MNID_FILE_PRINT
-  MENUITEM "&Configurar Impressora...", MNID_FILE_SETUP
-   MENUITEM SEPARATOR
-  MENUITEM "Sai&r", MNID_FILE_EXIT
- }
- POPUP "&Editar" {
-   MENUITEM "&Copiar...", MNID_EDIT_COPYDLG
-   MENUITEM SEPARATOR
-   MENUITEM "&Anotar...", MNID_EDIT_ANNOTATE
- }
- POPUP "In&dicador" {
-   MENUITEM "&Definir...", MNID_BKMK_DEFINE
- }
- POPUP "Aj&uda" {
-   MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON
-   MENUITEM "Sempre &visível", MNID_HELP_HELPTOP
-   MENUITEM SEPARATOR
-   MENUITEM "&Informações...", MNID_HELP_ABOUT
-#ifdef WINELIB
-   MENUITEM "&Sobre WINE", MNID_HELP_WINE
-#endif
- }
-}
-
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 MAIN_MENU MENU
@@ -89,28 +58,6 @@ MAIN_MENU MENU
 
 /* Strings */
 
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
-STRINGTABLE DISCARDABLE
-{
-STID_WINE_HELP,        "Ajuda WINE"
-STID_WHERROR,          "ERRO"
-STID_WARNING,                  "AVISO"
-STID_INFO,             "Informação"
-STID_NOT_IMPLEMENTED,  "Não implementado"
-STID_HLPFILE_ERROR_s,  "Erro encontrado na leitura do arquivo de ajuda '%s'"
-STID_CONTENTS,                 "&Conteúdo"
-STID_SEARCH,           "&Procurar"
-STID_BACK,             "&Voltar"
-STID_HISTORY,          "&Histórico"
-STID_TOPICS,           "&Tópicos"
-STID_ALL_FILES,        "Todos os arquivos (*.*)"
-STID_HELP_FILES_HLP,   "Arquivos de ajuda (*.hlp)"
-STID_FILE_NOT_FOUND_s   "Cannot find '%s'. Do you want to find this file yourself?"
-}
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
 STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "Ajuda WINE"

diff --git a/reactos/base/applications/winhelp/lang/ru-RU.rc b/reactos/base/applications/winhelp/lang/ru-RU.rc
index c07a743..9d28ee0 100644 (file)
--- a/reactos/base/applications/winhelp/lang/ru-RU.rc
+++ b/reactos/base/applications/winhelp/lang/ru-RU.rc
@@ -18,9 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Ôàéë" {
   MENUITEM "&Îòêðûòü", MNID_FILE_OPEN
@@ -50,7 +52,7 @@ MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "Ñïðàâêà WINE"
 STID_WHERROR,          "ÎØÈÁÊÀ"

diff --git a/reactos/base/applications/winhelp/lang/sk-SK.rc b/reactos/base/applications/winhelp/lang/sk-SK.rc
index c8e713f..8118d95 100644 (file)
--- a/reactos/base/applications/winhelp/lang/sk-SK.rc
+++ b/reactos/base/applications/winhelp/lang/sk-SK.rc
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+
+MAIN_MENU MENU
 {
  POPUP "&Súbor" {
    MENUITEM "&Otvori\9d...", MNID_FILE_OPEN
@@ -47,7 +49,7 @@ MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,             "WINE Pomoc"
 STID_WHERROR,               "CHYBA"

diff --git a/reactos/base/applications/winhelp/lang/sl-SI.rc b/reactos/base/applications/winhelp/lang/sl-SI.rc
index d587908..a45362e 100644 (file)
--- a/reactos/base/applications/winhelp/lang/sl-SI.rc
+++ b/reactos/base/applications/winhelp/lang/sl-SI.rc
@@ -18,9 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Datoteka" {
   MENUITEM "&Odpri ...", MNID_FILE_OPEN
@@ -50,7 +52,7 @@ MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,                "WINE Pomoè"
 STID_WHERROR,          "NAPAKA"

diff --git a/reactos/base/applications/winhelp/lang/sv-SE.rc b/reactos/base/applications/winhelp/lang/sv-SE.rc
index 06d007c..65c6c24 100644 (file)
--- a/reactos/base/applications/winhelp/lang/sv-SE.rc
+++ b/reactos/base/applications/winhelp/lang/sv-SE.rc
@@ -20,9 +20,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
+MAIN_MENU MENU
 {
  POPUP "&Arkiv" {
   MENUITEM "&Öppna...", MNID_FILE_OPEN
@@ -53,7 +55,7 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "WINE Hjälp"
 STID_WHERROR,          "FEL"

diff --git a/reactos/base/applications/winhelp/lang/tr-TR.rc b/reactos/base/applications/winhelp/lang/tr-TR.rc
index 9578e8b..968701a 100644 (file)
--- a/reactos/base/applications/winhelp/lang/tr-TR.rc
+++ b/reactos/base/applications/winhelp/lang/tr-TR.rc
@@ -18,9 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Dosya" {
   MENUITEM "&Aç", MNID_FILE_OPEN
@@ -50,7 +52,7 @@ MAIN_MENU MENU LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "WINE Yardým"
 STID_WHERROR,          "HATA"

diff --git a/reactos/base/applications/winhelp/lang/wa-WA.rc b/reactos/base/applications/winhelp/lang/wa-WA.rc
index c536d2a..720dde8 100644 (file)
--- a/reactos/base/applications/winhelp/lang/wa-WA.rc
+++ b/reactos/base/applications/winhelp/lang/wa-WA.rc
@@ -20,11 +20,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifdef LANG_WALON
+LANGUAGE LANG_WALON, SUBLANG_DEFAULT
 
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Fitchî" {
   MENUITEM "&Drovî...", MNID_FILE_OPEN
@@ -55,7 +55,7 @@ MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "Aidance di WINE"
 STID_WHERROR,          "AROKE"
@@ -72,5 +72,3 @@ STID_ALL_FILES,       "Tos les fitch
 STID_HELP_FILES_HLP,   "Fitchîs d' aide (*.hlp)"
 STID_FILE_NOT_FOUND_s  "Cannot find '%s'. Do you want to find this file yourself?"
 }
-
-#endif  /* LANG_WALON */

diff --git a/reactos/base/applications/winhelp/lang/zh-CN.rc b/reactos/base/applications/winhelp/lang/zh-CN.rc
index 8c0689b..8beb04e 100644 (file)
--- a/reactos/base/applications/winhelp/lang/zh-CN.rc
+++ b/reactos/base/applications/winhelp/lang/zh-CN.rc
@@ -21,7 +21,9 @@
 
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+
+MAIN_MENU MENU
 {
  POPUP "Îļþ£¨&F£©" {
   MENUITEM "´ò¿ª£¨&O£©", MNID_FILE_OPEN
@@ -51,7 +53,7 @@ MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,        "WINE °ïÖú"
 STID_WHERROR,          "´íÎó"

diff --git a/reactos/base/applications/winhelp/rsrc.rc b/reactos/base/applications/winhelp/rsrc.rc
index 77d7803..b262c29 100644 (file)
--- a/reactos/base/applications/winhelp/rsrc.rc
+++ b/reactos/base/applications/winhelp/rsrc.rc
@@ -38,11 +38,12 @@
 #include "lang/nl-NL.rc"\r
 #include "lang/nb-NO.rc"\r
 #include "lang/pl-PL.rc"\r
+#include "lang/pt-BR.rc"\r
 #include "lang/pt-PT.rc"\r
 #include "lang/ru-RU.rc"\r
 #include "lang/sl-SI.rc"\r
 #include "lang/sk-SK.rc"\r
 #include "lang/sv-SE.rc"\r
 #include "lang/tr-TR.rc"\r
-#include "lang/wa-WA.rc"\r
+//#include "lang/wa-WA.rc"\r
 #include "lang/zh-CN.rc"\r