diff --git a/xwords4/android/XWords4/archive/R.java b/xwords4/android/XWords4/archive/R.java index a97b0730c..8563958bc 100644 --- a/xwords4/android/XWords4/archive/R.java +++ b/xwords4/android/XWords4/archive/R.java @@ -2391,7 +2391,7 @@ public final class R { 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 play in a different language. As with the above, this should be impossible when connecting via the relay. diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index b77d179ad..eadd0f4f0 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -679,7 +679,7 @@ --> - The robot made this move:\u0020 + The robot %1$s made this move:\u0020 exchanged %1$d tiles. - Eht tobor edam siht evom:\u0020 + Eht tobor %1$s edam siht evom:\u0020 degnahcxe %1$d selit. El robot ha canviat %1$d fitxes en aquest torn. - El robot ha fet aquesta jugada: + %1$s quantitat/valors:\n + %1$d [fitxes romanents] - %1$d [fitxes al faristol] diff --git a/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml b/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml index 44cb1ca7b..9482ec856 100644 --- a/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml +++ b/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml @@ -571,7 +571,7 @@ ############################################################ --> - THE ROBOT MADE THIS MOVE:\u0020 + THE ROBOT %1$s MADE THIS MOVE:\u0020 EXCHANGED %1$d TILES. Robot v tomto tahu vyměnil %1$d kamenů. - Robot provedl tento tah: + %1$s počet/hodnota:\n + %1$d [všechny zbývající kameny] - %1$d [nepoužité kameny] diff --git a/xwords4/android/XWords4/res_src/values-pt/strings.xml b/xwords4/android/XWords4/res_src/values-pt/strings.xml index 2be67cb53..4f8031357 100644 --- a/xwords4/android/XWords4/res_src/values-pt/strings.xml +++ b/xwords4/android/XWords4/res_src/values-pt/strings.xml @@ -574,7 +574,7 @@ ############################################################ --> - O robô fez esta jogada:\u0020 + trocou %1$d pedras. Robot v tomto ťahu vymenil %1$d kameňov. - Robot uskutočnil tento ťah: + %1$s počet/hodnota:\n + %1$d [všetky zostávajúce kamene] - %1$d [nepoužité kamene] diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java index 2fd018cef..e409e9d4e 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java @@ -148,7 +148,7 @@ public class UtilCtxtImpl implements UtilCtxt { id = R.string.strd_robot_traded_fmt; break; case UtilCtxt.STR_ROBOT_MOVED: - id = R.string.str_robot_moved; + id = R.string.str_robot_moved_fmt; break; case UtilCtxt.STRS_VALUES_HEADER: id = R.string.strs_values_header_fmt; diff --git a/xwords4/common/server.c b/xwords4/common/server.c index b5ada2aca..307843f50 100644 --- a/xwords4/common/server.c +++ b/xwords4/common/server.c @@ -997,14 +997,12 @@ showPrevScore( ServerCtxt* server ) lp = &gi->players[prevTurn]; 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 ); } else { 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_catString( stream, str ); diff --git a/xwords4/linux/linuxutl.c b/xwords4/linux/linuxutl.c index 3e69371b9..ae2047b36 100644 --- a/xwords4/linux/linuxutl.c +++ b/xwords4/linux/linuxutl.c @@ -310,7 +310,7 @@ linux_util_getUserString( XW_UtilCtxt* XP_UNUSED(uc), XP_U16 code ) case STRD_ROBOT_TRADED: return (XP_UCHAR*)"%d tiles traded this turn."; case STR_ROBOT_MOVED: - return (XP_UCHAR*)"The robot moved:\n"; + return (XP_UCHAR*)"The robot \"%s\" moved:\n"; case STRS_REMOTE_MOVED: return (XP_UCHAR*)"Remote player \"%s\" moved:\n";