Make "Cur" string in tile-picker dialog localizable; move buttons in same for French to fit.

This commit is contained in:
ehouse 2007-04-24 13:34:21 +00:00
parent 9037af3de3
commit 4ea3e72524
4 changed files with 10 additions and 5 deletions

View file

@ -106,6 +106,8 @@
{ "STR_PICK_BLANK", "Select the letter for your blank." },
#ifdef FEATURE_TRAY_EDIT
{ "STRS_PICK_TILE", "Choose a new tile for %s." },
{ "STR_PICK_TILE_CUR", "Cur" },
#endif
#ifdef NODE_CAN_4

View file

@ -109,6 +109,7 @@
{ "STR_PICK_BLANK", "Choisir la lettre en échange de la case blanche." },
#ifdef FEATURE_TRAY_EDIT
{ "STRS_PICK_TILE", "Choisir une nouvelle lettre pour %s." },
{ "STR_PICK_TILE_CUR", "En cours" },
#endif
#ifdef NODE_CAN_4

View file

@ -192,7 +192,7 @@ END
FORM ID XW_NEWGAMES_FORM AT (2 FORM_TOP 156 FORM_HEIGHT)
USABLE MODAL SAVEBEHIND DEFAULTBTNID XW_OK_BUTTON_ID
BEGIN
TITLE "Optons de la partie"
TITLE "Options de la partie"
#ifndef XWFEATURE_STANDALONE_ONLY
LABEL "En jeu :" AUTOID AT (LEFTCOL SERVER_TOP)
@ -540,11 +540,11 @@ BEGIN
LIST "" ID XW_BLANK_LIST_ID AT (PREVRIGHT+2 BLANK_PICK_TOP 28 72)
USABLE VISIBLEITEMS 6
BUTTON "Ok" XW_BLANK_OK_BUTTON_ID RIGHT@PREVLEFT-8 65 AUTO AUTO
BUTTON "Ok" XW_BLANK_OK_BUTTON_ID RIGHT@PREVLEFT-4 65 16 AUTO
#ifdef FEATURE_TRAY_EDIT
BUTTON "Choisir toutes !" XW_BLANK_PICK_BUTTON_ID 5 65 AUTO AUTO
BUTTON "Suppr." XW_BLANK_BACKUP_BUTTON_ID PREVRIGHT+5 PREVTOP 22 AUTO
BUTTON "Choisir toutes !" XW_BLANK_PICK_BUTTON_ID 5 65 62 AUTO
BUTTON "Suppr." XW_BLANK_BACKUP_BUTTON_ID PREVRIGHT+4 PREVTOP 28 AUTO
#endif
END

View file

@ -3477,13 +3477,15 @@ askBlankValue( PalmAppGlobals* globals, XP_U16 playerNum, const PickInfo* pi,
#ifdef FEATURE_TRAY_EDIT
if ( !forBlank ) {
const char* cur = getResString( globals, STR_PICK_TILE_CUR );
XP_U16 lenSoFar;
XP_U16 i;
lenSoFar = XP_STRLEN(labelBuf);
lenSoFar += XP_SNPRINTF( labelBuf + lenSoFar,
sizeof(labelBuf) - lenSoFar,
" (%d/%d)\nCur", pi->thisPick+1, pi->nTotal );
" (%d/%d)\n%s", pi->thisPick+1, pi->nTotal,
cur );
for ( i = 0; i < pi->nCurTiles; ++i ) {
lenSoFar += XP_SNPRINTF( labelBuf+lenSoFar,