Catch French up with change for BT connect confirmation (pending

translation.)
This commit is contained in:
ehouse 2007-12-14 13:37:12 +00:00
parent 1872928530
commit d82f47f60d
3 changed files with 31 additions and 9 deletions

View file

@ -143,7 +143,8 @@
"on if you want Crosswords to use it." },
{ "STRS_BT_CONFIRM", "Is Crosswords running on the host device and "
"ready to accept a connection? (If you "
"choose \"No\" Crosswords will not try to connect until you restart it "
"choose \"No\" Crosswords will not try to "
"connect until you restart it "
"or choose the \"Resend\" menu item.)" },
#endif

View file

@ -139,12 +139,12 @@
{ "STR_BT_XPORTNAME", "Bluetooth" },
{ "STR_BT_NOINIT", "Impossible initialiser Bluetooth. "
"Est-il connecté ?" },
{ "STRS_BT_NOHOST", "Les messages Bluetooth n'arrivent pas à "
"Crosswords sur %s. Pourriez-vous me le "
"renvoyer ? (Si vous choisissez \"Non\" je "
"ne réessayerai pas jusqu'à ce que vous "
"choisissiez \"Renvoyer\" dans le menu.)" },
{ "STR_BT_RESEND", "Envoyer à nouveau" },
/* needs translation */
{ "STRS_BT_CONFIRM", "Is Crosswords running on the host device and "
"ready to accept a connection? (If you "
"choose \"No\" Crosswords will not try to "
"connect until you restart it "
"or choose the \"Resend\" menu item.)" },
#endif
#ifdef XWFEATURE_IR

View file

@ -276,6 +276,13 @@ NAVIGATIONMAP
END /* NAVIGATION ID XW_NEWGAMES_FORM */
#endif
#ifdef XWFEATURE_BLUETOOTH
/* Let's define this in one place so it stays the same */
/* needs translation */
# define BT_CONF_STRING "Ask before connecting Bluetooth"
#endif
#if defined XWFEATURE_RELAY || defined XWFEATURE_BLUETOOTH || defined XWFEATURE_IR
#define LEFTCOL 4
#define CONNS_FIELD_LEFT 73
@ -303,6 +310,8 @@ BEGIN
AT ( LEFTCOL LOCALIP_TOP+5 ) NONUSABLE
SELECTORTRIGGER "Trouver l'hôte..." XW_CONNS_BT_HOSTTRIGGER_ID \
AT (CONNS_FIELD_LEFT PREVTOP 70 AUTO) NONUSABLE LEFTANCHOR
CHECKBOX BT_CONF_STRING ID XW_CONNS_BTCONFIRM_CHECKBOX_ID \
AT ( LEFTCOL LOCALIP_TOP+21 AUTO AUTO ) NONUSABLE
#endif
/* Relay... */
@ -338,16 +347,22 @@ END /* XW_CONNS_FORM */
#else
# define SEARCHLIMIT_ADJUST 0
#endif
#ifdef XWFEATURE_BLUETOOTH
# define BTCONF_ADJUST PREFS_SPACING
#else
# define BTCONF_ADJUST 0
#endif
#define PREFS_MODE_TOP 15
#define PREFS_ROW1 30
#define PREFS_SPACING 15
/* #define DLG_TOP (52-TRAY_EDIT_ADJUST-SEARCHLIMIT_ADJUST) */
#define DLG_HEIGHT (112+TRAY_EDIT_ADJUST+SEARCHLIMIT_ADJUST)
#define DLG_HEIGHT (112+TRAY_EDIT_ADJUST+SEARCHLIMIT_ADJUST+BTCONF_ADJUST)
#define DLG_TOP (160 - DLG_HEIGHT - 2)
#define TIMER_TOP (74+SEARCHLIMIT_ADJUST)
#define BUTTON_TOP (TIMER_TOP+18+TRAY_EDIT_ADJUST)
#define BTCONF_TOP (TIMER_TOP+18+TRAY_EDIT_ADJUST)
#define BUTTON_TOP (BTCONF_TOP + PREFS_SPACING)
#define PREFS_LNHT 4
FORM ID XW_PREFS_FORM AT (2 DLG_TOP 156 DLG_HEIGHT)
@ -416,6 +431,11 @@ BEGIN
AT (LEFTCOL PREVTOP+PREFS_SPACING AUTO AUTO) NONUSABLE
#endif
#ifdef XWFEATURE_BLUETOOTH
CHECKBOX BT_CONF_STRING ID XW_PREFS_BTCONFIRM_CHECKBOX_ID \
AT (LEFTCOL PREVTOP+PREFS_SPACING AUTO AUTO) NONUSABLE
#endif
/* buttons at the bottom */
BUTTON "Annuler" XW_PREFS_CANCEL_BUTTON_ID 42 BUTTON_TOP AUTO AUTO
BUTTON "Ok" XW_PREFS_OK_BUTTON_ID PREVRIGHT+10 PREVTOP AUTO AUTO
@ -450,6 +470,7 @@ NAVIGATIONMAP
#ifdef FEATURE_TRAY_EDIT
ROW XW_PREFS_PICKTILES_CHECKBOX_ID
#endif
ROW XW_PREFS_BTCONFIRM_CHECKBOX_ID
/* cmd buttons */
ROW XW_PREFS_CANCEL_BUTTON_ID