Some fixup, e.g. missing or duplicated IDs, left from merge.

This commit is contained in:
ehouse 2009-08-29 16:10:56 +00:00
parent 1c8147c21c
commit 1d2bd69251
5 changed files with 32 additions and 4 deletions

View file

@ -334,6 +334,30 @@ END
#endif
IDD_ASKBLANK DIALOG DISCARDABLE 0, 0, ASKB_DLG_WIDTH, ASKB_DLG_HEIGHT
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER
CAPTION "TILE PICKER"
FONT 8, "System"
BEGIN
LTEXT "ENTER A LETTER FOR THIS BLANK TILE.",IDC_BPICK,
ASKB_COLLEFT,ASKB_LABELTOP,ASKB_LABELWIDTH,ASKB_LABELHT
#ifdef FEATURE_TRAY_EDIT
LTEXT "PICK A TILE FOR YOUR TRAY.",IDC_CPICK,
ASKB_COLLEFT,ASKB_LABELTOP,ASKB_LABELWIDTH,ASKB_LABELHT
EDITTEXT IDC_PICKMSG,ASKB_COLLEFT,ASKB_EDITTOP,80,ASKB_EDITHT,
ES_MULTILINE | ES_READONLY
PUSHBUTTON "PUT BACK",IDC_BACKUP,ASKB_COLLEFT,ASKB_PUTTOP,35,14
#endif
XWCOMBO(BLANKFACE_LIST,ASKB_COMBOLEFT,ASKB_COLLEFT,27,12,LBS_SORT,70,CBS_SORT)
#ifndef _WIN32_WCE
DEFPUSHBUTTON "OK",IDOK,80,WCE_BOTTOM,REPOS_BUTTON_WIDTH, BUTTON_HT
PUSHBUTTON "CANCEL",IDCANCEL,20,WCE_BOTTOM,REPOS_BUTTON_WIDTH, BUTTON_HT
#endif
END
#define SVGN_LEFT_COL 2
#define SVGN_ROW_1 2
#define SVGN_LTEXT_HT 46
@ -922,7 +946,6 @@ BEGIN
# endif
# ifdef XWFEATURE_RELAY
IDS_RELAY_CONN_L "RELAY"
IDS_XWRELAY_ERROR_TIMEOUT "THE RELAY TIMED YOU OUT; USUALLY THAT "\
"MEANS THE OTHER PLAYERS DIDN'T SHOW." // <- translate
IDS_ERROR_HEART_YOU "YOU WERE DISCONNECTED FROM RELAY BECAUSE "\

View file

@ -954,7 +954,6 @@ BEGIN
IDS_DIRECT_CONN_L "Direct connection" // <- translate -- but not visible in version 4.2
# endif
# ifdef XWFEATURE_RELAY
IDS_RELAY_CONN_L "Relay" // <- translate -- but not visible in version 4.2
IDS_XWRELAY_ERROR_TIMEOUT "La transmission a échoué dans les délais; cela signifie généralement "\
"que les autres joueurs ne vous ont pas vu."
IDS_ERROR_HEART_YOU "Vous avez été déconnecté parce que vous n'avez rien émis "\

View file

@ -944,12 +944,20 @@ BEGIN
IDS_REG_SERVER_SANS_REMOTE "Przynajmniej jeden gracz musi być ustawiony jako zdalny "\
"Rozpoczyna host."
# ifdef XWFEATURE_SMS
IDS_SMS_CONN_L "Texting"
# endif
# ifdef XWFEATURE_IP_DIRECT
IDS_DIRECT_CONN_L "Direct connection"
# endif
# ifdef XWFEATURE_RELAY
IDS_XWRELAY_ERROR_TIMEOUT "Minął czas połączenia z proxy; najczęściej oznacza to,"\
"że inni gracze się nie pojawili."
IDS_ERROR_HEART_YOU "Rozłączono grę przez proxy, z powodu zbyt długiego "\
"oczekiwania na Twoją odpowiedź."
IDS_XWRELAY_ERROR_HEART_OTHER "Proxy utraciło połączenie z urządzeniem."
/* IDS_XWRELAY_ERROR_LOST_OTHER "The relay has lost contact with a device in this game." */
# endif
#endif

View file

@ -122,7 +122,6 @@
# define IDS_ERROR_HEART_YOU 40094
# define IDS_XWRELAY_ERROR_HEART_OTHER 40095
# define IDS_XWRELAY_ERROR_LOST_OTHER 40096
# define IDS_RELAY_CONN_L 40097
# endif
#endif

View file

@ -1028,7 +1028,6 @@ BEGIN
IDS_DIRECT_CONN_L "Direct connection"
# endif
# ifdef XWFEATURE_RELAY
IDS_RELAY_CONN_L "Relay"
IDS_XWRELAY_ERROR_TIMEOUT "The relay timed you out; usually that means "\
"the other players didn't show."
IDS_ERROR_HEART_YOU "You were disconnected from relay because it "\