diff --git a/xwords4/android/XWords4-dbg/AndroidManifest.xml b/xwords4/android/XWords4-dbg/AndroidManifest.xml
index 82e7cd47e..c284f5ad6 100644
--- a/xwords4/android/XWords4-dbg/AndroidManifest.xml
+++ b/xwords4/android/XWords4-dbg/AndroidManifest.xml
@@ -97,16 +97,16 @@
/>
diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 17920b91c..e1d804794 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -1974,9 +1974,9 @@
\"Import contact\" button to add people you want to invite, the +
button to enter numbers directly.
- This list of devies is
+ This list of devices is
empty. Use the \"Scan games\" button to scan your old games
- for opponents. Use the + button to enter device IDs directly.
+ for opponents. Use the \"+\" button to enter device IDs directly.
Enter phone number:
Enter device ID:
diff --git a/xwords4/android/XWords4/res/xml/xwprefs.xml b/xwords4/android/XWords4/res/xml/xwprefs.xml
index f084091aa..b4d0f03ea 100644
--- a/xwords4/android/XWords4/res/xml/xwprefs.xml
+++ b/xwords4/android/XWords4/res/xml/xwprefs.xml
@@ -12,41 +12,41 @@
>
+ android:key="@string/key_player1_name"
+ android:title="@string/pref_human_name"
+ android:capitalize="words"
+ android:defaultValue=""
+ />
+ android:key="@string/key_robot_name"
+ android:title="@string/robot_label"
+ android:capitalize="words"
+ android:defaultValue="@string/button_default_robot"
+ />
-
+
+ android:key="@string/key_default_language"
+ android:title="@string/default_language"
+ android:defaultValue="@string/lang_name_english"
+ />
+ android:key="@string/key_default_dict"
+ android:title="@string/default_dict"
+ android:defaultValue="CollegeEng_2to8"
+ />
+ android:key="@string/key_default_robodict"
+ android:title="@string/default_robodict"
+ android:defaultValue="Top5000"
+ />
+ android:key="@string/key_default_phonies"
+ android:title="@string/default_phonies"
+ android:entries="@array/phony_names"
+ android:entryValues="@array/phony_names"
+ android:defaultValue="@string/phonies_warn"
+ />
+ android:key="@string/key_initial_player_minutes"
+ android:title="@string/initial_player_minutes"
+ android:defaultValue="25"
+ android:numeric="decimal"
+ />
+ android:key="@string/key_board_size"
+ android:title="@string/board_size"
+ android:entries="@array/board_sizes"
+ android:entryValues="@array/board_sizes"
+ android:defaultValue="15x15"
+ />
@@ -109,12 +109,12 @@
/>
+ android:key="@string/key_summary_field"
+ android:title="@string/summary_field"
+ android:entries="@array/game_summary_values"
+ android:entryValues="@array/game_summary_values"
+ android:defaultValue="@string/game_summary_field_opponents"
+ />
+ android:key="@string/key_player0"
+ android:title="@string/pref_player1_name"
+ android:defaultValue="0x000000"
+ />
+ android:key="@string/key_player1"
+ android:title="@string/pref_player2_name"
+ android:defaultValue="0xFF0000"
+ />
+ android:key="@string/key_player2"
+ android:title="@string/pref_player3_name"
+ android:defaultValue="0x0000FF"
+ />
+ android:key="@string/key_player3"
+ android:title="@string/pref_player4_name"
+ android:defaultValue="0x008F00"
+ />
+ android:key="@string/key_bonus_l2x"
+ android:title="@string/bonus_l2x"
+ android:defaultValue="0xAFAF00"
+ />
+ android:key="@string/key_bonus_l3x"
+ android:title="@string/bonus_l3x"
+ android:defaultValue="0x00AFAF"
+ />
+ android:key="@string/key_bonus_w2x"
+ android:title="@string/bonus_w2x"
+ android:defaultValue="0xAF00AF"
+ />
+ android:key="@string/key_bonus_w3x"
+ android:title="@string/bonus_w3x"
+ android:defaultValue="0xAFAFAF"
+ />
+ android:key="@string/key_clr_crosshairs"
+ android:title="@string/clr_crosshairs"
+ android:defaultValue="0x7070FF"
+ />
+ android:key="@string/key_clr_bonushint"
+ android:title="@string/key_bonushint"
+ android:defaultValue="0x7F7F7F"
+ />
+ android:key="@string/key_tile_back"
+ android:title="@string/tile_back"
+ android:defaultValue="0xFFFF99"
+ />
+ android:key="@string/key_empty"
+ android:title="@string/empty"
+ android:defaultValue="0xFFFFFF"
+ />
+ android:key="@string/key_background"
+ android:title="@string/background"
+ android:defaultValue="0xFFFFFF"
+ />
@@ -290,18 +290,18 @@
android:defaultValue="false"
/>
-
+
+ android:key="@string/key_connect_frequency"
+ android:title="@string/connect_frequency"
+ android:entries="@array/connect_frequencies"
+ android:entryValues="@array/connect_frequencies_values"
+ android:defaultValue="900"
+ />
+ />
+ />
@@ -336,10 +336,10 @@
>
+ android:title="@string/logging_on"
+ android:summary="@string/logging_on_summary"
+ android:defaultValue="false"
+ />
+ android:key="@string/key_nag_intervals"
+ android:title="@string/nag_intervals"
+ />
+ android:entries="@array/force_radio_names"
+ android:entryValues="@array/force_radio_names"
+ android:defaultValue="@string/radio_name_real"
+ />
+ android:title="Show SMS sends, receives"
+ android:defaultValue="false"
+ />
+ android:key="@string/key_relay_host"
+ android:title="@string/relay_host"
+ android:defaultValue="@string/default_host"
+ />
+ android:key="@string/key_relay_port"
+ android:title="@string/relay_port"
+ android:defaultValue="10997"
+ android:numeric="decimal"
+ />
+ android:key="@string/key_proxy_port"
+ android:title="@string/proxy_port"
+ android:defaultValue="10998"
+ android:numeric="decimal"
+ />
+ android:title="@string/got_langdict_title"
+ android:summary="@string/got_langdict_summary"
+ android:defaultValue="false"
+ />
+ android:key="@string/key_xlations_locale"
+ android:title="@string/xlations_locale"
+ />
+ />
@@ -438,7 +438,7 @@
android:title="@string/force_tablet_title"
android:summary="@string/force_tablet_summary"
android:defaultValue="false"
- />
+ />