Do not let locales seep into the preferences

NOTICE: If you're a foreign language user, you may have to reset your general preferences for Rotation Mode, Key Shortcut Side, Camera Button Action, and Update Check Frequency

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@246 df292f66-193f-0410-a5fc-6d59da041ff2

3 files changed, 46 insertions, 13 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 5893a0e..1cf14fa 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -17,6 +17,13 @@
 		<item>@string/list_rotation_auto</item>
 	</string-array>
 
+	<string-array name="list_rotation_values">
+		<item>default</item>
+		<item>landscape</item>
+		<item>portrait</item>
+		<item>automatic</item>
+	</string-array>
+
 	<string-array name="list_camera">
 		<item>@string/list_camera_ctrlaspace</item>
 		<item>@string/list_camera_ctrla</item>
@@ -24,6 +31,13 @@
 		<item>@string/list_camera_none</item>
 	</string-array>
 
+	<string-array name="list_camera_values">
+		<item>ctrl+a space</item>
+		<item>ctrl+a</item>
+		<item>esc</item>
+		<item>none</item>
+	</string-array>
+
 	<string-array name="list_colors">
 		<item>@string/color_red</item>
 		<item>@string/color_green</item>
@@ -31,18 +45,37 @@
 		<item>@string/color_gray</item>
 	</string-array>
 
+	<string-array name="list_color_values">
+		<item>red</item>
+		<item>green</item>
+		<item>blue</item>
+		<item>gray</item>
+	</string-array>
+
 	<string-array name="list_update">
 		<item>@string/list_update_daily</item>
 		<item>@string/list_update_weekly</item>
 		<item>@string/list_update_never</item>
 	</string-array>
 
+	<string-array name="list_update_values">
+		<item>daily</item>
+		<item>weekly</item>
+		<item>never</item>
+	</string-array>
+
 	<string-array name="list_keymode">
 		<item>@string/list_keymode_right</item>
 		<item>@string/list_keymode_left</item>
 		<item>@string/list_keymode_none</item>
 	</string-array>
 
+	<string-array name="list_keymode_values">
+		<item>Use right-side keys</item>
+		<item>Use left-side keys</item>
+		<item>none</item>
+	</string-array>
+
 	<string-array name="list_pubkeyids">
 		<item>@string/list_pubkeyids_none</item>
 		<item>@string/list_pubkeyids_any</item>
diff --git a/res/xml/host_prefs.xml b/res/xml/host_prefs.xml
index 8060e8a..d57f2ef 100644
--- a/res/xml/host_prefs.xml
+++ b/res/xml/host_prefs.xml
@@ -28,7 +28,7 @@
 		android:key="color"
 		android:title="@string/hostpref_color_title"
 		android:entries="@array/list_colors"
-		android:entryValues="@array/list_colors"
+		android:entryValues="@array/list_color_values"
 		/>
 <!--  
 	<CheckBoxPreference
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index ef384f1..5836d33 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -30,8 +30,8 @@
 		android:title="@string/pref_update_title"
 		android:summary="@string/pref_update_summary"
 		android:entries="@array/list_update"
-		android:entryValues="@array/list_update"
-		android:defaultValue="@string/list_update_daily"
+		android:entryValues="@array/list_update_values"
+		android:defaultValue="Daily"
 		/>
 
 	<PreferenceCategory
@@ -42,8 +42,8 @@
 			android:title="@string/pref_emulation_title"
 			android:summary="@string/pref_emulation_summary"
 			android:entries="@array/list_emulation_modes"
-			android:defaultValue="screen"
 			android:entryValues="@array/list_emulation_modes"
+			android:defaultValue="screen"
 			/>
 	
 		<EditTextPreference
@@ -64,8 +64,8 @@
 			android:title="@string/pref_rotation_title"
 			android:summary="@string/pref_rotation_summary"
 			android:entries="@array/list_rotation"
-			android:entryValues="@array/list_rotation"
-			android:defaultValue="@string/list_rotation_land"
+			android:entryValues="@array/list_rotation_values"
+			android:defaultValue="Default"
 			/>
 
 		<CheckBoxPreference
@@ -74,23 +74,23 @@
 			android:summary="@string/pref_fullscreen_summary"
 			android:defaultValue="false"
 			/>
-			
+
 		<ListPreference
 			android:key="keymode"
 			android:title="@string/pref_keymode_title"
 			android:summary="@string/pref_keymode_summary"
 			android:entries="@array/list_keymode"
-			android:entryValues="@array/list_keymode"
-			android:defaultValue="@string/list_keymode_right"
+			android:entryValues="@array/list_keymode_values"
+			android:defaultValue="Use right-side keys"
 			/>
-	
+
 		<ListPreference
 			android:key="camera"
 			android:title="@string/pref_camera_title"
 			android:summary="@string/pref_camera_summary"
 			android:entries="@array/list_camera"
-			android:entryValues="@array/list_camera"
-			android:defaultValue="@string/list_camera_ctrlaspace"
+			android:entryValues="@array/list_camera_values"
+			android:defaultValue="Ctrl+A then Space"
 			/>
 
 		<CheckBoxPreference
@@ -99,7 +99,7 @@
 			android:summary="@string/pref_keepalive_summary"
 			android:defaultValue="true"
 			/>
-			
+
 		<CheckBoxPreference
 			android:key="wifilock"
 			android:title="@string/pref_wifilock_title"