this patch gets rid of all explicit reference to resources, and uses
instead some constants
this should be a noop
A+
Name: wh_res
ChangeLog: no longer using explicit values for resource identification
License: X11
GenDate: 2002/10/20 09:41:36 UTC
ModifiedFiles: programs/winhelp/Da.rc programs/winhelp/De.rc programs/winhelp/En.rc programs/winhelp/Es.rc programs/winhelp/Fi.rc programs/winhelp/Fr.rc programs/winhelp/Hu.rc programs/winhelp/It.rc programs/winhelp/Ko.rc programs/winhelp/Pt.rc programs/winhelp/Si.rc programs/winhelp/Sk.rc programs/winhelp/Sw.rc programs/winhelp/Va.rc programs/winhelp/Wa.rc programs/winhelp/Makefile.in programs/winhelp/macro.c programs/winhelp/winhelp.c programs/winhelp/winhelp_res.h
AddedFiles:
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/Da.rc,v
retrieving revision 1.4
diff -u -u -r1.4 Da.rc
--- programs/winhelp/Da.rc 1 Jun 2002 02:55:52 -0000 1.4
+++ programs/winhelp/Da.rc 19 Oct 2002 08:41:51 -0000
@@ -24,28 +24,28 @@
MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL
{
POPUP "&Filer" {
- MENUITEM "Å&bn...", 0x101
+ MENUITEM "Å&bn...", MNID_FILE_OPEN
MENUITEM SEPARATOR
- MENUITEM "&Udskriv emne", 0x104
- MENUITEM "&Indstil printer", 0x106
+ MENUITEM "&Udskriv emne", MNID_FILE_PRINT
+ MENUITEM "&Indstil printer", MNID_FILE_SETUP
MENUITEM SEPARATOR
- MENUITEM "&Afslut", 0x108
+ MENUITEM "&Afslut", MNID_FILE_EXIT
}
POPUP "&Rediger" {
- MENUITEM "K&opier...", 0x10A
+ MENUITEM "K&opier...", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
- MENUITEM "&Anmærk...", 0x10C
+ MENUITEM "&Anmærk...", MNID_EDIT_ANNOTATE
}
POPUP "Bog&mærke" {
- MENUITEM "&Definer...", 0x10E
+ MENUITEM "&Definer...", MNID_BKMK_DEFINE
}
POPUP "&Hjælp" {
- MENUITEM "&Brug af Hjælp", 0x110
- MENUITEM "Altid &øverst", 0x111
+ MENUITEM "&Brug af Hjælp", MNID_HELP_HELPON
+ MENUITEM "Altid &øverst", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
- MENUITEM "&Info...", 0x113
+ MENUITEM "&Info...", MNID_HELP_ABOUT
#ifdef WINELIB
- MENUITEM "Om &WINE", 0x114
+ MENUITEM "Om &WINE", MNID_HELP_WINE
#endif
}
}
@@ -54,16 +54,17 @@
STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL
{
-WINE_HELP, "WINE Hjælp"
-WHERROR, "FEJL"
-WARNING, "ADVARSEL"
-INFO, "Information"
-NOT_IMPLEMENTED, "Ikke implementeret"
-HLPFILE_ERROR_s, "Fejl ved læsning af filen `%s'"
-CONTENTS, "&Indhold"
-SEARCH, "&Søg"
-BACK, "&Tilbage"
-HISTORY, "&Oversigt"
-ALL_FILES, "Alle filer (*.*)"
-HELP_FILES_HLP, "Hjælpe filer (*.hlp)"
+STID_WINE_HELP, "WINE Hjælp"
+STID_WHERROR, "FEJL"
+STID_WARNING, "ADVARSEL"
+STID_INFO, "Information"
+STID_NOT_IMPLEMENTED, "Ikke implementeret"
+STID_HLPFILE_ERROR_s, "Fejl ved læsning af filen `%s'"
+STID_CONTENTS, "&Indhold"
+STID_SEARCH, "&Søg"
+STID_BACK, "&Tilbage"
+STID_HISTORY, "&Oversigt"
+STID_TOPICS, "To&pics"
+STID_ALL_FILES, "Alle filer (*.*)"
+STID_HELP_FILES_HLP, "Hjælpe filer (*.hlp)"
}
Index: programs/winhelp/De.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/De.rc,v
retrieving revision 1.4
diff -u -u -r1.4 De.rc
--- programs/winhelp/De.rc 1 Jun 2002 02:55:52 -0000 1.4
+++ programs/winhelp/De.rc 19 Oct 2002 08:41:51 -0000
@@ -24,28 +24,28 @@
MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
{
POPUP "&Datei" {
- MENUITEM "Ö&ffnen...", 0x101
+ MENUITEM "Ö&ffnen...", MNID_FILE_OPEN
MENUITEM SEPARATOR
- MENUITEM "Thema &drucken", 0x104
- MENUITEM "Drucker&einrichtung...", 0x106
+ MENUITEM "Thema &drucken", MNID_FILE_PRINT
+ MENUITEM "Drucker&einrichtung...", MNID_FILE_SETUP
MENUITEM SEPARATOR
- MENUITEM "&Beenden", 0x108
+ MENUITEM "&Beenden", MNID_FILE_EXIT
}
POPUP "&Bearbeiten" {
- MENUITEM "&Kopieren...", 0x10A
+ MENUITEM "&Kopieren...", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
- MENUITEM "&Anmerken...", 0x10C
+ MENUITEM "&Anmerken...", MNID_EDIT_ANNOTATE
}
POPUP "&Lesezeichen" {
- MENUITEM "&Definieren...", 0x10E
+ MENUITEM "&Definieren...", MNID_BKMK_DEFINE
}
POPUP "&Hilfe" {
- MENUITEM "&Hilfe benutzen", 0x110
- MENUITEM "Immer im &Vordergrund", 0x111
+ MENUITEM "&Hilfe benutzen", MNID_HELP_HELPON
+ MENUITEM "Immer im &Vordergrund", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
- MENUITEM "&Info...", 0x113
+ MENUITEM "&Info...", MNID_HELP_ABOUT
#ifdef WINELIB
- MENUITEM "&Über WINE", 0x114
+ MENUITEM "&Über WINE", MNID_HELP_WINE
#endif
}
}
@@ -54,16 +54,17 @@
STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
{
-WINE_HELP, "WINE Hilfe"
-WHERROR, "FEHLER"
-WARNING, "ACHTUNG"
-INFO, "Information"
-NOT_IMPLEMENTED, "Nicht implementiert"
-HLPFILE_ERROR_s, "Fehler beim Lesen der Hilfe-Datei `%s'"
-CONTENTS, "&Inhalt"
-SEARCH, "&Suchen"
-BACK, "&Zurück"
-HISTORY, "&Bisher"
-ALL_FILES, "Alle Dateien (*.*)"
-HELP_FILES_HLP, "Hilfe-Dateien (*.hlp)"
+STID_WINE_HELP, "WINE Hilfe"
+STID_WHERROR, "FEHLER"
+STID_WARNING, "ACHTUNG"
+STID_INFO, "Information"
+STID_NOT_IMPLEMENTED, "Nicht implementiert"
+STID_HLPFILE_ERROR_s, "Fehler beim Lesen der Hilfe-Datei `%s'"
+STID_CONTENTS, "&Inhalt"
+STID_SEARCH, "&Suchen"
+STID_BACK, "&Zurück"
+STID_HISTORY, "&Bisher"
+STID_TOPICS, "&Topics"
+STID_ALL_FILES, "Alle Dateien (*.*)"
+STID_HELP_FILES_HLP, "Hilfe-Dateien (*.hlp)"
}
Index: programs/winhelp/En.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/En.rc,v
retrieving revision 1.4
diff -u -u -r1.4 En.rc
--- programs/winhelp/En.rc 1 Jun 2002 02:55:52 -0000 1.4
+++ programs/winhelp/En.rc 19 Oct 2002 08:41:51 -0000
@@ -24,28 +24,28 @@
MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
{
POPUP "&File" {
- MENUITEM "&Open", 0x101
+ MENUITEM "&Open", MNID_FILE_OPEN
MENUITEM SEPARATOR
- MENUITEM "&Print", 0x104
- MENUITEM "Printer &setup...", 0x106
+ MENUITEM "&Print", MNID_FILE_PRINT
+ MENUITEM "Printer &setup...", MNID_FILE_SETUP
MENUITEM SEPARATOR
- MENUITEM "&Exit", 0x108
+ MENUITEM "&Exit", MNID_FILE_EXIT
}
POPUP "&Edit" {
- MENUITEM "&Copy...", 0x10A
+ MENUITEM "&Copy...", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
- MENUITEM "&Annotate...", 0x10C
+ MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE
}
POPUP "&Bookmark" {
- MENUITEM "&Define...", 0x10E
+ MENUITEM "&Define...", MNID_BKMK_DEFINE
}
POPUP "&Help" {
- MENUITEM "Help &on help", 0x110
- MENUITEM "Always on &top", 0x111
+ MENUITEM "Help &on help", MNID_HELP_HELPON
+ MENUITEM "Always on &top", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
- MENUITEM "&Info...", 0x113
+ MENUITEM "&Info...", MNID_HELP_ABOUT
#ifdef WINELIB
- MENUITEM "&About WINE", 0x114
+ MENUITEM "&About WINE", MNID_HELP_WINE
#endif
}
}
@@ -53,16 +53,17 @@
/* Strings */
STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
{
-WINE_HELP, "WINE Help"
-WHERROR, "ERROR"
-WARNING, "WARNING"
-INFO, "Information"
-NOT_IMPLEMENTED, "Not implemented"
-HLPFILE_ERROR_s, "Error while reading the help file `%s'"
-CONTENTS, "&Contents"
-SEARCH, "&Search"
-BACK, "&Back"
-HISTORY, "&History"
-ALL_FILES, "All files (*.*)"
-HELP_FILES_HLP, "Help files (*.hlp)"
+STID_WINE_HELP, "WINE Help"
+STID_WHERROR, "ERROR"
+STID_WARNING, "WARNING"
+STID_INFO, "Information"
+STID_NOT_IMPLEMENTED, "Not implemented"
+STID_HLPFILE_ERROR_s, "Error while reading the help file `%s'"
+STID_CONTENTS, "&Contents"
+STID_SEARCH, "&Search"
+STID_BACK, "&Back"
+STID_HISTORY, "&History"
+STID_TOPICS, "&Topics"
+STID_ALL_FILES, "All files (*.*)"
+STID_HELP_FILES_HLP, "Help files (*.hlp)"
}
Index: programs/winhelp/Es.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/Es.rc,v
retrieving revision 1.4
diff -u -u -r1.4 Es.rc
--- programs/winhelp/Es.rc 1 Jun 2002 02:55:52 -0000 1.4
+++ programs/winhelp/Es.rc 19 Oct 2002 08:41:51 -0000
@@ -24,28 +24,28 @@
MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
{
POPUP "&Archivo" {
- MENUITEM "A&brir...", 0x101
+ MENUITEM "A&brir...", MNID_FILE_OPEN
MENUITEM SEPARATOR
- MENUITEM "&Imprimir", 0x104
- MENUITEM "&Configuración Impresora...", 0x106
+ MENUITEM "&Imprimir", MNID_FILE_PRINT
+ MENUITEM "&Configuración Impresora...", MNID_FILE_SETUP
MENUITEM SEPARATOR
- MENUITEM "&Salir", 0x108
+ MENUITEM "&Salir", MNID_FILE_EXIT
}
POPUP "&Editar" {
- MENUITEM "&Copiar...", 0x10A
+ MENUITEM "&Copiar...", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
- MENUITEM "&Anotar...", 0x10C
+ MENUITEM "&Anotar...", MNID_EDIT_ANNOTATE
}
POPUP "&Marcador" {
- MENUITEM "&Definir...", 0x10E
+ MENUITEM "&Definir...", MNID_BKMK_DEFINE
}
POPUP "&Ayuda" {
- MENUITEM "&Ayuda sobre la ayuda", 0x110
- MENUITEM "&Toujours visible", 0x111
+ MENUITEM "&Ayuda sobre la ayuda", MNID_HELP_HELPON
+ MENUITEM "&Toujours visible", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
- MENUITEM "&Info...", 0x113
+ MENUITEM "&Info...", MNID_HELP_ABOUT
#ifdef WINELIB
- MENUITEM "&Acerca de WINE", 0x114
+ MENUITEM "&Acerca de WINE", MNID_HELP_WINE
#endif
}
}
@@ -54,16 +54,17 @@
STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
{
-WINE_HELP, "Ayuda de WINE"
-WHERROR, "ERROR"
-WARNING, "CUIDADO"
-INFO, "Información"
-NOT_IMPLEMENTED, "Aún no implementado"
-HLPFILE_ERROR_s, "Error al leer el archivo de ayuda `%s'"
-CONTENTS, "&Indice"
-SEARCH, "&Buscar"
-BACK, "&Anterior"
-HISTORY, "&Historia"
-ALL_FILES, "Todos los archivos (*.*)"
-HELP_FILES_HLP, "Archivos de ayuda (*.hlp)"
+STID_WINE_HELP, "Ayuda de WINE"
+STID_WHERROR, "ERROR"
+STID_WARNING, "CUIDADO"
+STID_INFO, "Información"
+STID_NOT_IMPLEMENTED, "Aún no implementado"
+STID_HLPFILE_ERROR_s, "Error al leer el archivo de ayuda `%s'"
+STID_CONTENTS, "&Indice"
+STID_SEARCH, "&Buscar"
+STID_BACK, "&Anterior"
+STID_HISTORY, "&Historia"
+STID_TOPICS, "&Topics"
+STID_ALL_FILES, "Todos los archivos (*.*)"
+STID_HELP_FILES_HLP, "Archivos de ayuda (*.hlp)"
}
Index: programs/winhelp/Fi.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/Fi.rc,v
retrieving revision 1.4
diff -u -u -r1.4 Fi.rc
--- programs/winhelp/Fi.rc 1 Jun 2002 02:55:52 -0000 1.4
+++ programs/winhelp/Fi.rc 19 Oct 2002 08:41:51 -0000
@@ -25,28 +25,28 @@
MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL
{
POPUP "&Tiedosto" {
- MENUITEM "&Avaa...", 0x101
+ MENUITEM "&Avaa...", MNID_FILE_OPEN
MENUITEM SEPARATOR
- MENUITEM "&Tulosta", 0x104
- MENUITEM "&Kirjoittimen asetukset...", 0x106
+ MENUITEM "&Tulosta", MNID_FILE_PRINT
+ MENUITEM "&Kirjoittimen asetukset...", MNID_FILE_SETUP
MENUITEM SEPARATOR
- MENUITEM "&Lopeta", 0x108
+ MENUITEM "&Lopeta", MNID_FILE_EXIT
}
POPUP "&Muokkaa" {
- MENUITEM "&Kopioi...", 0x10A
+ MENUITEM "&Kopioi...", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
- MENUITEM "&Huomautus...", 0x10C
+ MENUITEM "&Huomautus...", MNID_EDIT_ANNOTATE
}
POPUP "&Kirjanmerkki" {
- MENUITEM "&Aseta...", 0x10E
+ MENUITEM "&Aseta...", MNID_BKMK_DEFINE
}
POPUP "&Ohje" {
- MENUITEM "&Ohjeen käyttö", 0x110
- MENUITEM "&Aina päällimmäisenä", 0x111
+ MENUITEM "&Ohjeen käyttö", MNID_HELP_HELPON
+ MENUITEM "&Aina päällimmäisenä", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
- MENUITEM "T&ietoja...", 0x113
+ MENUITEM "T&ietoja...", MNID_HELP_ABOUT
#ifdef WINELIB
- MENUITEM "&Tietoja WINEstä", 0x114
+ MENUITEM "&Tietoja WINEstä", MNID_HELP_WINE
#endif
}
}
@@ -55,16 +55,17 @@
STRINGTABLE DISCARDABLE LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL
{
-WINE_HELP, "WINE Ohje"
-WHERROR, "VIRHE"
-WARNING, "VAROITUS"
-INFO, "Tietoja"
-NOT_IMPLEMENTED, "Ei käytettävissä"
-HLPFILE_ERROR_s, "Virhe luettaessa ohjetiedostoa `%s'"
-CONTENTS, "&Sisällys"
-SEARCH, "&Etsi"
-BACK, "&Takaisin"
-HISTORY, "&Luetut"
-ALL_FILES, "Kaikki tiedostot (*.*)"
-HELP_FILES_HLP, "Ohjetiedostot (*.hlp)"
+STID_WINE_HELP, "WINE Ohje"
+STID_WHERROR, "VIRHE"
+STID_WARNING, "VAROITUS"
+STID_INFO, "Tietoja"
+STID_NOT_IMPLEMENTED, "Ei käytettävissä"
+STID_HLPFILE_ERROR_s, "Virhe luettaessa ohjetiedostoa `%s'"
+STID_CONTENTS, "&Sisällys"
+STID_SEARCH, "&Etsi"
+STID_BACK, "&Takaisin"
+STID_HISTORY, "&Luetut"
+STID_TOPICS, "T&opics"
+STID_ALL_FILES, "Kaikki tiedostot (*.*)"
+STID_HELP_FILES_HLP, "Ohjetiedostot (*.hlp)"
}
Index: programs/winhelp/Fr.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/Fr.rc,v
retrieving revision 1.4
diff -u -u -r1.4 Fr.rc
--- programs/winhelp/Fr.rc 1 Jun 2002 02:55:52 -0000 1.4
+++ programs/winhelp/Fr.rc 19 Oct 2002 08:41:51 -0000
@@ -24,28 +24,28 @@
MAIN_MENU MENU LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
{
POPUP "&Fichier" {
- MENUITEM "&Ouvrir", 0x101
+ MENUITEM "&Ouvrir", MNID_FILE_OPEN
MENUITEM SEPARATOR
- MENUITEM "Im&primer", 0x104
- MENUITEM "&Configuration de l'imprimante...", 0x106
+ MENUITEM "Im&primer", MNID_FILE_PRINT
+ MENUITEM "&Configuration de l'imprimante...", MNID_FILE_SETUP
MENUITEM SEPARATOR
- MENUITEM "&Quitter", 0x108
+ MENUITEM "&Quitter", MNID_FILE_EXIT
}
POPUP "&Edition" {
- MENUITEM "&Copier...", 0x10A
+ MENUITEM "&Copier...", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
- MENUITEM "&Annotation...", 0x10C
+ MENUITEM "&Annotation...", MNID_EDIT_ANNOTATE
}
POPUP "&Signet" {
- MENUITEM "&Définir...", 0x10E
+ MENUITEM "&Définir...", MNID_BKMK_DEFINE
}
POPUP "&?" {
- MENUITEM "&Utiliser l'aide", 0x110
- MENUITEM "&Toujours visible", 0x111
+ MENUITEM "&Utiliser l'aide", MNID_HELP_HELPON
+ MENUITEM "&Toujours visible", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
- MENUITEM "&Info...", 0x113
+ MENUITEM "&Info...", MNID_HELP_ABOUT
#ifdef WINELIB
- MENUITEM "&A propos de WINE", 0x114
+ MENUITEM "&A propos de WINE", MNID_HELP_WINE
#endif
}
}
@@ -54,16 +54,17 @@
STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
{
-WINE_HELP, "Aide de WINE"
-WHERROR, "ERREUR"
-WARNING, "ATTENTION"
-INFO, "Information"
-NOT_IMPLEMENTED, "Non implementé"
-HLPFILE_ERROR_s, "Une erreur est survenue en lisant le fichier d'aide `%s'"
-CONTENTS, "&Index"
-SEARCH, "&Rechercher"
-BACK, "&Précédent"
-HISTORY, "&Historique"
-ALL_FILES, "Tout fichier (*.*)"
-HELP_FILES_HLP, "Fichiers d'aide (*.hlp)"
+STID_WINE_HELP, "Aide de WINE"
+STID_WHERROR, "ERREUR"
+STID_WARNING, "ATTENTION"
+STID_INFO, "Information"
+STID_NOT_IMPLEMENTED, "Non implementé"
+STID_HLPFILE_ERROR_s, "Une erreur est survenue en lisant le fichier d'aide `%s'"
+STID_CONTENTS, "&Index"
+STID_SEARCH, "&Rechercher"
+STID_BACK, "&Précédent"
+STID_HISTORY, "&Historique"
+STID_TOPICS, "&Topics"
+STID_ALL_FILES, "Tout fichier (*.*)"
+STID_HELP_FILES_HLP, "Fichiers d'aide (*.hlp)"
}
Index: programs/winhelp/Hu.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/Hu.rc,v
retrieving revision 1.4
diff -u -u -r1.4 Hu.rc
--- programs/winhelp/Hu.rc 1 Jun 2002 02:55:52 -0000 1.4
+++ programs/winhelp/Hu.rc 19 Oct 2002 08:41:51 -0000
@@ -24,28 +24,28 @@
MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
{
POPUP "&File" {
- MENUITEM "&Megnyitás...", 0x101
+ MENUITEM "&Megnyitás...", MNID_FILE_OPEN
MENUITEM SEPARATOR
- MENUITEM "&Nyomtatás", 0x104
- MENUITEM "Nyomtató &beállítás...", 0x106
+ MENUITEM "&Nyomtatás", MNID_FILE_PRINT
+ MENUITEM "Nyomtató &beállítás...", MNID_FILE_SETUP
MENUITEM SEPARATOR
- MENUITEM "&Kilépés", 0x108
+ MENUITEM "&Kilépés", MNID_FILE_EXIT
}
POPUP "&Szerkesztés" {
- MENUITEM "&Másolás...", 0x10A
+ MENUITEM "&Másolás...", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
- MENUITEM "&Annotate...", 0x10C
+ MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE
}
POPUP "&Könyvjelzõ" {
- MENUITEM "&Definiálás...", 0x10E
+ MENUITEM "&Definiálás...", MNID_BKMK_DEFINE
}
POPUP "&Segítség" {
- MENUITEM "Segítség &a segítségrõl", 0x110
- MENUITEM "Mindig &legfelül", 0x111
+ MENUITEM "Segítség &a segítségrõl", MNID_HELP_HELPON
+ MENUITEM "Mindig &legfelül", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
- MENUITEM "&Információ...", 0x113
+ MENUITEM "&Információ...", MNID_HELP_ABOUT
#ifdef WINELIB
- MENUITEM "&&A WINE-ról", 0x114
+ MENUITEM "&&A WINE-ról", MNID_HELP_WINE
#endif
}
}
@@ -54,16 +54,17 @@
STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
{
-WINE_HELP, "WINE segítség"
-WHERROR, "HIBA"
-WARNING, "FIGYELMEZTETÉS"
-INFO, "Információ"
-NOT_IMPLEMENTED, "Nincs implementálva"
-HLPFILE_ERROR_s, "Hiba a `%s' file olvasásakor"
-CONTENTS, "&Tartalom"
-SEARCH, "&Keresés"
-BACK, "&Vissza"
-HISTORY, "&History"
-ALL_FILES, "Minden file (*.*)"
-HELP_FILES_HLP, "Segítség file-ok (*.hlp)"
+STID_WINE_HELP, "WINE segítség"
+STID_WHERROR, "HIBA"
+STID_WARNING, "FIGYELMEZTETÉS"
+STID_INFO, "Információ"
+STID_NOT_IMPLEMENTED, "Nincs implementálva"
+STID_HLPFILE_ERROR_s, "Hiba a `%s' file olvasásakor"
+STID_CONTENTS, "&Tartalom"
+STID_SEARCH, "&Keresés"
+STID_BACK, "&Vissza"
+STID_HISTORY, "&History"
+STID_TOPICS, "T&opics"
+STID_ALL_FILES, "Minden file (*.*)"
+STID_HELP_FILES_HLP, "Segítség file-ok (*.hlp)"
}
Index: programs/winhelp/It.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/It.rc,v
retrieving revision 1.4
diff -u -u -r1.4 It.rc
--- programs/winhelp/It.rc 1 Jun 2002 02:55:52 -0000 1.4
+++ programs/winhelp/It.rc 19 Oct 2002 08:41:51 -0000
@@ -24,28 +24,28 @@
MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
{
POPUP "&File" {
- MENUITEM "&Apri...", 0x101
+ MENUITEM "&Apri...", MNID_FILE_OPEN
MENUITEM SEPARATOR
- MENUITEM "s&tampa", 0x104
- MENUITEM "&Setup stampante...", 0x106
+ MENUITEM "s&tampa", MNID_FILE_PRINT
+ MENUITEM "&Setup stampante...", MNID_FILE_SETUP
MENUITEM SEPARATOR
- MENUITEM "&Esci", 0x108
+ MENUITEM "&Esci", MNID_FILE_EXIT
}
POPUP "&Modifica" {
- MENUITEM "&Copia...", 0x10A
+ MENUITEM "&Copia...", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
- MENUITEM "&Annota...", 0x10C
+ MENUITEM "&Annota...", MNID_EDIT_ANNOTATE
}
POPUP "&Segnalibro" {
- MENUITEM "&Definisci...", 0x10E
+ MENUITEM "&Definisci...", MNID_BKMK_DEFINE
}
POPUP "&?" {
- MENUITEM "&Aiuto sulla guida", 0x110
- MENUITEM "Sempre in primo &piano", 0x111
+ MENUITEM "&Aiuto sulla guida", MNID_HELP_HELPON
+ MENUITEM "Sempre in primo &piano", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
- MENUITEM "&Informazioni su...", 0x113
+ MENUITEM "&Informazioni su...", MNID_HELP_ABOUT
#ifdef WINELIB
- MENUITEM "&Informazion su WINE", 0x114
+ MENUITEM "&Informazion su WINE", MNID_HELP_WINE
#endif
}
}
@@ -54,16 +54,17 @@
STRINGTABLE DISCARDABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
{
-WINE_HELP, "Guida di WINE"
-WHERROR, "ERRORE"
-WARNING, "ATTENZIONE"
-INFO, "Informazione"
-NOT_IMPLEMENTED, "Non ancora implementato"
-HLPFILE_ERROR_s, "Errore di lettura HelpFile `%s'"
-CONTENTS, "&Sommario"
-SEARCH, "&Ricerca"
-BACK, "&Precedente"
-HISTORY, "&Indice"
-ALL_FILES, "Tutti i file (*.*)"
-HELP_FILES_HLP, "HelpFiles (*.hlp)"
+STID_WINE_HELP, "Guida di WINE"
+STID_WHERROR, "ERRORE"
+STID_WARNING, "ATTENZIONE"
+STID_INFO, "Informazione"
+STID_NOT_IMPLEMENTED, "Non ancora implementato"
+STID_HLPFILE_ERROR_s, "Errore di lettura HelpFile `%s'"
+STID_CONTENTS, "&Sommario"
+STID_SEARCH, "&Ricerca"
+STID_BACK, "&Precedente"
+STID_HISTORY, "&Indice"
+STID_TOPICS, "&Topics"
+STID_ALL_FILES, "Tutti i file (*.*)"
+STID_HELP_FILES_HLP, "HelpFiles (*.hlp)"
}
Index: programs/winhelp/Ko.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/Ko.rc,v
retrieving revision 1.4
diff -u -u -r1.4 Ko.rc
--- programs/winhelp/Ko.rc 1 Jun 2002 02:55:52 -0000 1.4
+++ programs/winhelp/Ko.rc 19 Oct 2002 08:41:51 -0000
@@ -24,28 +24,28 @@
MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
{
POPUP "ÆÄÀÏ(&F)" {
- MENUITEM "¿±â(&O)...", 0x101
+ MENUITEM "¿±â(&O)...", MNID_FILE_OPEN
MENUITEM SEPARATOR
- MENUITEM "Àμâ(&P)", 0x104
- MENUITEM "ÇÁ¸°ÅÍ ¼³Á¤(&S)...", 0x106
+ MENUITEM "Àμâ(&P)", MNID_FILE_PRINT
+ MENUITEM "ÇÁ¸°ÅÍ ¼³Á¤(&S)...", MNID_FILE_SETUP
MENUITEM SEPARATOR
- MENUITEM "Á¾·á(&E)", 0x108
+ MENUITEM "Á¾·á(&E)", MNID_FILE_EXIT
}
POPUP "ÆíÁý(&E)" {
- MENUITEM "º¹»ç(&C)...", 0x10A
+ MENUITEM "º¹»ç(&C)...", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
- MENUITEM "ÁÖ¼®(&A)...", 0x10C
+ MENUITEM "ÁÖ¼®(&A)...", MNID_EDIT_ANNOTATE
}
POPUP "Ã¥°¥ÇÇ(&B)" {
- MENUITEM "Á¤ÀÇ(&D)...", 0x10E
+ MENUITEM "Á¤ÀÇ(&D)...", MNID_BKMK_DEFINE
}
POPUP "µµ¿ò¸»(&H)" {
- MENUITEM "µµ¿ò¸» »ç¿ë¹ý(&O)", 0x110
- MENUITEM "Ç×»ó À§(&T)", 0x111
+ MENUITEM "µµ¿ò¸» »ç¿ë¹ý(&O)", MNID_HELP_HELPON
+ MENUITEM "Ç×»ó À§(&T)", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
- MENUITEM "Á¤º¸(&I)...", 0x113
+ MENUITEM "Á¤º¸(&I)...", MNID_HELP_ABOUT
#ifdef WINELIB
- MENUITEM "¿ÍÀο¡ °üÇÏ¿©(&A)", 0x114
+ MENUITEM "¿ÍÀο¡ °üÇÏ¿©(&A)", MNID_HELP_WINE
#endif
}
}
@@ -54,16 +54,17 @@
STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
{
-WINE_HELP, "¿ÍÀÎ µµ¿ò¸»"
-WHERROR, "¿À·ù"
-WARNING, "°æ°í"
-INFO, "Á¤º¸"
-NOT_IMPLEMENTED, "±¸ÇöµÇÁö ¾Ê¾ÒÀ½"
-HLPFILE_ERROR_s, "µµ¿ò¸» ÆÄÀÏ `%s'¸¦ Àд µµÁß ¿À·ù ¹ß»ý"
-CONTENTS, "¸ñÂ÷(&C)"
-SEARCH, "ã±â(&S)"
-BACK, "µÚ·Î(&B)"
-HISTORY, "È÷½ºÅ丮(&H)"
-ALL_FILES, "¸ðµç ÆÄÀÏ (*.*)"
-HELP_FILES_HLP, "µµ¿ò¸» ÆÄÀÏ (*.hlp)"
+STID_WINE_HELP, "¿ÍÀÎ µµ¿ò¸»"
+STID_WHERROR, "¿À·ù"
+STID_WARNING, "°æ°í"
+STID_INFO, "Á¤º¸"
+STID_NOT_IMPLEMENTED, "±¸ÇöµÇÁö ¾Ê¾ÒÀ½"
+STID_HLPFILE_ERROR_s, "µµ¿ò¸» ÆÄÀÏ `%s'¸¦ Àд µµÁß ¿À·ù ¹ß»ý"
+STID_CONTENTS, "¸ñÂ÷(&C)"
+STID_SEARCH, "ã±â(&S)"
+STID_BACK, "µÚ·Î(&B)"
+STID_HISTORY, "È÷½ºÅ丮(&H)"
+STID_TOPICS, "&Topics"
+STID_ALL_FILES, "¸ðµç ÆÄÀÏ (*.*)"
+STID_HELP_FILES_HLP, "µµ¿ò¸» ÆÄÀÏ (*.hlp)"
}
Index: programs/winhelp/Pt.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/Pt.rc,v
retrieving revision 1.5
diff -u -u -r1.5 Pt.rc
--- programs/winhelp/Pt.rc 1 Jun 2002 02:55:52 -0000 1.5
+++ programs/winhelp/Pt.rc 19 Oct 2002 08:41:51 -0000
@@ -25,28 +25,28 @@
MAIN_MENU MENU LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
{
POPUP "&Arquiv" {
- MENUITEM "A&brir...", 0x101
+ MENUITEM "A&brir...", MNID_FILE_OPEN
MENUITEM SEPARATOR
- MENUITEM "&Imprimir", 0x104
- MENUITEM "&Configurar Impressora...", 0x106
+ MENUITEM "&Imprimir", MNID_FILE_PRINT
+ MENUITEM "&Configurar Impressora...", MNID_FILE_SETUP
MENUITEM SEPARATOR
- MENUITEM "&Sair", 0x108
+ MENUITEM "&Sair", MNID_FILE_EXIT
}
POPUP "&Editar" {
- MENUITEM "&Copiar...", 0x10A
+ MENUITEM "&Copiar...", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
- MENUITEM "&Anotar...", 0x10C
+ MENUITEM "&Anotar...", MNID_EDIT_ANNOTATE
}
POPUP "&Marcador" {
- MENUITEM "&Definir...", 0x10E
+ MENUITEM "&Definir...", MNID_BKMK_DEFINE
}
POPUP "&Ajuda" {
- MENUITEM "Ajuda &na ajuda", 0x110
- MENUITEM "Sempre &visível", 0x111
+ MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON
+ MENUITEM "Sempre &visível", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
- MENUITEM "&Info...", 0x113
+ MENUITEM "&Info...", MNID_HELP_ABOUT
#ifdef WINELIB
- MENUITEM "&Sobre WINE", 0x114
+ MENUITEM "&Sobre WINE", MNID_HELP_WINE
#endif
}
}
@@ -55,16 +55,17 @@
STRINGTABLE DISCARDABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
{
-WINE_HELP, "Ajuda WINE"
-WHERROR, "ERRO"
-WARNING, "AVISO"
-INFO, "Informaçãi"
-NOT_IMPLEMENTED, "Não implementado"
-HLPFILE_ERROR_s, "Foi encontrado um erro enquanto lia `%s'"
-CONTENTS, "&Conteúdo"
-SEARCH, "&Procurar"
-BACK, "&Voltar"
-HISTORY, "&Histórico"
-ALL_FILES, "Todos os arquivo (*.*)"
-HELP_FILES_HLP, "Arquivos de ajuda (*.hlp)"
+STID_WINE_HELP, "Ajuda WINE"
+STID_WHERROR, "ERRO"
+STID_WARNING, "AVISO"
+STID_INFO, "Informaçãi"
+STID_NOT_IMPLEMENTED, "Não implementado"
+STID_HLPFILE_ERROR_s, "Foi encontrado um erro enquanto lia `%s'"
+STID_CONTENTS, "&Conteúdo"
+STID_SEARCH, "&Procurar"
+STID_BACK, "&Voltar"
+STID_HISTORY, "&Histórico"
+STID_TOPICS, "&Topics"
+STID_ALL_FILES, "Todos os arquivo (*.*)"
+STID_HELP_FILES_HLP, "Arquivos de ajuda (*.hlp)"
}
Index: programs/winhelp/Si.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/Si.rc,v
retrieving revision 1.1
diff -u -u -r1.1 Si.rc
--- programs/winhelp/Si.rc 31 Aug 2002 19:03:01 -0000 1.1
+++ programs/winhelp/Si.rc 19 Oct 2002 08:41:51 -0000
@@ -23,28 +23,28 @@
MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
{
POPUP "&Datoteka" {
- MENUITEM "&Odpri ...", 0x101
+ MENUITEM "&Odpri ...", MNID_FILE_OPEN
MENUITEM SEPARATOR
- MENUITEM "Na&tisni temo ...", 0x104
- MENUITEM "&Priprava tiskalnika", 0x106
+ MENUITEM "Na&tisni temo ...", MNID_FILE_PRINT
+ MENUITEM "&Priprava tiskalnika", MNID_FILE_SETUP
MENUITEM SEPARATOR
- MENUITEM "Iz&hod", 0x108
+ MENUITEM "Iz&hod", MNID_FILE_EXIT
}
POPUP "&Urejanje" {
- MENUITEM "&Kopiraj", 0x10A
+ MENUITEM "&Kopiraj", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
- MENUITEM "&Pripombe ...", 0x10C
+ MENUITEM "&Pripombe ...", MNID_EDIT_ANNOTATE
}
POPUP "&Zaznamek" {
- MENUITEM "&Doloèi ...", 0x10E
+ MENUITEM "&Doloèi ...", MNID_BKMK_DEFINE
}
POPUP "&Pomoè" {
- MENUITEM "&O pomoèi", 0x110
- MENUITEM "Vedno na &vrhu", 0x111
+ MENUITEM "&O pomoèi", MNID_HELP_HELPON
+ MENUITEM "Vedno na &vrhu", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
- MENUITEM "&Informacije ...", 0x113
+ MENUITEM "&Informacije ...", MNID_HELP_ABOUT
#ifdef WINELIB
- MENUITEM "&O WINE", 0x114
+ MENUITEM "&O WINE", MNID_HELP_WINE
#endif
}
}
@@ -52,16 +52,17 @@
/* Strings */
STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
{
-WINE_HELP, "WINE Pomoè"
-WHERROR, "NAPAKA"
-WARNING, "OPOZORILO"
-INFO, "Informacija"
-NOT_IMPLEMENTED, "Ni (se) na voljo"
-HLPFILE_ERROR_s, "Napaka pri branju datoteke `%s'"
-CONTENTS, "&Teme pomoèi"
-SEARCH, "&Iskanje"
-BACK, "&Nazaj"
-HISTORY, "&Zgodovina"
-ALL_FILES, "Vse datiteke (*.*)"
-HELP_FILES_HLP, "Datoteke s pomoèjo (*.hlp)"
+STID_WINE_HELP, "WINE Pomoè"
+STID_WHERROR, "NAPAKA"
+STID_WARNING, "OPOZORILO"
+STID_INFO, "Informacija"
+STID_NOT_IMPLEMENTED, "Ni (se) na voljo"
+STID_HLPFILE_ERROR_s, "Napaka pri branju datoteke `%s'"
+STID_CONTENTS, "&Teme pomoèi"
+STID_SEARCH, "&Iskanje"
+STID_BACK, "&Nazaj"
+STID_HISTORY, "&Zgodovina"
+STID_TOPICS, "&Topics"
+STID_ALL_FILES, "Vse datiteke (*.*)"
+STID_HELP_FILES_HLP, "Datoteke s pomoèjo (*.hlp)"
}
Index: programs/winhelp/Sk.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/Sk.rc,v
retrieving revision 1.5
diff -u -u -r1.5 Sk.rc
--- programs/winhelp/Sk.rc 31 Aug 2002 19:03:17 -0000 1.5
+++ programs/winhelp/Sk.rc 19 Oct 2002 08:41:51 -0000
@@ -21,27 +21,27 @@
MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
{
POPUP "&Súbor" {
- MENUITEM "&Otvori?...", 0x101
+ MENUITEM "&Otvori?...", MNID_FILE_OPEN
MENUITEM SEPARATOR
- MENUITEM "&Tlaèi?", 0x104
- MENUITEM "&Nastavenie tlaèe...", 0x106
- MENUITEM "U&konèi?", 0x108
+ MENUITEM "&Tlaèi?", MNID_FILE_PRINT
+ MENUITEM "&Nastavenie tlaèe...", MNID_FILE_SETUP
+ MENUITEM "U&konèi?", MNID_FILE_EXIT
}
POPUP "&Upravi?" {
- MENUITEM "Kopí&rova?...", 0x10a
+ MENUITEM "Kopí&rova?...", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
- MENUITEM "&Skomentova?...", 0x10c
+ MENUITEM "&Skomentova?...", MNID_EDIT_ANNOTATE
}
POPUP "&Zálo?ka" {
- MENUITEM "&Definova?...", 0x10e
+ MENUITEM "&Definova?...", MNID_BKMK_DEFINE
}
POPUP "&Pomoc" {
- MENUITEM "Pomoc &na pomoci", 0x110
- MENUITEM "V?dy na &vrchu", 0x111
+ MENUITEM "Pomoc &na pomoci", MNID_HELP_HELPON
+ MENUITEM "V?dy na &vrchu", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
- MENUITEM "&Info...", 0x113
+ MENUITEM "&Info...", MNID_HELP_ABOUT
#ifdef WINELIB
- MENUITEM "O& WINE", 0x114
+ MENUITEM "O& WINE", MNID_HELP_WINE
#endif
}
}
@@ -49,16 +49,17 @@
/* Strings */
STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
{
-WINE_HELP, "WINE Pomoc"
-WHERROR, "CHYBA"
-WARNING, "VAROVANIE"
-INFO, "Informácie"
-NOT_IMPLEMENTED, "Neimplementované"
-HLPFILE_ERROR_s, "Chyba poèas èítania súboru `%s'"
-CONTENTS, "&Obsah"
-SEARCH, "&H¾ada?"
-BACK, "&Spä?"
-HISTORY, "&História"
-ALL_FILES, "Vsetky súbory (*.*)"
-HELP_FILES_HLP, "Súbory pomoci (*.hlp)"
+STID_WINE_HELP, "WINE Pomoc"
+STID_WHERROR, "CHYBA"
+STID_WARNING, "VAROVANIE"
+STID_INFO, "Informácie"
+STID_NOT_IMPLEMENTED, "Neimplementované"
+STID_HLPFILE_ERROR_s, "Chyba poèas èítania súboru `%s'"
+STID_CONTENTS, "&Obsah"
+STID_SEARCH, "&H¾ada?"
+STID_BACK, "&Spä?"
+STID_HISTORY, "&História"
+STID_TOPICS, "&Topics"
+STID_ALL_FILES, "Vsetky súbory (*.*)"
+STID_HELP_FILES_HLP, "Súbory pomoci (*.hlp)"
}
Index: programs/winhelp/Sw.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/Sw.rc,v
retrieving revision 1.4
diff -u -u -r1.4 Sw.rc
--- programs/winhelp/Sw.rc 1 Jun 2002 02:55:52 -0000 1.4
+++ programs/winhelp/Sw.rc 19 Oct 2002 08:41:51 -0000
@@ -25,28 +25,28 @@
MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
{
POPUP "&Arkiv" {
- MENUITEM "&Öppna...", 0x101
+ MENUITEM "&Öppna...", MNID_FILE_OPEN
MENUITEM SEPARATOR
- MENUITEM "&Skriv ut", 0x104
- MENUITEM "Skrivar &inställningar...", 0x106
+ MENUITEM "&Skriv ut", MNID_FILE_PRINT
+ MENUITEM "Skrivar &inställningar...", MNID_FILE_SETUP
MENUITEM SEPARATOR
- MENUITEM "&Avsluta", 0x108
+ MENUITEM "&Avsluta", MNID_FILE_EXIT
}
POPUP "&Redigera" {
- MENUITEM "&Kopiera...", 0x10A
+ MENUITEM "&Kopiera...", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
- MENUITEM "&Markera...", 0x10C
+ MENUITEM "&Markera...", MNID_EDIT_ANNOTATE
}
POPUP "&Bokmärke" {
- MENUITEM "&Defingera...", 0x10E
+ MENUITEM "&Defingera...", MNID_BKMK_DEFINE
}
POPUP "&Hjälp" {
- MENUITEM "Användningen &av hjälp", 0x110
- MENUITEM "Alltid &överst", 0x111
+ MENUITEM "Användningen &av hjälp", MNID_HELP_HELPON
+ MENUITEM "Alltid &överst", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
- MENUITEM "&Information...", 0x113
+ MENUITEM "&Information...", MNID_HELP_ABOUT
#ifdef WINELIB
- MENUITEM "&Om WINE", 0x114
+ MENUITEM "&Om WINE", MNID_HELP_WINE
#endif
}
}
@@ -55,16 +55,17 @@
STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
{
-WINE_HELP, "WINE Hjälp"
-WHERROR, "FEL"
-WARNING, "VARNING"
-INFO, "Information"
-NOT_IMPLEMENTED, "Ej implementererat"
-HLPFILE_ERROR_s, "FEL vid läsning av hjälp filen `%s'"
-CONTENTS, "&Innehåll"
-SEARCH, "&Sök"
-BACK, "&Tillbaka"
-HISTORY, "&Översikt"
-ALL_FILES, "Alla filer (*.*))"
-HELP_FILES_HLP, "Hjälp filer (*.hlp)"
+STID_WINE_HELP, "WINE Hjälp"
+STID_WHERROR, "FEL"
+STID_WARNING, "VARNING"
+STID_INFO, "Information"
+STID_NOT_IMPLEMENTED, "Ej implementererat"
+STID_HLPFILE_ERROR_s, "FEL vid läsning av hjälp filen `%s'"
+STID_CONTENTS, "&Innehåll"
+STID_SEARCH, "&Sök"
+STID_BACK, "&Tillbaka"
+STID_HISTORY, "&Översikt"
+STID_TOPICS, "T&opics"
+STID_ALL_FILES, "Alla filer (*.*))"
+STID_HELP_FILES_HLP, "Hjälp filer (*.hlp)"
}
Index: programs/winhelp/Va.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/Va.rc,v
retrieving revision 1.4
diff -u -u -r1.4 Va.rc
--- programs/winhelp/Va.rc 1 Jun 2002 02:55:52 -0000 1.4
+++ programs/winhelp/Va.rc 19 Oct 2002 08:41:51 -0000
@@ -29,28 +29,28 @@
MAIN_MENU MENU LANGUAGE LANG_, SUBLANG_NEUTRAL
{
POPUP "&Datoteca" {
- MENUITEM "&Rivir", 0x101
+ MENUITEM "&Rivir", MNID_FILE_OPEN
MENUITEM SEPARATOR
- MENUITEM "&Stampar tema", 0x104
- MENUITEM "&Installaziun dal stampader...", 0x106
+ MENUITEM "&Stampar tema", MNID_FILE_PRINT
+ MENUITEM "&Installaziun dal stampader...", MNID_FILE_SETUP
MENUITEM SEPARATOR
- MENUITEM "&Finir", 0x108
+ MENUITEM "&Finir", MNID_FILE_EXIT
}
POPUP "&Lavurar" {
- MENUITEM "Capchar", 0x10A
+ MENUITEM "Capchar", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
- MENUITEM "&Annotaziun...", 0x10C
+ MENUITEM "&Annotaziun...", MNID_EDIT_ANNOTATE
}
POPUP "&Marca" {
- MENUITEM "&Definir...", 0x10E
+ MENUITEM "&Definir...", MNID_BKMK_DEFINE
}
POPUP "&Agüd" {
- MENUITEM "&Douvrar l'agüd", 0x110
- MENUITEM "Adüna da&vant", 0x111
+ MENUITEM "&Douvrar l'agüd", MNID_HELP_HELPON
+ MENUITEM "Adüna da&vant", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
- MENUITEM "I&nfuormaziuns", 0x113
+ MENUITEM "I&nfuormaziuns", MNID_HELP_ABOUT
#ifdef WINELIB
- MENUITEM "Davart &WINE", 0x114
+ MENUITEM "Davart &WINE", MNID_HELP_WINE
#endif
}
}
@@ -69,6 +69,7 @@
SEARCH, "&Tscherchar"
BACK, "&Inavo"
HISTORY, "&Fin qua"
+TOPICS, "T&opics"
ALL_FILES, "Tuot las datotecas (*.*)"
HELP_FILES_HLP, "Datotecas d'agüd (*.hlp)"
}
Index: programs/winhelp/Wa.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/Wa.rc,v
retrieving revision 1.5
diff -u -u -r1.5 Wa.rc
--- programs/winhelp/Wa.rc 1 Jun 2002 02:55:52 -0000 1.5
+++ programs/winhelp/Wa.rc 19 Oct 2002 08:41:51 -0000
@@ -25,28 +25,28 @@
MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_NEUTRAL
{
POPUP "&Fitchî" {
- MENUITEM "&Drovî...", 0x101
+ MENUITEM "&Drovî...", MNID_FILE_OPEN
MENUITEM SEPARATOR
- MENUITEM "&Rexhe", 0x104
- MENUITEM "&Apontiaedje del scrirece...", 0x106
+ MENUITEM "&Rexhe", MNID_FILE_PRINT
+ MENUITEM "&Apontiaedje del scrirece...", MNID_FILE_SETUP
MENUITEM SEPARATOR
- MENUITEM "Moussî &Foû", 0x108
+ MENUITEM "Moussî &Foû", MNID_FILE_EXIT
}
POPUP "&Candjî" {
- MENUITEM "&Copyî...", 0x10A
+ MENUITEM "&Copyî...", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
- MENUITEM "&Sicrîre...", 0x10C
+ MENUITEM "&Sicrîre...", MNID_EDIT_ANNOTATE
}
POPUP "&Rimårkes" {
- MENUITEM "&Defini...", 0x10E
+ MENUITEM "&Defini...", MNID_BKMK_DEFINE
}
POPUP "&Aide" {
- MENUITEM "&Aide so l' Aide", 0x110
- MENUITEM "Todi &Visibe", 0x111
+ MENUITEM "&Aide so l' Aide", MNID_HELP_HELPON
+ MENUITEM "Todi &Visibe", MNID_HELP_HELPTOP
MENUITEM SEPARATOR
- MENUITEM "&Informåcion...", 0x113
+ MENUITEM "&Informåcion...", MNID_HELP_ABOUT
#ifdef WINELIB
- MENUITEM "Å &dfait di WINEE", 0x114
+ MENUITEM "Å &dfait di WINEE", MNID_HELP_WINE
#endif
}
}
@@ -55,16 +55,17 @@
STRINGTABLE DISCARDABLE LANGUAGE LANG_WALON, SUBLANG_NEUTRAL
{
-WINE_HELP, "Aidance di WINE"
-WHERROR, "AROKE"
-WARNING, "ADVERTIXHMINT"
-INFO, "Informåcion"
-NOT_IMPLEMENTED, "Nén co possibe"
-HLPFILE_ERROR_s, "Yåk n' a nén stî å moumint di lere li fitchî d' aide `%s'"
-CONTENTS, "Å&dvins"
-SEARCH, "C&werî"
-BACK, "Èn &Erî"
-HISTORY, "&Istwere"
-ALL_FILES, "Tos les fitchîs (*.*)"
-HELP_FILES_HLP, "Fitchîs d' aide (*.hlp)"
+STID_WINE_HELP, "Aidance di WINE"
+STID_WHERROR, "AROKE"
+STID_WARNING, "ADVERTIXHMINT"
+STID_INFO, "Informåcion"
+STID_NOT_IMPLEMENTED, "Nén co possibe"
+STID_HLPFILE_ERROR_s, "Yåk n' a nén stî å moumint di lere li fitchî d' aide `%s'"
+STID_CONTENTS, "Å&dvins"
+STID_SEARCH, "C&werî"
+STID_BACK, "Èn &Erî"
+STID_HISTORY, "&Istwere"
+STID_TOPICS, "&Topics"
+STID_ALL_FILES, "Tos les fitchîs (*.*)"
+STID_HELP_FILES_HLP, "Fitchîs d' aide (*.hlp)"
}
Index: programs/winhelp/Makefile.in
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/Makefile.in,v
retrieving revision 1.31
diff -u -u -r1.31 Makefile.in
--- programs/winhelp/Makefile.in 10 Aug 2002 00:03:08 -0000 1.31
+++ programs/winhelp/Makefile.in 19 Oct 2002 08:49:46 -0000
@@ -15,6 +15,7 @@
EXTRA_SRCS = macro.yacc.y macro.lex.l
EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o
+WRCFLAGS = -DWINELIB
RC_SRCS = rsrc.rc
Index: programs/winhelp/macro.c
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/macro.c,v
retrieving revision 1.11
diff -u -u -r1.11 macro.c
--- programs/winhelp/macro.c 16 Jul 2002 01:46:29 -0000 1.11
+++ programs/winhelp/macro.c 19 Oct 2002 08:35:03 -0000
@@ -263,11 +319,11 @@
CHAR szzFilter[2 * MAX_STRING_LEN + 100];
LPSTR p = szzFilter;
- LoadString(Globals.hInstance, 0X12B, p, MAX_STRING_LEN);
+ LoadString(Globals.hInstance, STID_HELP_FILES_HLP, p, MAX_STRING_LEN);
p += strlen(p) + 1;
lstrcpy(p, "*.hlp");
p += strlen(p) + 1;
- LoadString(Globals.hInstance, 0x12A, p, MAX_STRING_LEN);
+ LoadString(Globals.hInstance, STID_ALL_FILES, p, MAX_STRING_LEN);
p += strlen(p) + 1;
lstrcpy(p, "*.*");
p += strlen(p) + 1;
Index: programs/winhelp/winhelp.c
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/winhelp.c,v
retrieving revision 1.15
diff -u -u -r1.15 winhelp.c
--- programs/winhelp/winhelp.c 19 Oct 2002 00:12:42 -0000 1.15
+++ programs/winhelp/winhelp.c 19 Oct 2002 08:42:03 -0000
@@ -151,10 +151,6 @@
BOOL bPopup, HWND hParentWnd, LPPOINT mouse, INT nCmdShow)
{
CHAR szCaption[MAX_STRING_LEN];
- CHAR szContents[MAX_STRING_LEN];
- CHAR szSearch[MAX_STRING_LEN];
- CHAR szBack[MAX_STRING_LEN];
- CHAR szHistory[MAX_STRING_LEN];
SIZE size = {CW_USEDEFAULT, 0/*CW_USEDEFAULT*/};
POINT origin = {240, 0};
LPSTR ptr;
@@ -217,14 +213,18 @@
MACRO_CreateButton("BTN_TEST", "&Test", "MacroTest");
if (bPrimary && page)
{
- LoadString(Globals.hInstance, 0x126, szContents, sizeof(szContents));
- LoadString(Globals.hInstance, 0x127, szSearch, sizeof(szSearch));
- LoadString(Globals.hInstance, 0x128, szBack, sizeof(szBack));
- LoadString(Globals.hInstance, 0x129, szHistory, sizeof(szHistory));
- MACRO_CreateButton("BTN_CONTENTS", szContents, "Contents()");
- MACRO_CreateButton("BTN_SEARCH", szSearch, "Search()");
- MACRO_CreateButton("BTN_BACK", szBack, "Back()");
- MACRO_CreateButton("BTN_HISTORY", szHistory, "History()");
+ CHAR buffer[MAX_STRING_LEN];
+
+ LoadString(Globals.hInstance, STID_CONTENTS, buffer, sizeof(buffer));
+ MACRO_CreateButton("BTN_CONTENTS", buffer, "Contents()");
+ LoadString(Globals.hInstance, STID_SEARCH,buffer, sizeof(buffer));
+ MACRO_CreateButton("BTN_SEARCH", buffer, "Search()");
+ LoadString(Globals.hInstance, STID_BACK, buffer, sizeof(buffer));
+ MACRO_CreateButton("BTN_BACK", buffer, "Back()");
+ LoadString(Globals.hInstance, STID_HISTORY, buffer, sizeof(buffer));
+ MACRO_CreateButton("BTN_HISTORY", buffer, "History()");
+ LoadString(Globals.hInstance, STID_TOPICS, buffer, sizeof(buffer));
+ MACRO_CreateButton("BTN_TOPICS", buffer, "Finder()");
}
/* Initialize file specific pushbuttons */
@@ -268,7 +268,7 @@
}
/* Create main Window */
- if (!page) LoadString(Globals.hInstance, 0x120, szCaption, sizeof(szCaption));
+ if (!page) LoadString(Globals.hInstance, STID_WINE_HELP, szCaption, sizeof(szCaption));
hWnd = CreateWindow(bPopup ? TEXT_WIN_CLASS_NAME : MAIN_WIN_CLASS_NAME,
page ? page->file->lpszTitle : szCaption,
bPopup ? WS_POPUPWINDOW | WS_BORDER : WS_OVERLAPPEDWINDOW,
@@ -319,7 +319,7 @@
page = lHash ? HLPFILE_PageByHash(szFile_hlp, lHash) : HLPFILE_Contents(szFile_hlp);
if (!page)
{
- WINHELP_MessageBoxIDS_s(HLPFILE_ERROR_s, lpszFile, WHERROR, MB_OK);
+ WINHELP_MessageBoxIDS_s(STID_HLPFILE_ERROR_s, lpszFile, STID_WHERROR, MB_OK);
if (Globals.win_list) return FALSE;
}
}
@@ -386,28 +386,23 @@
switch (wParam)
{
/* Menu FILE */
- case 0x101: MACRO_FileOpen(); break;
- case 0x104: MACRO_Print(); break;
- case 0x106: MACRO_PrinterSetup(); break;
- case 0x108: MACRO_Exit(); break;
+ case MNID_FILE_OPEN: MACRO_FileOpen(); break;
+ case MNID_FILE_PRINT: MACRO_Print(); break;
+ case MNID_FILE_SETUP: MACRO_PrinterSetup(); break;
+ case MNID_FILE_EXIT: MACRO_Exit(); break;
/* Menu EDIT */
- case 0x10A: MACRO_CopyDialog(); break;
- case 0x10C: MACRO_Annotate(); break;
+ case MNID_EDIT_COPYDLG: MACRO_CopyDialog(); break;
+ case MNID_EDIT_ANNOTATE:MACRO_Annotate(); break;
/* Menu Bookmark */
- case 0x10E: MACRO_BookmarkDefine(); break;
+ case MNID_BKMK_DEFINE: MACRO_BookmarkDefine(); break;
/* Menu Help */
- case 0x110: MACRO_HelpOn(); break;
- case 0x111: MACRO_HelpOnTop(); break;
-
- /* Menu Info */
- case 0x113: MACRO_About(); break;
-
- case 0x114:
- ShellAbout(hWnd, "WINE", "Help", 0);
- break;
+ case MNID_HELP_HELPON: MACRO_HelpOn(); break;
+ case MNID_HELP_HELPTOP: MACRO_HelpOnTop(); break;
+ case MNID_HELP_ABOUT: MACRO_About(); break;
+ case MNID_HELP_WINE: ShellAbout(hWnd, "WINE", "Help", 0); break;
default:
/* Buttons */
@@ -416,7 +411,7 @@
if (button)
MACRO_ExecuteMacro(button->lpszMacro);
else
- WINHELP_MessageBoxIDS(0x124, 0x121, MB_OK);
+ WINHELP_MessageBoxIDS(STID_NOT_IMPLEMENTED, 0x121, MB_OK);
break;
}
break;
Index: programs/winhelp/winhelp_res.h
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winhelp/winhelp_res.h,v
retrieving revision 1.1
diff -u -u -r1.1 winhelp_res.h
--- programs/winhelp/winhelp_res.h 14 May 2002 03:48:10 -0000 1.1
+++ programs/winhelp/winhelp_res.h 19 Oct 2002 09:18:01 -0000
@@ -1,14 +1,31 @@
+#define MNID_FILE_OPEN 0x101
+#define MNID_FILE_PRINT 0x104
+#define MNID_FILE_SETUP 0x106
+#define MNID_FILE_EXIT 0x108
+
+#define MNID_EDIT_COPYDLG 0x111
+#define MNID_EDIT_ANNOTATE 0x112
+
+#define MNID_BKMK_DEFINE 0x121
+
+#define MNID_HELP_HELPON 0x131
+#define MNID_HELP_HELPTOP 0x132
+#define MNID_HELP_ABOUT 0x141
+#define MNID_HELP_WINE 0x142
+
#define MAIN_MENU 0x10F
-#define WINE_HELP 0x120
-#define WHERROR 0x121
-#define WARNING 0x122
-#define INFO 0x123
-#define NOT_IMPLEMENTED 0x124
-#define HLPFILE_ERROR_s 0x125
-#define CONTENTS 0x126
-#define SEARCH 0x127
-#define BACK 0x128
-#define HISTORY 0x129
-#define ALL_FILES 0x12A
-#define HELP_FILES_HLP 0x12B
-#define DIALOG_TEST 0x12C
+
+#define STID_WINE_HELP 0x120
+#define STID_WHERROR 0x121
+#define STID_WARNING 0x122
+#define STID_INFO 0x123
+#define STID_NOT_IMPLEMENTED 0x124
+#define STID_HLPFILE_ERROR_s 0x125
+#define STID_CONTENTS 0x126
+#define STID_SEARCH 0x127
+#define STID_BACK 0x128
+#define STID_HISTORY 0x129
+#define STID_TOPICS 0x12A
+#define STID_ALL_FILES 0x12B
+#define STID_HELP_FILES_HLP 0x12C
+#define STID_DIALOG_TEST 0x12D
