From f466f1a484a620ab604d75b67564f63d6ba18b0c Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sat, 30 May 2009 07:00:12 +0000
Subject: 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
---
 res/xml/preferences.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'res/xml/preferences.xml')

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"
-- 
cgit v1.2.3