From 8e06ff446a849f668e1da103232d4bd8a0a85cdc Mon Sep 17 00:00:00 2001
From: eehouse <eehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Thu, 27 May 2010 02:56:54 +0000
Subject: [PATCH] Preferences->Settings; remove duplicated strings.

---
 xwords4/android/XWords4/res/menu/board_menu.xml      | 2 +-
 xwords4/android/XWords4/res/menu/games_list_menu.xml | 2 +-
 xwords4/android/XWords4/res/values-ca/strings.xml    | 4 +---
 xwords4/android/XWords4/res/values-cs/strings.xml    | 4 +---
 xwords4/android/XWords4/res/values/strings.xml       | 8 +++-----
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/xwords4/android/XWords4/res/menu/board_menu.xml b/xwords4/android/XWords4/res/menu/board_menu.xml
index 950a4bb77..ac51d8ca0 100644
--- a/xwords4/android/XWords4/res/menu/board_menu.xml
+++ b/xwords4/android/XWords4/res/menu/board_menu.xml
@@ -64,7 +64,7 @@
       </menu>
     </item>
     <item android:id="@+id/board_menu_file_prefs"
-          android:title="@string/board_menu_file_prefs"
+          android:title="@string/menu_prefs"
           android:alphabeticShortcut="P"
           />
     <item android:id="@+id/board_menu_file_about"
diff --git a/xwords4/android/XWords4/res/menu/games_list_menu.xml b/xwords4/android/XWords4/res/menu/games_list_menu.xml
index 9f5a5da75..e90e22316 100644
--- a/xwords4/android/XWords4/res/menu/games_list_menu.xml
+++ b/xwords4/android/XWords4/res/menu/games_list_menu.xml
@@ -5,7 +5,7 @@
     <!--       android:title="@string/gamel_menu_view_hidden" -->
     <!--       /> -->
     <item android:id="@+id/gamel_menu_prefs"
-          android:title="@string/gamel_menu_prefs"
+          android:title="@string/menu_prefs"
           android:icon="@android:drawable/ic_menu_preferences"
           />
     <item android:id="@+id/gamel_menu_dicts"
diff --git a/xwords4/android/XWords4/res/values-ca/strings.xml b/xwords4/android/XWords4/res/values-ca/strings.xml
index 2c35fe4f8..6a45165fb 100644
--- a/xwords4/android/XWords4/res/values-ca/strings.xml
+++ b/xwords4/android/XWords4/res/values-ca/strings.xml
@@ -89,7 +89,6 @@
     <string name="board_menu_game_resend">Reenvia els missatges</string>
     <string name="board_submenu_file">Fitxer</string>
     <string name="board_menu_file_new">Partida nova</string>
-    <string name="board_menu_file_prefs">Preferències</string>
     <string name="board_menu_file_about">Quant al Crosswords</string>
 
     <string name="gamel_menu_delete_all">Suprimeix-les totes</string>
@@ -184,7 +183,7 @@
     <string name="phonies_ignore">Ignora-les</string>
     <string name="phonies_warn">Avisa\'m</string>
     <string name="phonies_disallow">No es poden jugar</string>
-    <string name="gamel_menu_prefs">Preferències</string>
+    <string name="menu_prefs">Preferències</string>
     <string name="gamel_menu_dicts">Diccionaris</string>
 
     <string name="room_label">Sala</string>
@@ -194,7 +193,6 @@
     <!-- <string name="port_label">Port</string> -->
     <string name="role_edit_title">Connexió</string>
 
-    <string name="general_prefs">Preferències</string>
     <string name="prefs_colors">Colors</string>
     <string name="player0">Primer jugador</string>
     <string name="player1">Segon jugador</string>
diff --git a/xwords4/android/XWords4/res/values-cs/strings.xml b/xwords4/android/XWords4/res/values-cs/strings.xml
index c18473b7d..7a8732a3c 100644
--- a/xwords4/android/XWords4/res/values-cs/strings.xml
+++ b/xwords4/android/XWords4/res/values-cs/strings.xml
@@ -91,7 +91,6 @@
 	<string name="board_menu_game_resend">Přeposlat zprávy</string>
 	<string name="board_submenu_file">Soubor</string>
 	<string name="board_menu_file_new">Nová hra</string>
-	<string name="board_menu_file_prefs">Předvolby</string>
 	<string name="board_menu_file_about">O Crosswords</string>
 
 	<string name="gamel_menu_delete_all">Vymazat vše</string>
@@ -208,7 +207,7 @@
     <string name="phonies_ignore">Ignorovat slovník</string>
     <string name="phonies_warn">Varovat pokud není ve slovníku</string>
     <string name="phonies_disallow">Zakázat pokud není ve slovníku</string>
-    <string name="gamel_menu_prefs">Předvolby</string>
+	<string name="menu_prefs">Předvolby</string>
     <string name="gamel_menu_dicts">Slovníky</string>
 
     <string name="room_label">Místnost</string>
@@ -217,7 +216,6 @@
     <string name="role_edit_title">Připojení</string>
     <string name="connect_prompt">Jak budou spolu komunikovat Server a Klienti?</string>
 
-    <string name="general_prefs">Předvolby</string>
     <string name="prefs_defaults">Výchozí nastavení</string>
     <string name="prefs_defaults_summary">Výchozí nastavení pro novou hru</string>
     <string name="default_dict">Slovník pro hru</string>
diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 75a41b2b4..3ed0eccc7 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -42,7 +42,7 @@
 	<string name="title_dicts_list">Crosswords dictionaries</string>   
 	<string name="title_game">Game</string>  
 	<string name="title_game_config">Configure game</string>  
-	<string name="title_prefs">Crosswords preferences</string>  
+	<string name="title_prefs">Crosswords settings</string>  
 	
 	<string name="app_name">Crosswords</string>  
 	
@@ -91,7 +91,6 @@
 	<string name="board_menu_game_resend">Resend messages</string>
 	<string name="board_submenu_file">File</string>
 	<string name="board_menu_file_new">New game</string>
-	<string name="board_menu_file_prefs">Preferences</string>
 	<string name="board_menu_file_about">About Crosswords</string>
 
 	<string name="gamel_menu_delete_all">Delete all</string>
@@ -133,7 +132,7 @@
 	<string name="str_cant_trade_mid_move">Remove played tiles before trading.</string>
 	<string name="str_too_few_tiles_left_to_trade">Too few tiles left to trade.</string>
 	<string name="str_cant_undo_tileassign">Tile assignment can't be undone.</string>
-	<string name="str_cant_hint_while_disabled">The hint feature is disabled for this game.  Enable it for a new game using the Preferences dialog.</string>
+	<string name="str_cant_hint_while_disabled">The hint feature is disabled for this game.  Enable it for a new game using the Settings dialog.</string>
 	<string name="str_no_peek_remote_tiles">No peeking at remote players' tiles!</string>
 	<string name="str_reg_unexpected_user">Refused attempt to register unexpected user[s]</string>
 	<string name="str_server_dict_wins">Conflict between Host and Guest dictionaries; Host wins.</string>
@@ -217,7 +216,7 @@
     <string name="phonies_ignore">Ignore phonies</string>
     <string name="phonies_warn">Warn if phonies</string>
     <string name="phonies_disallow">Disallow phonies</string>
-    <string name="gamel_menu_prefs">Preferences</string>
+    <string name="menu_prefs">Settings</string>
     <string name="gamel_menu_dicts">Dictionaries</string>
 
     <string name="room_label">Room</string>
@@ -227,7 +226,6 @@
     <string name="connect_prompt">How will Host and Guest devices
     communicate?</string>
 
-    <string name="general_prefs">Preferences</string>
     <string name="prefs_defaults">New game defaults</string>
     <string name="prefs_defaults_summary">Default settings for new
     games</string>