Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-30 10:26:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

include robot name in report of his score

Browse source
This commit is contained in:
Eric House 2014-10-23 06:32:24 -07:00
parent 8486bad44b
commit 51a1ddfe39
11 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4/archive/R.java
View file

@ -2391,7 +2391,7 @@ public final class R {
Notifies user of a normal robot move Notifies user of a normal robot move
*/ */
public static final int str_robot_moved=0x7f050110; public static final int str_robot_moved_fmt=0x7f050110;
/** Shown when a remote device tries to join a game and wants to /** Shown when a remote device tries to join a game and wants to
play in a different language. As with the above, this should play in a different language. As with the above, this should
be impossible when connecting via the relay. be impossible when connecting via the relay.

2
xwords4/android/XWords4/res/values/strings.xml
View file

@ -679,7 +679,7 @@
--> -->
<!-- Notifies user of a normal robot move --> <!-- Notifies user of a normal robot move -->
<string name="str_robot_moved">The robot made this move:\u0020</string> <string name="str_robot_moved_fmt">The robot %1$s made this move:\u0020</string>
<!-- Notifies user of a robot trade move --> <!-- Notifies user of a robot trade move -->
<string name="strd_robot_traded_fmt">exchanged %1$d tiles.</string> <string name="strd_robot_traded_fmt">exchanged %1$d tiles.</string>
<!-- title for window you get when you select menu with text <!-- title for window you get when you select menu with text

2
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
View file

@ -571,7 +571,7 @@
############################################################ ############################################################
--> -->
<!-- Notifies user of a normal robot move --> <!-- Notifies user of a normal robot move -->
<string name="str_robot_moved">Eht tobor edam siht evom:\u0020</string> <string name="str_robot_moved_fmt">Eht tobor %1$s edam siht evom:\u0020</string>
<!-- Notifies user of a robot trade move --> <!-- Notifies user of a robot trade move -->
<string name="strd_robot_traded_fmt">degnahcxe %1$d selit.</string> <string name="strd_robot_traded_fmt">degnahcxe %1$d selit.</string>
<!-- title for window you get when you select menu with text <!-- title for window you get when you select menu with text

2
xwords4/android/XWords4/res_src/values-ca/strings.xml
View file

@ -51,7 +51,7 @@
<string name="board_menu_file_about">Quant al Crosswords</string> <string name="board_menu_file_about">Quant al Crosswords</string>
<!-- returned by util_getUserString --> <!-- returned by util_getUserString -->
<string name="strd_robot_traded_fmt">El robot ha canviat %1$d fitxes en aquest torn.</string> <string name="strd_robot_traded_fmt">El robot ha canviat %1$d fitxes en aquest torn.</string>
<string name="str_robot_moved">El robot ha fet aquesta jugada:</string> <!--string name="str_robot_moved">El robot ha fet aquesta jugada:</string-->
<string name="strs_values_header_fmt">%1$s quantitat/valors:\n</string> <string name="strs_values_header_fmt">%1$s quantitat/valors:\n</string>
<string name="strd_remaining_tiles_add_fmt">+ %1$d [fitxes romanents]</string> <string name="strd_remaining_tiles_add_fmt">+ %1$d [fitxes romanents]</string>
<string name="strd_unused_tiles_sub_fmt"> - %1$d [fitxes al faristol]</string> <string name="strd_unused_tiles_sub_fmt"> - %1$d [fitxes al faristol]</string>

2
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
View file

@ -571,7 +571,7 @@
############################################################ ############################################################
--> -->
<!-- Notifies user of a normal robot move --> <!-- Notifies user of a normal robot move -->
<string name="str_robot_moved">THE ROBOT MADE THIS MOVE:\u0020</string> <string name="str_robot_moved_fmt">THE ROBOT %1$s MADE THIS MOVE:\u0020</string>
<!-- Notifies user of a robot trade move --> <!-- Notifies user of a robot trade move -->
<string name="strd_robot_traded_fmt">EXCHANGED %1$d TILES.</string> <string name="strd_robot_traded_fmt">EXCHANGED %1$d TILES.</string>
<!-- title for window you get when you select menu with text <!-- title for window you get when you select menu with text

2
xwords4/android/XWords4/res_src/values-cs/strings.xml
View file

@ -51,7 +51,7 @@
<string name="board_menu_file_about">O Crosswords</string> <string name="board_menu_file_about">O Crosswords</string>
<!-- returned by util_getUserString --> <!-- returned by util_getUserString -->
<string name="strd_robot_traded_fmt">Robot v tomto tahu vyměnil %1$d kamenů.</string> <string name="strd_robot_traded_fmt">Robot v tomto tahu vyměnil %1$d kamenů.</string>
<string name="str_robot_moved">Robot provedl tento tah:</string> <!--string name="str_robot_moved">Robot provedl tento tah:</string-->
<string name="strs_values_header_fmt">%1$s počet/hodnota:\n</string> <string name="strs_values_header_fmt">%1$s počet/hodnota:\n</string>
<string name="strd_remaining_tiles_add_fmt">+ %1$d [všechny zbývající kameny]</string> <string name="strd_remaining_tiles_add_fmt">+ %1$d [všechny zbývající kameny]</string>
<string name="strd_unused_tiles_sub_fmt">- %1$d [nepoužité kameny]</string> <string name="strd_unused_tiles_sub_fmt">- %1$d [nepoužité kameny]</string>

2
xwords4/android/XWords4/res_src/values-pt/strings.xml
View file

@ -574,7 +574,7 @@
############################################################ ############################################################
--> -->
<!-- Notifies user of a normal robot move --> <!-- Notifies user of a normal robot move -->
<string name="str_robot_moved">O robô fez esta jogada:\u0020</string> <!--string name="str_robot_moved">O robô fez esta jogada:\u0020</string-->
<!-- Notifies user of a robot trade move --> <!-- Notifies user of a robot trade move -->
<string name="strd_robot_traded_fmt">trocou %1$d pedras.</string> <string name="strd_robot_traded_fmt">trocou %1$d pedras.</string>
<!-- title for window you get when you select menu with text <!-- title for window you get when you select menu with text

2
xwords4/android/XWords4/res_src/values-sk/strings.xml
View file

@ -314,7 +314,7 @@
<string name="game_item_menu_title_fmt">XLATE ME: \"%1$s\" actions:</string> <string name="game_item_menu_title_fmt">XLATE ME: \"%1$s\" actions:</string>
<!-- returned by util_getUserString --> <!-- returned by util_getUserString -->
<string name="strd_robot_traded_fmt">Robot v tomto ťahu vymenil %1$d kameňov.</string> <string name="strd_robot_traded_fmt">Robot v tomto ťahu vymenil %1$d kameňov.</string>
<string name="str_robot_moved">Robot uskutočnil tento ťah:</string> <!--string name="str_robot_moved">Robot uskutočnil tento ťah:</string-->
<string name="strs_values_header_fmt">%1$s počet/hodnota:\n</string> <string name="strs_values_header_fmt">%1$s počet/hodnota:\n</string>
<string name="strd_remaining_tiles_add_fmt">+ %1$d [všetky zostávajúce kamene]</string> <string name="strd_remaining_tiles_add_fmt">+ %1$d [všetky zostávajúce kamene]</string>
<string name="strd_unused_tiles_sub_fmt">- %1$d [nepoužité kamene]</string> <string name="strd_unused_tiles_sub_fmt">- %1$d [nepoužité kamene]</string>

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java
View file

@ -148,7 +148,7 @@ public class UtilCtxtImpl implements UtilCtxt {
id = R.string.strd_robot_traded_fmt; id = R.string.strd_robot_traded_fmt;
break; break;
case UtilCtxt.STR_ROBOT_MOVED: case UtilCtxt.STR_ROBOT_MOVED:
id = R.string.str_robot_moved; id = R.string.str_robot_moved_fmt;
break; break;
case UtilCtxt.STRS_VALUES_HEADER: case UtilCtxt.STRS_VALUES_HEADER:
id = R.string.strs_values_header_fmt; id = R.string.strs_values_header_fmt;

6
xwords4/common/server.c
View file

@ -997,14 +997,12 @@ showPrevScore( ServerCtxt* server )
lp = &gi->players[prevTurn]; lp = &gi->players[prevTurn];
if ( LP_IS_LOCAL(lp) ) { if ( LP_IS_LOCAL(lp) ) {
/* Why can't a local non-robot have postponed score? */
// XP_ASSERT( LP_IS_ROBOT(lp) );
str = util_getUserString( util, STR_ROBOT_MOVED ); str = util_getUserString( util, STR_ROBOT_MOVED );
} else { } else {
str = util_getUserString( util, STRS_REMOTE_MOVED ); str = util_getUserString( util, STRS_REMOTE_MOVED );
XP_SNPRINTF( buf, sizeof(buf), str, lp->name );
str = buf;
} }
XP_SNPRINTF( buf, sizeof(buf), str, lp->name );
str = buf;
stream = mkServerStream( server ); stream = mkServerStream( server );
stream_catString( stream, str ); stream_catString( stream, str );

2
xwords4/linux/linuxutl.c
View file

@ -310,7 +310,7 @@ linux_util_getUserString( XW_UtilCtxt* XP_UNUSED(uc), XP_U16 code )
case STRD_ROBOT_TRADED: case STRD_ROBOT_TRADED:
return (XP_UCHAR*)"%d tiles traded this turn."; return (XP_UCHAR*)"%d tiles traded this turn.";
case STR_ROBOT_MOVED: case STR_ROBOT_MOVED:
return (XP_UCHAR*)"The robot moved:\n"; return (XP_UCHAR*)"The robot \"%s\" moved:\n";
case STRS_REMOTE_MOVED: case STRS_REMOTE_MOVED:
return (XP_UCHAR*)"Remote player \"%s\" moved:\n"; return (XP_UCHAR*)"Remote player \"%s\" moved:\n";