cleanup: move or remove unused (in standalone version) strings; remove

dup dialog in caps resource.
This commit is contained in:
ehouse 2009-05-10 15:10:42 +00:00
parent 0619fd8f3e
commit 96228d0daa
5 changed files with 41 additions and 62 deletions

View file

@ -343,23 +343,6 @@ END
#endif #endif
IDD_LOCALESDLG DIALOG DISCARDABLE 0, 0, 100, 100
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER
CAPTION "Language Picker"// <- translate
FONT 8, "System"
BEGIN
LTEXT "CHOOSE THE LANGUAGE FOR MENUS AND DIALOG TEXT. (YOU CAN DOWNLOAD SUPPORT FILES FOR NEW LANGUAGES FROM xwords.sf.net.)",// <- translate
LOCALES_LABEL,LEFT_COL,2,80,50
XWCOMBO(LOCALES_COMBO,LEFT_COL,55,70,12,0,58,0)
# ifndef _WIN32_WCE
DEFPUSHBUTTON "OK",IDOK,LEFT_COL,70,REPOS_BUTTON_WIDTH, // <- translate
REPOS_BUTTON_HT
PUSHBUTTON "CANCEL",IDCANCEL,40,70,REPOS_BUTTON_WIDTH, // <- translate
REPOS_BUTTON_HT
# endif
END
#define SVGN_LEFT_COL 2 #define SVGN_LEFT_COL 2
#define SVGN_ROW_1 2 #define SVGN_ROW_1 2
#define SVGN_LTEXT_HT 46 #define SVGN_LTEXT_HT 46
@ -789,19 +772,19 @@ END
#endif #endif
IDD_LOCALESDLG DIALOG DISCARDABLE 0, 0, 120, 115 IDD_LOCALESDLG DIALOG DISCARDABLE 0, 0, 100, 100
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER
CAPTION "LANGUAGE PICKER" CAPTION "Language Picker"// <- translate
FONT 8, "System" FONT 8, "System"
BEGIN BEGIN
LTEXT "CHOOSE THE LANGUAGE FOR MENUS AND DIALOG TEXT.", LTEXT "CHOOSE THE LANGUAGE FOR MENUS AND DIALOG TEXT. (YOU CAN DOWNLOAD SUPPORT FILES FOR NEW LANGUAGES FROM xwords.sf.net.)",// <- translate
LOCALES_LABEL,LEFT_COL,2,100,36 LOCALES_LABEL,LEFT_COL,2,80,50
XWCOMBO(LOCALES_COMBO, LEFT_COL,40,70,12, 0,58,0)
XWCOMBO(LOCALES_COMBO,LEFT_COL,55,70,12,0,58,0)
# ifndef _WIN32_WCE # ifndef _WIN32_WCE
DEFPUSHBUTTON "OK",IDOK,LEFT_COL,55,REPOS_BUTTON_WIDTH, DEFPUSHBUTTON "OK",IDOK,LEFT_COL,70,REPOS_BUTTON_WIDTH, // <- translate
REPOS_BUTTON_HT REPOS_BUTTON_HT
PUSHBUTTON "CANCEL",IDCANCEL,50,55,REPOS_BUTTON_WIDTH, PUSHBUTTON "CANCEL",IDCANCEL,40,70,REPOS_BUTTON_WIDTH, // <- translate
REPOS_BUTTON_HT REPOS_BUTTON_HT
# endif # endif
END END
@ -906,7 +889,6 @@ BEGIN
IDS_ILLEGALWRD_L "ILLEGAL WORD" // <- translate IDS_ILLEGALWRD_L "ILLEGAL WORD" // <- translate
IDS_WRDNOTFOUND "WORD[S] %s NOT FOUND IN DICTIONARY." // <- translate IDS_WRDNOTFOUND "WORD[S] %s NOT FOUND IN DICTIONARY." // <- translate
IDS_USEANYWAY "USE IT ANYWAY?" // <- translate IDS_USEANYWAY "USE IT ANYWAY?" // <- translate
IDS_FYI_L "OOPS!" // <- translate
IDS_CANNOTOPEN_GAME "SAVED GAME CANNOT BE OPENED." // <- translate IDS_CANNOTOPEN_GAME "SAVED GAME CANNOT BE OPENED." // <- translate
IDS_NODICT_L "DICTIONARY NOT FOUND" // <- translate IDS_NODICT_L "DICTIONARY NOT FOUND" // <- translate
IDS_ABOUT_L "ABOUT CROSSWORDS" // <- translate IDS_ABOUT_L "ABOUT CROSSWORDS" // <- translate
@ -921,21 +903,14 @@ BEGIN
IDS_ROLE_GUEST "GUEST" // <- translate IDS_ROLE_GUEST "GUEST" // <- translate
IDS_PLAYER_FORMAT "PLAYER %d" // <- translate IDS_PLAYER_FORMAT "PLAYER %d" // <- translate
IDS_UNTITLED_FORMAT "UNTITLED %d" // <- translate IDS_UNTITLED_FORMAT "UNTITLED %d" // <- translate
IDS_CONN_RELAY_L "RELAY" // <- translate
IDS_CONN_DIRECT "DIRECT CONNECTION" // <- translate
IDS_PASSWDFMT_L "ENTER PASSWORD FOR %ls:" // <- translate IDS_PASSWDFMT_L "ENTER PASSWORD FOR %ls:" // <- translate
IDS_FILEEXISTSFMT_L "FILE %s ALREADY EXISTS." // <- translate IDS_FILEEXISTSFMT_L "FILE %s ALREADY EXISTS." // <- translate
IDS_NEED_TOUCH "THIS FEATURE REQUIRES A TOUCH SCREEN." IDS_NEED_TOUCH "THIS FEATURE REQUIRES A TOUCH SCREEN."
IDS_EDITCOLOR_FORMAT "EDIT COLOR FOR %s" IDS_EDITCOLOR_FORMAT "EDIT COLOR FOR %s"
#ifndef XWFEATURE_STANDALONE_ONLY #ifndef XWFEATURE_STANDALONE_ONLY
# ifdef XWFEATURE_SMS IDS_CONN_RELAY_L "RELAY" // <- translate
IDS_SMS_CONN_L "TEXTING" // <- translate IDS_CONN_DIRECT "DIRECT CONNECTION" // <- translate
# endif
# ifdef XWFEATURE_IP_DIRECT
IDS_DIRECT_CONN_L "DIRECT CONNECTION" // <- translate
# endif
IDS_NO_PEEK_REMOTE_TILES "NO PEEKING AT REMOTE PLAYERS' TILES!" // <- translate IDS_NO_PEEK_REMOTE_TILES "NO PEEKING AT REMOTE PLAYERS' TILES!" // <- translate
IDS_REG_UNEXPECTED_USER "REFUSED ATTEMPT TO REGISTER UNEXPECTED USER[S]." // <- translate IDS_REG_UNEXPECTED_USER "REFUSED ATTEMPT TO REGISTER UNEXPECTED USER[S]." // <- translate
@ -944,6 +919,13 @@ BEGIN
IDS_REG_SERVER_SANS_REMOTE "AT LEAST ONE PLAYER MUST BE MARKED REMOTE FOR "\ IDS_REG_SERVER_SANS_REMOTE "AT LEAST ONE PLAYER MUST BE MARKED REMOTE FOR "\
"A GAME STARTED AS HOST." // <- translate "A GAME STARTED AS HOST." // <- translate
# ifdef XWFEATURE_SMS
IDS_SMS_CONN_L "TEXTING" // <- translate
# endif
# ifdef XWFEATURE_IP_DIRECT
IDS_DIRECT_CONN_L "DIRECT CONNECTION" // <- translate
# endif
# ifdef XWFEATURE_RELAY # ifdef XWFEATURE_RELAY
IDS_RELAY_CONN_L "RELAY" IDS_RELAY_CONN_L "RELAY"
IDS_XWRELAY_ERROR_TIMEOUT "THE RELAY TIMED YOU OUT; USUALLY THAT "\ IDS_XWRELAY_ERROR_TIMEOUT "THE RELAY TIMED YOU OUT; USUALLY THAT "\

View file

@ -931,7 +931,6 @@ BEGIN
IDS_ILLEGALWRD_L "Mot interdit" IDS_ILLEGALWRD_L "Mot interdit"
IDS_WRDNOTFOUND "Mot(s) %s non trouvé(s) dans le dictionnaire." IDS_WRDNOTFOUND "Mot(s) %s non trouvé(s) dans le dictionnaire."
IDS_USEANYWAY "L'utiliser malgré tout?" IDS_USEANYWAY "L'utiliser malgré tout?"
IDS_FYI_L "Oups!"
IDS_CANNOTOPEN_GAME "La partie enregistrée ne peut être ouverte." IDS_CANNOTOPEN_GAME "La partie enregistrée ne peut être ouverte."
IDS_NODICT_L "Dictionnaire non trouvé" IDS_NODICT_L "Dictionnaire non trouvé"
IDS_ABOUT_L "A propos de Crosswords" IDS_ABOUT_L "A propos de Crosswords"
@ -946,20 +945,14 @@ BEGIN
IDS_ROLE_GUEST "Invité" IDS_ROLE_GUEST "Invité"
IDS_PLAYER_FORMAT "Joueur %d" IDS_PLAYER_FORMAT "Joueur %d"
IDS_UNTITLED_FORMAT "Sans titre %d" IDS_UNTITLED_FORMAT "Sans titre %d"
IDS_CONN_RELAY_L "Transmission"
IDS_CONN_DIRECT "Connexion directe"
IDS_PASSWDFMT_L "Enter password for %ls:" // <- translate IDS_PASSWDFMT_L "Enter password for %ls:" // <- translate
IDS_FILEEXISTSFMT_L "File %s already exists." // <- translate IDS_FILEEXISTSFMT_L "File %s already exists." // <- translate
IDS_NEED_TOUCH "This feature requires a touch screen." // <- translate IDS_NEED_TOUCH "This feature requires a touch screen." // <- translate
IDS_EDITCOLOR_FORMAT "Edit color for %s" // <- translate IDS_EDITCOLOR_FORMAT "Edit color for %s" // <- translate
#ifndef XWFEATURE_STANDALONE_ONLY #ifndef XWFEATURE_STANDALONE_ONLY
# ifdef XWFEATURE_SMS IDS_CONN_RELAY_L "Transmission"
IDS_SMS_CONN_L "Texting" IDS_CONN_DIRECT "Connexion directe"
# endif
# ifdef XWFEATURE_IP_DIRECT
IDS_DIRECT_CONN_L "Direct connection" // <- translate
# endif
IDS_NO_PEEK_REMOTE_TILES "Pas de coup d'oeil sur le jeu des joueurs distants!" IDS_NO_PEEK_REMOTE_TILES "Pas de coup d'oeil sur le jeu des joueurs distants!"
IDS_REG_UNEXPECTED_USER "Refus de la tentative d'enregistrer un joueur non prévu." IDS_REG_UNEXPECTED_USER "Refus de la tentative d'enregistrer un joueur non prévu."
@ -967,6 +960,12 @@ BEGIN
IDS_REG_SERVER_SANS_REMOTE "Au moins un joueur doit être distant dans une partie "\ IDS_REG_SERVER_SANS_REMOTE "Au moins un joueur doit être distant dans une partie "\
"débutée en tant qu'hôte." "débutée en tant qu'hôte."
# ifdef XWFEATURE_SMS
IDS_SMS_CONN_L "Texting"
# endif
# ifdef XWFEATURE_IP_DIRECT
IDS_DIRECT_CONN_L "Direct connection" // <- translate
# endif
# ifdef XWFEATURE_RELAY # ifdef XWFEATURE_RELAY
IDS_RELAY_CONN_L "Relay" // <- translate IDS_RELAY_CONN_L "Relay" // <- translate
IDS_XWRELAY_ERROR_TIMEOUT "La transmission a échoué dans les délais; cela signifie généralement "\ IDS_XWRELAY_ERROR_TIMEOUT "La transmission a échoué dans les délais; cela signifie généralement "\

View file

@ -288,12 +288,12 @@
// Next default values for new objects // Next default values for new objects
// //
#ifdef APSTUDIO_INVOKED /* #ifdef APSTUDIO_INVOKED */
#ifndef APSTUDIO_READONLY_SYMBOLS /* #ifndef APSTUDIO_READONLY_SYMBOLS */
#define _APS_NEXT_RESOURCE_VALUE 125 /* #define _APS_NEXT_RESOURCE_VALUE 125 */
#define _APS_NEXT_COMMAND_VALUE 40033 /* #define _APS_NEXT_COMMAND_VALUE 40033 */
#define _APS_NEXT_CONTROL_VALUE 1128 /* #define _APS_NEXT_CONTROL_VALUE 1141 */
#define _APS_NEXT_SYMED_VALUE 101 /* #define _APS_NEXT_SYMED_VALUE 101 */
#endif /* #endif */
#endif /* #endif */

View file

@ -87,14 +87,14 @@
#define IDS_ROLE_GUEST 40076 #define IDS_ROLE_GUEST 40076
#define IDS_PLAYER_FORMAT 40077 #define IDS_PLAYER_FORMAT 40077
#define IDS_UNTITLED_FORMAT 40078 #define IDS_UNTITLED_FORMAT 40078
#define IDS_CONN_RELAY_L 40079 #define IDS_PASSWDFMT_L 40079
#define IDS_CONN_DIRECT 40080 #define IDS_FILEEXISTSFMT_L 40080
#define IDS_PASSWDFMT_L 40081 #define IDS_NEED_TOUCH 40081
#define IDS_FILEEXISTSFMT_L 40082 #define IDS_EDITCOLOR_FORMAT 40082
#define IDS_NEED_TOUCH 40083
#define IDS_EDITCOLOR_FORMAT 40084
#ifndef XWFEATURE_STANDALONE_ONLY #ifndef XWFEATURE_STANDALONE_ONLY
# define IDS_CONN_RELAY_L 40083
# define IDS_CONN_DIRECT 40084
# define IDS_LOCALPLAYERS 40085 # define IDS_LOCALPLAYERS 40085
# define IDS_NO_PEEK_REMOTE_TILES 40086 # define IDS_NO_PEEK_REMOTE_TILES 40086
# define IDS_REG_UNEXPECTED_USER 40087 # define IDS_REG_UNEXPECTED_USER 40087
@ -121,7 +121,7 @@
#if ! defined XWFEATURE_STANDALONE_ONLY #if ! defined XWFEATURE_STANDALONE_ONLY
# define CE_LAST_RES_ID 40096 # define CE_LAST_RES_ID 40096
#else #else
# define CE_LAST_RES_ID 40084 # define CE_LAST_RES_ID 40082
#endif #endif
#endif #endif

View file

@ -981,7 +981,6 @@ BEGIN
IDS_ILLEGALWRD_L "Illegal word" IDS_ILLEGALWRD_L "Illegal word"
IDS_WRDNOTFOUND "Word[s] %s not found in dictionary." IDS_WRDNOTFOUND "Word[s] %s not found in dictionary."
IDS_USEANYWAY "Use it anyway?" IDS_USEANYWAY "Use it anyway?"
IDS_FYI_L "Oops!"
IDS_CANNOTOPEN_GAME "Saved game cannot be opened." IDS_CANNOTOPEN_GAME "Saved game cannot be opened."
IDS_NODICT_L "Dictionary Not Found" IDS_NODICT_L "Dictionary Not Found"
IDS_ABOUT_L "About Crosswords" IDS_ABOUT_L "About Crosswords"
@ -996,8 +995,6 @@ BEGIN
IDS_ROLE_GUEST "Guest" IDS_ROLE_GUEST "Guest"
IDS_PLAYER_FORMAT "Player %d" IDS_PLAYER_FORMAT "Player %d"
IDS_UNTITLED_FORMAT "Untitled %d" IDS_UNTITLED_FORMAT "Untitled %d"
IDS_CONN_RELAY_L "Relay"
IDS_CONN_DIRECT "Direct connection"
IDS_PASSWDFMT_L "Enter password for %ls:" IDS_PASSWDFMT_L "Enter password for %ls:"
IDS_FILEEXISTSFMT_L "File %s already exists." IDS_FILEEXISTSFMT_L "File %s already exists."
@ -1005,7 +1002,8 @@ BEGIN
IDS_EDITCOLOR_FORMAT "Edit color for %s" IDS_EDITCOLOR_FORMAT "Edit color for %s"
#ifndef XWFEATURE_STANDALONE_ONLY #ifndef XWFEATURE_STANDALONE_ONLY
IDS_CONN_RELAY_L "Relay"
IDS_CONN_DIRECT "Direct connection"
IDS_LOCALPLAYERS "Locl playrs:" IDS_LOCALPLAYERS "Locl playrs:"
IDS_NO_PEEK_REMOTE_TILES "No peeking at remote players' tiles!" IDS_NO_PEEK_REMOTE_TILES "No peeking at remote players' tiles!"
IDS_REG_UNEXPECTED_USER "Refused attempt to register unexpected "\ IDS_REG_UNEXPECTED_USER "Refused attempt to register unexpected "\