mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-15 15:41:24 +01:00
Change Resend menu text, and to make it clearer put up an error message when it's used in a standalone game.
This commit is contained in:
parent
3dc9f327f8
commit
fbc2535979
5 changed files with 16 additions and 10 deletions
|
@ -31,10 +31,12 @@
|
|||
{ "STR_SERVER_DICT_WINS",
|
||||
"Conflict between Host and Guest dictionaries; Host wins." },
|
||||
{ "STR_REG_UNEXPECTED_USER", "Attempt to register unexpected user refused" },
|
||||
{ "STR_RESEND_IR", "Unable to send message via IR; resend?" },
|
||||
{ "STR_RESEND_STANDALONE", "This is a standalone game. There is nothing "
|
||||
"to resend." },
|
||||
#endif
|
||||
{ "STR_TOO_FEW_TILES", "Too few tiles left to trade." },
|
||||
{ "STR_CANT_UNDO_TILEASSIGN", "Nothing to undo. (Initial tile picking cannot be undone.)" },
|
||||
{ "STR_CANT_UNDO_TILEASSIGN", "Nothing to undo. (Initial tile picking "
|
||||
"cannot be undone.)" },
|
||||
{ "STR_VALUES_TITLE", "Counts and Values" },
|
||||
{ "STR_REMAINS_TITLE","Remaining tiles" },
|
||||
{ "STRS_VALUES_HEADER", "%s counts/values:\n" },
|
||||
|
@ -139,9 +141,10 @@
|
|||
{ "STR_BT_XPORTNAME", "Bluetooth" },
|
||||
{ "STR_BT_NOINIT", "Bluetooth appears to be off. Please turn it "
|
||||
"on if you want Crosswords to use it." },
|
||||
{ "STRS_BT_NOHOST", "Bluetooth messages are not reaching Crosswords on %s. "
|
||||
"Do you want me to resend? (If you choose \"No\" I will not try "
|
||||
"again until you choose the \"Resend messages\" menu item.)" },
|
||||
{ "STRS_BT_NOHOST", "Bluetooth messages are not reaching Crosswords "
|
||||
"on %s. Do you want me to resend? (If you "
|
||||
"choose \"No\" I will not try again until you "
|
||||
"choose the \"Resend\" menu item.)" },
|
||||
{ "STR_BT_RESEND", "Resend" },
|
||||
#endif
|
||||
|
||||
|
|
|
@ -34,7 +34,9 @@
|
|||
{ "STR_SERVER_DICT_WINS",
|
||||
"Conflit entre les dictionnaires Hôte et Invité ; l'hôte gagne." },
|
||||
{ "STR_REG_UNEXPECTED_USER", "Essai refusé de l'enregistrement de l'utilisateur" },
|
||||
{ "STR_RESEND_IR", "Impossible envoyer message par IR; réessayer ?" },
|
||||
/* Needs translation */
|
||||
{ "STR_RESEND_STANDALONE", "This is a standalone game. There is nothing "
|
||||
"to resend." },
|
||||
#endif
|
||||
{ "STR_TOO_FEW_TILES", "Pas assez de lettres pour échanger." },
|
||||
{ "STR_CANT_UNDO_TILEASSIGN", "Impossible d'annuler. (Le tirage initial ne peut être annulé.)" },
|
||||
|
@ -141,8 +143,7 @@
|
|||
"Crosswords sur %s. Pourriez-vous me le "
|
||||
"renvoyer ? (Si vous choisissez \"Non\" je "
|
||||
"ne réessayerai pas jusqu'à ce que vous "
|
||||
"choisissiez \"Renvoyer messages\" dans "
|
||||
"le menu.)" },
|
||||
"choisissiez \"Renvoyer\" dans le menu.)" },
|
||||
{ "STR_BT_RESEND", "Envoyer à nouveau" },
|
||||
#endif
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ BEGIN
|
|||
MENUITEM "Final scores" XW_FINISH_PULLDOWN_ID "F"
|
||||
#ifndef XWFEATURE_STANDALONE_ONLY
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Resend messages" XW_RESENDIR_PULLDOWN_ID
|
||||
MENUITEM "Resend" XW_RESENDIR_PULLDOWN_ID
|
||||
#endif
|
||||
END
|
||||
PULLDOWN "Move"
|
||||
|
|
|
@ -52,7 +52,7 @@ BEGIN
|
|||
MENUITEM "Score final" XW_FINISH_PULLDOWN_ID "F"
|
||||
#ifndef XWFEATURE_STANDALONE_ONLY
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Envoyer messages" XW_RESENDIR_PULLDOWN_ID
|
||||
MENUITEM "Renvoyer" XW_RESENDIR_PULLDOWN_ID
|
||||
#endif
|
||||
END
|
||||
PULLDOWN "Coup"
|
||||
|
|
|
@ -2767,6 +2767,8 @@ mainViewHandleEvent( EventPtr event )
|
|||
globals->suspendBT = XP_FALSE;
|
||||
#endif
|
||||
(void)comms_resendAll( globals->game.comms );
|
||||
} else {
|
||||
userErrorFromStrId( globals, STR_RESEND_STANDALONE );
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue