From 4ea3e725244400a5e2fbff9febadb4294448ec85 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Tue, 24 Apr 2007 13:34:21 +0000
Subject: [PATCH] Make "Cur" string in tile-picker dialog localizable; move
 buttons in same for French to fit.

---
 palm/l10n/StrRes_en_US.pre      | 2 ++
 palm/l10n/StrRes_fr_FR.pre      | 1 +
 palm/l10n/xwords4_fr_FR.rcp.pre | 8 ++++----
 palm/palmmain.c                 | 4 +++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/palm/l10n/StrRes_en_US.pre b/palm/l10n/StrRes_en_US.pre
index badc8778f..e8b71e322 100644
--- a/palm/l10n/StrRes_en_US.pre
+++ b/palm/l10n/StrRes_en_US.pre
@@ -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
diff --git a/palm/l10n/StrRes_fr_FR.pre b/palm/l10n/StrRes_fr_FR.pre
index 4039dffde..8bfc69f20 100644
--- a/palm/l10n/StrRes_fr_FR.pre
+++ b/palm/l10n/StrRes_fr_FR.pre
@@ -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
diff --git a/palm/l10n/xwords4_fr_FR.rcp.pre b/palm/l10n/xwords4_fr_FR.rcp.pre
index 8cda28b03..27c0c46b6 100644
--- a/palm/l10n/xwords4_fr_FR.rcp.pre
+++ b/palm/l10n/xwords4_fr_FR.rcp.pre
@@ -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
 
diff --git a/palm/palmmain.c b/palm/palmmain.c
index 277fdb480..7a95a02de 100644
--- a/palm/palmmain.c
+++ b/palm/palmmain.c
@@ -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,