diff -r c2eb19cd7032 -r 0de5ddd06ecd res/layout/preferences.xml
--- a/res/layout/preferences.xml	Wed May 25 00:36:01 2011 +0200
+++ b/res/layout/preferences.xml	Wed May 25 00:57:00 2011 +0200
@@ -12,16 +12,16 @@
 			android:title="@string/contact_list_preferences" android:summary="@string/contact_list_preferences_sum">
 			<CheckBoxPreference android:title="@string/CLP_hidden_contact"
 				android:defaultValue="false" android:summary="@string/CLP_hidden_contact_sum"
-				android:key="settings_key_hidden_contact" />
+				android:key="show_offline_contacts" />
 			<CheckBoxPreference android:title="@string/CLP_hide_groups"
 				android:defaultValue="false" android:summary="@string/CLP_hide_groups_sum"
-				android:key="settings_key_hide_groups" />
+				android:key="hide_groups" />
 			<CheckBoxPreference android:title="@string/away_chk_title"
 				android:defaultValue="true" android:summary="@string/away_chk_sum"
-				android:key="settings_away_chk" />
-			<EditTextPreference android:dependency="settings_away_chk"
+				android:key="use_auto_away" />
+			<EditTextPreference android:dependency="use_auto_away"
 				android:singleLine="true" android:summary="@string/away_message_sum"
-				android:title="@string/away_message_title" android:key="settings_away_message"
+				android:title="@string/away_message_title" android:key="auto_away_msg"
 				android:hint="@string/away_message_hint" />
 		</PreferenceScreen>
 		<PreferenceScreen android:key="chat"
@@ -38,7 +38,7 @@
 			<PreferenceCategory android:title="@string/chat_layout_option">
 				<CheckBoxPreference android:title="@string/settings_chat_compact"
 					android:defaultValue="false" android:summary="@string/settings_chat_compact_sum"
-					android:key="settings_chat_compact_key" />
+					android:key="use_compact_chat_ui" />
 			</PreferenceCategory>
 			</PreferenceScreen>
 		<PreferenceScreen android:title="@string/notification_preferences">
@@ -60,10 +60,10 @@
 			android:title="@string/settings_account_password" android:key="account_password" />
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/user_preferences_advanced">
-		<EditTextPreference android:key="settings_key_resource"
+		<EditTextPreference android:key="connection_resource"
 			android:title="@string/SettingsResourceTitle" android:summary="@string/SettingsResourceSummary"
 			android:defaultValue="Beem" />
-		<EditTextPreference android:key="settings_key_priority"
+		<EditTextPreference android:key="connection_priority"
 			android:title="@string/SettingsPriorityTitle" android:summary="@string/SettingsPrioritySummary"
 			android:numeric="signed" android:defaultValue="0" />
 	</PreferenceCategory>