get rid of #1 used to make strings unique: remove duplicates where

possible, and where not replace it with a non-printing zero-width
unicode char.

xwords4/android/XWords4/res/layout/new_game.xml

@@ -56,7 +56,7 @@
               style="@style/evenly_spaced_horizontal"
               />
       <Button android:id="@+id/newgame_local_config"
-              android:text="@string/newgame_local_config" 
+              android:text="@string/newgame_configure_first" 
               style="@style/evenly_spaced_horizontal"
               />
     </LinearLayout>
@@ -95,7 +95,7 @@
               />
 
       <Button android:id="@+id/newgame_net_config"
-              android:text="@string/newgame_net_config" 
+              android:text="@string/newgame_configure_first" 
               style="@style/evenly_spaced_horizontal"
               />
     </LinearLayout>
@@ -121,7 +121,7 @@
       <Button android:id="@+id/newgame_enable_sms"
               android:layout_width="fill_parent" 
               android:layout_height="wrap_content"
-              android:text="@string/newgame_enable_sms" 
+              android:text="@string/button_go_settings" 
               />
     </LinearLayout>
 
@@ -158,7 +158,7 @@
                 />
 
         <Button android:id="@+id/newgame_sms_config"
-                android:text="@string/newgame_net_config" 
+                android:text="@string/newgame_configure_first" 
                 style="@style/evenly_spaced_horizontal"
                 />
       </LinearLayout>
@@ -222,7 +222,7 @@
                   />
 
           <Button android:id="@+id/newgame_bt_config"
-                  android:text="@string/newgame_net_config" 
+                  android:text="@string/newgame_configure_first" 
                   style="@style/evenly_spaced_horizontal"
                   />
       </LinearLayout>

xwords4/android/XWords4/res/values/strings.xml

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
+    <!-- What is \u200C? English strings are used as keys, so they all
+         need to be unique.  This glyph is non-printing and of
+         zero-width, so it should do the trick:
+         http://en.wikipedia.org/wiki/Zero-width_non-joiner 
+      -->
+
     <!--
        ############################################################
        # :Screens:
@@ -128,7 +134,7 @@
     <!-- pulls up dialog to reset the selected game, that is to remove
          all moves so that it's the same as a newly created game
          except for any configuration. -->
-    <string name="list_item_reset">Reset#1</string>
+    <string name="list_item_reset">Reset\u200C</string>
     <!-- creates a new game with all configuation copied from the
          selected game -->
     <string name="list_item_new_from">New from</string>
@@ -888,7 +894,7 @@
     <!-- Put nothing in the summary space, so it just reads "Game 2" -->
     <string name="game_summary_field_empty">\u003CNothing\u003E</string>
     <!-- Put the language there, so it reads "Game 2 (English)" -->
-    <string name="game_summary_field_language">Game language#1</string>
+    <string name="game_summary_field_language">Game language\u200C</string>
     <!-- List names of opponents (summarized), e.g. "Game 2 (vs Kati)" -->
     <string name="game_summary_field_opponents">Opponent name[s]</string>
     <!-- List the state of the game, "Game over" or "10 moves made"
@@ -934,15 +940,6 @@
          are showns as the names of editable colors and as the the
          title of the color editor that comes up when the name is
          tapped. -->
-    <!-- First of four players (color for, that is ) -->
-    <string name="player0">First player#1</string>
-    <!-- Second of four players (color for, that is ) -->
-    <string name="player1">Second player#1</string>
-    <!-- Third of four players (color for, that is ) -->
-    <string name="player2">Third player#1</string>
-    <!-- Fourth of four players (color for, that is ) -->
-    <string name="player3">Fourth player#1</string>
-
     <!-- (color for) double-letter bonus squares on the board -->
     <string name="bonus_l2x">Double letter</string>
     <!-- (color for) triple-letter bonus squares on the board -->
@@ -1131,7 +1128,7 @@
 
     <!-- Text of second of two buttons for new standalone games.  Tap
     this and you'll get taken to the "Game configure" screen -->
-    <string name="newgame_local_config">Configure first</string>
+    <string name="newgame_configure_first">Configure first</string>
 
     <!-- section separator (white-on-gray bar) for second section:
          networked games -->
@@ -1153,10 +1150,6 @@
          launched to send your invitation. -->
     <string name="newgame_invite">Invite now</string>
 
-    <!-- Text of second of two buttons for new networked games.  Tap
-    this and you'll get taken to the "Game configure" screen -->
-    <string name="newgame_net_config">Configure first#1</string>
-
     <!-- section separator (white-on-gray bar) for third section:
          bluetooth games -->
     <string name="newgame_bt_header">New Bluetooth game</string>
@@ -1557,7 +1550,7 @@
          score and an accounting of it (including subtractions for
          running out the game timer if there is one.)
      -->
-    <string name="finalscores_title">Final scores#1</string>
+    <string name="finalscores_title">Final scores\u200C</string>
 
     <!-- text of confirmation dialog shown when user chooses the menu
          item with text board_menu_game_final and the game is not over
@@ -1781,7 +1774,7 @@
     <string name="changes_title">Recent changes</string>
     <!-- text of button in About Crosswords dialog summoning above
          dialog -->
-    <string name="changes_button">Recent changes#1</string>
+    <string name="changes_button">Recent changes\u200C</string>
 
     <!-- New strings that need to be documented and found a home
          above. -->
@@ -1817,7 +1810,7 @@
       <!--  -->
     <string name="word_search_hint">First letters</string>
       <!--  -->
-    <string name="tilepick_undo">Undo last#1</string>
+    <string name="tilepick_undo">Undo last\u200C</string>
       <!--  -->
     <string name="tilepick_all">Pick for me</string>
       <!--  -->
@@ -1882,7 +1875,7 @@
       <!--  -->
     <string name="summary_wait_guest">Unconnected</string>
       <!--  -->
-    <string name="summary_gameover">Game over#1</string>
+    <string name="summary_gameover">Game over\u200C</string>
       <!--  -->
     <string name="summary_conn">Game in play</string>
       <!--  -->
@@ -1932,8 +1925,6 @@
     <string name="sms_disabled">Playing via SMS is currently disabled.
     You can enable it in Settings->Network game settings.</string>
     <!--  -->
-    <string name="newgame_enable_sms">Launch Settings</string>
-    <!--  -->
     <string name="dft_sms_name_fmt">SMS Game %1$X</string>    
     <!--  -->
     <string name="new_sms_title">New game via SMS</string>
@@ -2175,7 +2166,7 @@
     <string name="enable_nfc">NFC is turned off on this device. You
     can use the Android Settings app to turn it on .</string>
 
-    <string name="button_go_settings">Launch Settings#1</string>
+    <string name="button_go_settings">Launch Settings</string>
 
     <string name="no_hide_titlebar">This setting is ignored on devices
     like yours that depend on the \"Action bar.\"</string>

xwords4/android/XWords4/res/xml/xwprefs.xml

@@ -152,22 +152,22 @@
                       >
       <org.eehouse.android.xw4.EditColorPreference
          android:key="@string/key_player0"
-         android:title="@string/player0"
+         android:title="@string/pref_player1_name"
          android:defaultValue="0x000000"
          />
       <org.eehouse.android.xw4.EditColorPreference
          android:key="@string/key_player1"
-         android:title="@string/player1"
+         android:title="@string/pref_player2_name"
          android:defaultValue="0xFF0000"
          />
       <org.eehouse.android.xw4.EditColorPreference
          android:key="@string/key_player2"
-         android:title="@string/player2"
+         android:title="@string/pref_player3_name"
          android:defaultValue="0x0000FF"
          />
       <org.eehouse.android.xw4.EditColorPreference
          android:key="@string/key_player3"
-         android:title="@string/player3"
+         android:title="@string/pref_player4_name"
          android:defaultValue="0x008F00"
          />
       <org.eehouse.android.xw4.EditColorPreference

xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java

@@ -2078,7 +2078,7 @@ public class BoardDelegate extends DelegateBase
         case COMMS_CONN_SMS:
             if ( XWApp.SMSSUPPORTED && !XWPrefs.getSMSEnabled( m_activity ) ) {
                 showConfirmThen( R.string.warn_sms_disabled, 
-                                 R.string.newgame_enable_sms, 
+                                 R.string.button_go_settings,
                                  Action.SMS_CONFIG_ACTION );
             }
             break;