winhlp32: Move from a per resource to a global LANGUAGE setting.

programs/winhlp32/Bg.rc

@@ -20,9 +20,11 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&" {
   MENUITEM "&", MNID_FILE_OPEN
@@ -68,7 +70,7 @@ MAIN_MENU MENU LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE "
 STID_WHERROR, 		""

programs/winhlp32/Cs.rc

@@ -23,11 +23,13 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
 /* Czech strings in CP1250 */
 
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Soubor" {
   MENUITEM "&Otevt", MNID_FILE_OPEN
@@ -73,7 +75,7 @@ MAIN_MENU MENU LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Npovda WINE"
 STID_WHERROR, 		"CHYBA"

programs/winhlp32/De.rc

@@ -21,11 +21,13 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
 #pragma code_page(65001)
 
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+MAIN_MENU MENU
 {
  POPUP "&Datei" {
   MENUITEM "Ö&ffnen...", MNID_FILE_OPEN
@@ -70,7 +72,7 @@ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
  }
 }
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Index"
@@ -78,7 +80,7 @@ CAPTION "Index"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
-IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Suche"
@@ -88,7 +90,7 @@ CAPTION "Suche"
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE Hilfe"
 STID_WHERROR, 		"FEHLER"
@@ -106,7 +108,7 @@ STID_NO_RICHEDIT	"Die Richedit Implementation konnte nicht gefunden werden... Br
 STID_PSH_INDEX,		"Hilfethemen: "
 }
 
-CONTEXT_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+CONTEXT_MENU MENU
 BEGIN
 POPUP ""
 BEGIN

programs/winhlp32/En.rc

@@ -23,7 +23,9 @@
 
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+MAIN_MENU MENU
 {
  POPUP "&File" {
   MENUITEM "&Open", MNID_FILE_OPEN
@@ -68,7 +70,9 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
  }
 }
 
-MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+
+MAIN_MENU MENU
 {
  POPUP "&File" {
   MENUITEM "&Open", MNID_FILE_OPEN
@@ -113,7 +117,9 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
  }
 }
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Index"
@@ -121,7 +127,7 @@ CAPTION "Index"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
-IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Search"
@@ -130,7 +136,7 @@ CAPTION "Search"
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Wine Help"
 STID_WHERROR, 		"ERROR"
@@ -148,7 +154,7 @@ STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
 STID_PSH_INDEX,		"Help topics: "
 }
 
-CONTEXT_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+CONTEXT_MENU MENU
 BEGIN
 	POPUP ""
 	BEGIN
@@ -171,7 +177,9 @@ BEGIN
 	END
 END
 
-CONTEXT_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+
+CONTEXT_MENU MENU
 BEGIN
 	POPUP ""
 	BEGIN

programs/winhlp32/Eo.rc

@@ -21,11 +21,13 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
+
 /* Cxapelitaj literoj estas en Latin-3 iso8859-3 */
 
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Dosiero" {
   MENUITEM "&Malfermu", MNID_FILE_OPEN
@@ -71,7 +73,7 @@ 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"

programs/winhlp32/Es.rc

@@ -22,9 +22,11 @@
 
 #include "winhelp_res.h"
 
+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
@@ -69,7 +71,7 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
  }
 }
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "ndice"
@@ -77,7 +79,7 @@ CAPTION "ndice"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
-IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Buscar"
@@ -86,7 +88,7 @@ CAPTION "Buscar"
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Ayuda de WINE"
 STID_WHERROR, 		"ERROR"

programs/winhlp32/Fi.rc

@@ -22,9 +22,11 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Tiedosto" {
   MENUITEM "&Avaa...", MNID_FILE_OPEN
@@ -71,7 +73,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"

programs/winhlp32/Fr.rc

@@ -22,6 +22,8 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -74,7 +76,7 @@ MAIN_MENU MENU
  }
 }
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Index"
@@ -82,7 +84,7 @@ CAPTION "Index"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
-IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Recherche"
@@ -91,7 +93,7 @@ CAPTION "Recherche"
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Aide de Wine"
 STID_WHERROR, 		"ERREUR"

programs/winhlp32/Hu.rc

@@ -22,9 +22,11 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Fjl" {
   MENUITEM "&Megnyits...", MNID_FILE_OPEN
@@ -71,7 +73,7 @@ MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE sg"
 STID_WHERROR, 		"HIBA"

programs/winhlp32/It.rc

@@ -21,11 +21,13 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
 #pragma code_page(65001)
 
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+MAIN_MENU MENU
 {
  POPUP "&File" {
   MENUITEM "&Apri...", MNID_FILE_OPEN
@@ -70,7 +72,7 @@ MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
  }
 }
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Indice"
@@ -78,7 +80,7 @@ CAPTION "Indice"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
-IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Cerca"
@@ -87,7 +89,7 @@ CAPTION "Cerca"
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Guida di WINE"
 STID_WHERROR, 		"ERRORE"
@@ -105,7 +107,7 @@ STID_NO_RICHEDIT	"Non è stato possibile trovare un'implementazione richedit...
 STID_PSH_INDEX,		"Argomenti di aiuto: "
 }
 
-CONTEXT_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+CONTEXT_MENU MENU
 BEGIN
     POPUP ""
     BEGIN

programs/winhlp32/Ja.rc

@@ -21,12 +21,14 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
 /* UTF-8 */
 #pragma code_page(65001)
 
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "ファイル(&F)" {
   MENUITEM "開く(&O)", MNID_FILE_OPEN
@@ -71,7 +73,7 @@ MAIN_MENU MENU LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
  }
 }
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 9, "MS Shell Dlg"
 CAPTION "索引"
@@ -79,7 +81,7 @@ CAPTION "索引"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
-IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 9, "MS Shell Dlg"
 CAPTION "検索"
@@ -88,7 +90,7 @@ CAPTION "検索"
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE ヘルプ"
 STID_WHERROR, 		"エラー"
@@ -106,7 +108,7 @@ STID_NO_RICHEDIT	"リッチエディット実装が見つかりません... 終
 STID_PSH_INDEX,		"ヘルプ トピック: "
 }
 
-CONTEXT_MENU MENU LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+CONTEXT_MENU MENU
 BEGIN
 	POPUP ""
 	BEGIN

programs/winhlp32/Ko.rc

@@ -21,9 +21,11 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "파일(&F)" {
   MENUITEM "열기(&O)...", MNID_FILE_OPEN
@@ -69,7 +71,7 @@ MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 }
 
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 9, "MS Shell Dlg"
 CAPTION "인덱스"
@@ -77,7 +79,7 @@ CAPTION "인덱스"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
-IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 9, "MS Shell Dlg"
 CAPTION "찾기"
@@ -87,7 +89,7 @@ CAPTION "찾기"
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Wine 도움말"
 STID_WHERROR, 		"에러"
@@ -105,7 +107,7 @@ STID_NO_RICHEDIT	"richedit  구현을 찾을수 업습니다.. 취소중"
 STID_PSH_INDEX,		"도움말 목차: "
 }
 
-CONTEXT_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+CONTEXT_MENU MENU
 BEGIN
 	POPUP ""
 	BEGIN

programs/winhlp32/No.rc

@@ -20,9 +20,11 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+MAIN_MENU MENU
 {
  POPUP "&Fil" {
   MENUITEM "&pne", MNID_FILE_OPEN
@@ -67,7 +69,7 @@ MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
  }
 }
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Innhold"
@@ -75,7 +77,7 @@ CAPTION "Innhold"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
-IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Sk"
@@ -84,7 +86,7 @@ CAPTION "Sk"
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Hjelp"
 STID_WHERROR, 		"FEIL"
@@ -102,7 +104,7 @@ STID_NO_RICHEDIT	"Klarte ikke finne richedit; avbryter"
 STID_PSH_INDEX,		"Emner i Hjelp: "
 }
 
-CONTEXT_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+CONTEXT_MENU MENU
 BEGIN
     POPUP ""
     BEGIN

programs/winhlp32/Pt.rc

@@ -125,8 +125,9 @@ MAIN_MENU MENU
  }
 }
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Índice"
@@ -134,7 +135,7 @@ CAPTION "Índice"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
-IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Procura"
@@ -186,7 +187,9 @@ STID_PSH_INDEX,		"Tópicos de ajuda: "
 
 
 
-CONTEXT_MENU MENU LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+CONTEXT_MENU MENU
 BEGIN
 	POPUP ""
 	BEGIN
@@ -209,7 +212,9 @@ BEGIN
 	END
 END
 
-CONTEXT_MENU MENU LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+CONTEXT_MENU MENU
 BEGIN
 	POPUP ""
 	BEGIN

programs/winhlp32/Rm.rc

@@ -22,6 +22,8 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT
+
 #pragma code_page(65001)
 
 /* FIXME: This file is in the Vallader Romansh dialect and not in the
@@ -29,7 +31,7 @@
 
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Datoteca" {
   MENUITEM "&Rivir", MNID_FILE_OPEN
@@ -75,7 +77,7 @@ MAIN_MENU MENU LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP,         "WINE ag�d"
 STID_WHERROR,           "SBAGL"

programs/winhlp32/Si.rc

@@ -20,11 +20,13 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+
 #pragma code_page(65001)
 
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Datoteka" {
   MENUITEM "&Odpri", MNID_FILE_OPEN
@@ -69,7 +71,7 @@ MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
  }
 }
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Indeks"
@@ -77,7 +79,7 @@ CAPTION "Indeks"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
-IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Iskanje"
@@ -86,7 +88,7 @@ CAPTION "Iskanje"
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE Pomoč"
 STID_WHERROR, 		"NAPAKA"
@@ -104,7 +106,7 @@ STID_NO_RICHEDIT	"Ne morem najti knjižnice richedit ... Prekinjam"
 STID_PSH_INDEX,		"Teme pomoči: "
 }
 
-CONTEXT_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+CONTEXT_MENU MENU
 BEGIN
 	POPUP ""
 	BEGIN

programs/winhlp32/Sk.rc

@@ -20,7 +20,9 @@
 
 #include "winhelp_res.h"
 
-MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+
+MAIN_MENU MENU
 {
  POPUP "&Sbor" {
    MENUITEM "&Otvori...", MNID_FILE_OPEN
@@ -66,7 +68,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"

programs/winhlp32/Sv.rc

@@ -24,9 +24,11 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
+MAIN_MENU MENU
 {
  POPUP "&Arkiv" {
   MENUITEM "&ppna", MNID_FILE_OPEN
@@ -71,7 +73,7 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
  }
 }
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Index"
@@ -79,7 +81,7 @@ CAPTION "Index"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
-IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Sk"
@@ -88,7 +90,7 @@ CAPTION "Sk"
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"Wine Hjlp"
 STID_WHERROR, 		"FEL"
@@ -106,7 +108,7 @@ STID_NO_RICHEDIT	"Kan inte hitta en implementation av richedit... Avslutar"
 STID_PSH_INDEX,		"Hjlprubriker: "
 }
 
-CONTEXT_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
+CONTEXT_MENU MENU
 BEGIN
     POPUP ""
     BEGIN

programs/winhlp32/Tr.rc

@@ -20,9 +20,11 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Dosya" {
   MENUITEM "&A", MNID_FILE_OPEN
@@ -68,7 +70,7 @@ MAIN_MENU MENU LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 }
 
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE Yardm"
 STID_WHERROR, 		"HATA"

programs/winhlp32/Wa.rc

@@ -24,9 +24,11 @@
 
 #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
@@ -73,7 +75,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"