Add strings and make other changes needed for compilation with BT on

for French, marked for translation.  Fix formatting and add emacs
compile string for English.
This commit is contained in:
ehouse 2007-12-09 04:02:24 +00:00
parent a07a5f2822
commit 4c686bdaa0
3 changed files with 22 additions and 18 deletions

View file

@ -1,4 +1,4 @@
/* -*- mode: c; -*- */
/* -*- mode: c; compile-command: "cd .. && make ARCH=68K_ONLY MEMDEBUG=TRUE"; -*- */
/*
* Copyright 1997 - 2002 by Eric House (xwords@eehouse.org) and others. All rights reserved.
*
@ -147,10 +147,10 @@
{ "STR_ABOUT_CONTENT",
#ifdef XWFEATURE_BLUETOOTH
"THANKS FOR DOWNLOADING this beta version of "
"Crosswords. Please see the notes and caveats at "
"xwords.sf.net/bt_palm.php. Please report bugs to "
"ehouse@users.sf.net. Enjoy!\n\n"
"THANKS FOR DOWNLOADING this beta version of "
"Crosswords. Please see the notes and caveats at "
"xwords.sf.net/bt_palm.php. Please report bugs to "
"ehouse@users.sf.net. Enjoy!\n\n"
#endif
"Crosswords " XW_PALM_VERSION_STRING " (rev. " SVN_REV ").\n" \
"Copyright 1998-2007 by Eric House. "\

View file

@ -1,4 +1,4 @@
/* -*- mode: c; -*- */
/* -*- mode: c; compile-command: "cd .. && make ARCH=68K_ONLY MEMDEBUG=TRUE LANG=fr_FR"; -*- */
/*
* Copyright 1997 - 2007 by Eric House (xwords@eehouse.org) and
* others. All rights reserved. Traduction en français par Francis H.
@ -125,6 +125,8 @@
{ "STR_TOTALPLAYERS", "Total joueurs" },
#ifdef XWFEATURE_RELAY
/* Needs translation (or confirmation) */
{ "STR_RELAY_XPORTNAME", "Internet" },
{ "STR_RELAY_TIMEOUT", "Erreur réseau : les autres joueurs n'ont pu "
"se connecter." },
{ "STR_RELAY_LOST_OTHER", "Erreur réseau : la connexion d'un autre joueur "
@ -133,6 +135,8 @@
#endif
#ifdef XWFEATURE_BLUETOOTH
/* Needs translation (or confirmation) */
{ "STR_BT_XPORTNAME", "Bluetooth" },
{ "STR_BT_NOINIT", "Impossible initialiser Bluetooth. "
"Est-il connecté ?" },
/* Needs translation */
@ -143,12 +147,17 @@
{ "STR_BT_RESEND", "Resend" },
#endif
#ifdef XWFEATURE_IR
/* Needs translation (or confirmation) */
{ "STR_IR_XPORTNAME", "Transmission" },
#endif
{ "STR_ABOUT_CONTENT",
#ifdef XWFEATURE_BLUETOOTH
"MERCI DE VOTRE ATTENTION pour cette version alpha de "
"Crosswords. Svp, regardez les notes et avertissements sur "
"xwords.sf.net/bt_palm.php. Svp, signalez les bugs à "
"ehouse@users.sf.net. Au plaisir !\n\n"
"MERCI DE VOTRE ATTENTION pour cette version beta de "
"Crosswords. Svp, regardez les notes et avertissements sur "
"xwords.sf.net/bt_palm.php. Svp, signalez les bugs à "
"ehouse@users.sf.net. Au plaisir !\n\n"
#endif
"Crosswords " XW_PALM_VERSION_STRING " (rev. " SVN_REV ").\n" \
"Copyright 1998-2007 par Eric House. "\

View file

@ -291,18 +291,16 @@ BEGIN
POPUPTRIGGER "" ID XW_CONNS_TYPE_TRIGGER_ID
AT (PREVRIGHT+5 PREVTOP 72 12) LEFTANCHOR
LIST
"Bluetooth" "Transmission" "Internet" ID XW_CONNS_TYPE_LIST_ID
PREVLEFT PREVTOP 72 12 VISIBLEITEMS 3
"" ID XW_CONNS_TYPE_LIST_ID
PREVLEFT PREVTOP 72 12 VISIBLEITEMS 2
NONUSABLE POPUPLIST XW_CONNS_TYPE_TRIGGER_ID XW_CONNS_TYPE_LIST_ID
/* Bluetooth stuff must be here even if XWFEATURE_BLUETOOTH is not defined
since, e.g. ARM and 68K share these resources yet may not both support
BT */
LABEL "Pas de bluetooth disponible." XW_CONNS_BT_NOTSUPPORT_LABEL_ID
AT ( LEFTCOL+10 LOCALIP_TOP ) NONUSABLE
#ifdef XWFEATURE_BLUETOOTH
LABEL "Nom de l'hôte :" XW_CONNS_BT_HOSTNAME_LABEL_ID
AT ( PREVLEFT-6 PREVTOP+3 ) NONUSABLE
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
#endif
@ -323,9 +321,6 @@ BEGIN
AT ( LEFTCOL+10 PREVBOTTOM + 2 )
FIELD XW_CONNS_COOKIE_FIELD_ID CONNS_FIELD_LEFT PREVTOP 70 AUTO \
SINGLELINE EDITABLE UNDERLINED MAXCHARS 32
#else
LABEL "Connexion internet désactivée" XW_CONNS_RELAY_LABEL_ID
AT ( LEFTCOL+10 LOCALIP_TOP )
#endif
BUTTON "Annuler" XW_CONNS_CANCEL_BUTTON_ID 42 75 AUTO AUTO