[ros-diffs] [cfinck] 28148: - 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.

cfinck at svn.reactos.org cfinck at svn.reactos.org
Fri Aug 3 23:36:54 CEST 2007


Author: cfinck
Date: Sat Aug  4 01:36:53 2007
New Revision: 28148

URL: http://svn.reactos.org/svn/reactos?rev=28148&view=rev
Log:
- 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.

Added:
    trunk/reactos/base/applications/winhelp/lang/pt-BR.rc
Modified:
    trunk/reactos/base/applications/winhelp/lang/bg-BG.rc
    trunk/reactos/base/applications/winhelp/lang/cs-CZ.rc
    trunk/reactos/base/applications/winhelp/lang/da-DK.rc
    trunk/reactos/base/applications/winhelp/lang/de-DE.rc
    trunk/reactos/base/applications/winhelp/lang/en-US.rc
    trunk/reactos/base/applications/winhelp/lang/eo-EO.rc
    trunk/reactos/base/applications/winhelp/lang/es-ES.rc
    trunk/reactos/base/applications/winhelp/lang/fi-FI.rc
    trunk/reactos/base/applications/winhelp/lang/hu-HU.rc
    trunk/reactos/base/applications/winhelp/lang/it-IT.rc
    trunk/reactos/base/applications/winhelp/lang/ko-KO.rc
    trunk/reactos/base/applications/winhelp/lang/nb-NO.rc
    trunk/reactos/base/applications/winhelp/lang/nl-NL.rc
    trunk/reactos/base/applications/winhelp/lang/pl-PL.rc
    trunk/reactos/base/applications/winhelp/lang/pt-PT.rc
    trunk/reactos/base/applications/winhelp/lang/ru-RU.rc
    trunk/reactos/base/applications/winhelp/lang/sk-SK.rc
    trunk/reactos/base/applications/winhelp/lang/sl-SI.rc
    trunk/reactos/base/applications/winhelp/lang/sv-SE.rc
    trunk/reactos/base/applications/winhelp/lang/tr-TR.rc
    trunk/reactos/base/applications/winhelp/lang/wa-WA.rc
    trunk/reactos/base/applications/winhelp/lang/zh-CN.rc
    trunk/reactos/base/applications/winhelp/rsrc.rc

Modified: trunk/reactos/base/applications/winhelp/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/bg-BG.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/bg-BG.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/bg-BG.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 }
 
 /* Strings */
+
 STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Ïîìîù"

Modified: trunk/reactos/base/applications/winhelp/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/cs-CZ.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/cs-CZ.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/cs-CZ.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Nápovìda WINE"
 STID_WHERROR, 		"CHYBA"

Modified: trunk/reactos/base/applications/winhelp/lang/da-DK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/da-DK.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/da-DK.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/da-DK.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE Hjælp"
 STID_WHERROR, 		"FEJL"

Modified: trunk/reactos/base/applications/winhelp/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/de-DE.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/de-DE.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/de-DE.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE Hilfe"
 STID_WHERROR, 		"FEHLER"

Modified: trunk/reactos/base/applications/winhelp/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/en-US.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/en-US.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/en-US.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE Help"
 STID_WHERROR, 		"ERROR"

Modified: trunk/reactos/base/applications/winhelp/lang/eo-EO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/eo-EO.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/eo-EO.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/eo-EO.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE Helpanto"
 STID_WHERROR, 		"ERARO"

Modified: trunk/reactos/base/applications/winhelp/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/es-ES.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/es-ES.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/es-ES.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Ayuda de WINE"
 STID_WHERROR, 		"ERROR"

Modified: trunk/reactos/base/applications/winhelp/lang/fi-FI.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/fi-FI.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/fi-FI.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/fi-FI.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE Ohje"
 STID_WHERROR, 		"VIRHE"

Modified: trunk/reactos/base/applications/winhelp/lang/hu-HU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/hu-HU.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/hu-HU.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/hu-HU.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE súgó"
 STID_WHERROR, 		"HIBA"

Modified: trunk/reactos/base/applications/winhelp/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/it-IT.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/it-IT.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/it-IT.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Guida di WINE"
 STID_WHERROR, 		"ERRORE"

Modified: trunk/reactos/base/applications/winhelp/lang/ko-KO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/ko-KO.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/ko-KO.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/ko-KO.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Wine µµ¿ò¸»"
 STID_WHERROR, 		"¿À·ù"

Modified: trunk/reactos/base/applications/winhelp/lang/nb-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/nb-NO.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/nb-NO.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/nb-NO.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Hjelp"
 STID_WHERROR, 		"FEIL"

Modified: trunk/reactos/base/applications/winhelp/lang/nl-NL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/nl-NL.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/nl-NL.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/nl-NL.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE Help"
 STID_WHERROR, 		"FOUT"

Modified: trunk/reactos/base/applications/winhelp/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/pl-PL.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/pl-PL.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/pl-PL.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE - Pomoc"
 STID_WHERROR, 		"B£¥D"

Added: trunk/reactos/base/applications/winhelp/lang/pt-BR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/pt-BR.rc?rev=28148&view=auto
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/pt-BR.rc (added)
+++ trunk/reactos/base/applications/winhelp/lang/pt-BR.rc Sat Aug  4 01:36:53 2007
@@ -1,0 +1,77 @@
+/*
+ * Help Viewer
+ * Portuguese Language Support
+ *
+ * Copyright 1996 Ulrich Schmid
+ * Portuguese translation by Gustavo Junior Alves <alves at correionet.com.br>
+ * Copyright 2002 Sylvain Petreolle <spetreolle at yahoo.fr>
+ * Copyright 2003 Marcelo Duarte
+ * Copyright 2004 Américo José Melo
+ *
+ * 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
+ */
+
+/* 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
+ }
+}
+
+/* Strings */
+
+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?"
+}

Modified: trunk/reactos/base/applications/winhelp/lang/pt-PT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/pt-PT.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/pt-PT.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/pt-PT.rc Sat Aug  4 01:36:53 2007
@@ -24,37 +24,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
 
@@ -89,28 +58,6 @@
 
 /* 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"

Modified: trunk/reactos/base/applications/winhelp/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/ru-RU.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/ru-RU.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/ru-RU.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Ñïðàâêà WINE"
 STID_WHERROR, 		"ÎØÈÁÊÀ"

Modified: trunk/reactos/base/applications/winhelp/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/sk-SK.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/sk-SK.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/sk-SK.rc Sat Aug  4 01:36:53 2007
@@ -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...", MNID_FILE_OPEN
@@ -47,7 +49,7 @@
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,             "WINE Pomoc"
 STID_WHERROR,               "CHYBA"

Modified: trunk/reactos/base/applications/winhelp/lang/sl-SI.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/sl-SI.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/sl-SI.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/sl-SI.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 		"WINE Pomoè"
 STID_WHERROR, 		"NAPAKA"

Modified: trunk/reactos/base/applications/winhelp/lang/sv-SE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/sv-SE.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/sv-SE.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/sv-SE.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE Hjälp"
 STID_WHERROR, 		"FEL"

Modified: trunk/reactos/base/applications/winhelp/lang/tr-TR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/tr-TR.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/tr-TR.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/tr-TR.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE Yardým"
 STID_WHERROR, 		"HATA"

Modified: trunk/reactos/base/applications/winhelp/lang/wa-WA.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/wa-WA.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/wa-WA.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/wa-WA.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Aidance di WINE"
 STID_WHERROR, 		"AROKE"
@@ -72,5 +72,3 @@
 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 */

Modified: trunk/reactos/base/applications/winhelp/lang/zh-CN.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/lang/zh-CN.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/lang/zh-CN.rc (original)
+++ trunk/reactos/base/applications/winhelp/lang/zh-CN.rc Sat Aug  4 01:36:53 2007
@@ -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 @@
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE °ïÖú"
 STID_WHERROR, 		"´íÎó"

Modified: trunk/reactos/base/applications/winhelp/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/rsrc.rc?rev=28148&r1=28147&r2=28148&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhelp/rsrc.rc (original)
+++ trunk/reactos/base/applications/winhelp/rsrc.rc Sat Aug  4 01:36:53 2007
@@ -38,11 +38,12 @@
 #include "lang/nl-NL.rc"
 #include "lang/nb-NO.rc"
 #include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
 #include "lang/pt-PT.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sl-SI.rc"
 #include "lang/sk-SK.rc"
 #include "lang/sv-SE.rc"
 #include "lang/tr-TR.rc"
-#include "lang/wa-WA.rc"
+//#include "lang/wa-WA.rc"
 #include "lang/zh-CN.rc"




More information about the Ros-diffs mailing list