mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-18 22:26:30 +01:00
Make "Cur" string in tile-picker dialog localizable; move buttons in same for French to fit.
This commit is contained in:
parent
9037af3de3
commit
4ea3e72524
4 changed files with 10 additions and 5 deletions
|
@ -106,6 +106,8 @@
|
||||||
{ "STR_PICK_BLANK", "Select the letter for your blank." },
|
{ "STR_PICK_BLANK", "Select the letter for your blank." },
|
||||||
#ifdef FEATURE_TRAY_EDIT
|
#ifdef FEATURE_TRAY_EDIT
|
||||||
{ "STRS_PICK_TILE", "Choose a new tile for %s." },
|
{ "STRS_PICK_TILE", "Choose a new tile for %s." },
|
||||||
|
{ "STR_PICK_TILE_CUR", "Cur" },
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef NODE_CAN_4
|
#ifdef NODE_CAN_4
|
||||||
|
|
|
@ -109,6 +109,7 @@
|
||||||
{ "STR_PICK_BLANK", "Choisir la lettre en échange de la case blanche." },
|
{ "STR_PICK_BLANK", "Choisir la lettre en échange de la case blanche." },
|
||||||
#ifdef FEATURE_TRAY_EDIT
|
#ifdef FEATURE_TRAY_EDIT
|
||||||
{ "STRS_PICK_TILE", "Choisir une nouvelle lettre pour %s." },
|
{ "STRS_PICK_TILE", "Choisir une nouvelle lettre pour %s." },
|
||||||
|
{ "STR_PICK_TILE_CUR", "En cours" },
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef NODE_CAN_4
|
#ifdef NODE_CAN_4
|
||||||
|
|
|
@ -192,7 +192,7 @@ END
|
||||||
FORM ID XW_NEWGAMES_FORM AT (2 FORM_TOP 156 FORM_HEIGHT)
|
FORM ID XW_NEWGAMES_FORM AT (2 FORM_TOP 156 FORM_HEIGHT)
|
||||||
USABLE MODAL SAVEBEHIND DEFAULTBTNID XW_OK_BUTTON_ID
|
USABLE MODAL SAVEBEHIND DEFAULTBTNID XW_OK_BUTTON_ID
|
||||||
BEGIN
|
BEGIN
|
||||||
TITLE "Optons de la partie"
|
TITLE "Options de la partie"
|
||||||
|
|
||||||
#ifndef XWFEATURE_STANDALONE_ONLY
|
#ifndef XWFEATURE_STANDALONE_ONLY
|
||||||
LABEL "En jeu :" AUTOID AT (LEFTCOL SERVER_TOP)
|
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)
|
LIST "" ID XW_BLANK_LIST_ID AT (PREVRIGHT+2 BLANK_PICK_TOP 28 72)
|
||||||
USABLE VISIBLEITEMS 6
|
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
|
#ifdef FEATURE_TRAY_EDIT
|
||||||
BUTTON "Choisir toutes !" XW_BLANK_PICK_BUTTON_ID 5 65 AUTO AUTO
|
BUTTON "Choisir toutes !" XW_BLANK_PICK_BUTTON_ID 5 65 62 AUTO
|
||||||
BUTTON "Suppr." XW_BLANK_BACKUP_BUTTON_ID PREVRIGHT+5 PREVTOP 22 AUTO
|
BUTTON "Suppr." XW_BLANK_BACKUP_BUTTON_ID PREVRIGHT+4 PREVTOP 28 AUTO
|
||||||
#endif
|
#endif
|
||||||
END
|
END
|
||||||
|
|
||||||
|
|
|
@ -3477,13 +3477,15 @@ askBlankValue( PalmAppGlobals* globals, XP_U16 playerNum, const PickInfo* pi,
|
||||||
|
|
||||||
#ifdef FEATURE_TRAY_EDIT
|
#ifdef FEATURE_TRAY_EDIT
|
||||||
if ( !forBlank ) {
|
if ( !forBlank ) {
|
||||||
|
const char* cur = getResString( globals, STR_PICK_TILE_CUR );
|
||||||
XP_U16 lenSoFar;
|
XP_U16 lenSoFar;
|
||||||
XP_U16 i;
|
XP_U16 i;
|
||||||
|
|
||||||
lenSoFar = XP_STRLEN(labelBuf);
|
lenSoFar = XP_STRLEN(labelBuf);
|
||||||
lenSoFar += XP_SNPRINTF( labelBuf + lenSoFar,
|
lenSoFar += XP_SNPRINTF( labelBuf + lenSoFar,
|
||||||
sizeof(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 ) {
|
for ( i = 0; i < pi->nCurTiles; ++i ) {
|
||||||
lenSoFar += XP_SNPRINTF( labelBuf+lenSoFar,
|
lenSoFar += XP_SNPRINTF( labelBuf+lenSoFar,
|
||||||
|
|
Loading…
Reference in a new issue