diff -r 489fde4ab7d4 -r 1b88edb34d96 res/layout/preferences.xml
--- a/res/layout/preferences.xml	Mon Jun 14 22:45:56 2010 +0200
+++ b/res/layout/preferences.xml	Mon Jun 14 22:47:22 2010 +0200
@@ -25,11 +25,11 @@
 				android:hint="@string/away_message_hint" />
 		</PreferenceScreen>
 		<PreferenceScreen android:title="@string/notification_preferences">
-			<CheckBoxPreference android:title="@string/notification_disable_vibrate_title"
-				android:defaultValue="false" android:summary="@string/notification_disable_vibrate_sum"
-				android:key="settings_notification_disable_vibrate" />
+			<CheckBoxPreference android:title="@string/notification_enable_vibrate_title"
+				android:defaultValue="false" android:summary="@string/notification_enable_vibrate_sum"
+				android:key="notification_vibrate" />
 			<RingtonePreference
-				android:title="@string/notification_snd_title" android:key="settings_notification_snd"
+				android:title="@string/notification_snd_title" android:key="notification_sound"
 				android:summary="@string/notification_snd_sum" android:ringtoneType="notification"
 				android:showDefault="true" />
 		</PreferenceScreen>
@@ -56,31 +56,31 @@
 			android:summary="@string/settings_proxy_sum">
 			<CheckBoxPreference android:title="@string/SettingsProxyProxy"
 				android:defaultValue="false" android:summary="@string/SettingsProxySummary"
-				android:key="settings_key_proxy_use" />
+				android:key="proxy_use" />
 			<PreferenceCategory android:title="@string/proxy_proxy_settings">
-				<ListPreference android:dependency="settings_key_proxy_use"
+				<ListPreference android:dependency="proxy_use"
 					android:title="@string/SettingsProxyType" android:entries="@array/proxy_types"
 					android:summary="@string/SettingsProxyTypeSummary"
 					android:defaultValue="HTTP" android:entryValues="@array/proxy_types"
-					android:key="settings_key_proxy_type" />
+					android:key="proxy_type" />
 				<EditTextPreference android:singleLine="true"
-					android:dependency="settings_key_proxy_use" android:name="serveur"
+					android:dependency="proxy_use" android:name="serveur"
 					android:summary="@string/SettingsProxyServer" android:title="@string/settings_proxy_server"
-					android:key="settings_key_proxy_server" />
+					android:key="proxy_server" />
 				<EditTextPreference android:singleLine="true"
-					android:dependency="settings_key_proxy_use" android:name="port"
+					android:dependency="proxy_use" android:name="port"
 					android:summary="@string/SettingsProxyPort" android:title="@string/settings_proxy_port"
-					android:key="settings_key_proxy_port" android:numeric="signed" android:hint="@string/comments_proxy_port" />
+					android:key="proxy_port" android:numeric="signed" android:hint="@string/comments_proxy_port" />
 			</PreferenceCategory>
 			<PreferenceCategory android:title="@string/proxy_user_settings">
 				<EditTextPreference android:singleLine="true"
-					android:dependency="settings_key_proxy_use" android:name="Utilisateur"
+					android:dependency="proxy_use" android:name="Utilisateur"
 					android:summary="@string/SettingsProxyUser" android:title="@string/settings_proxy_username"
-					android:key="settings_key_proxy_username" />
+					android:key="proxy_username" />
 				<EditTextPreference android:singleLine="true"
-					android:dependency="settings_key_proxy_use" android:name="pass_user"
+					android:dependency="proxy_use" android:name="pass_user"
 					android:password="true" android:summary="@string/SettingsProxyPassword"
-					android:title="@string/settings_proxy_password" android:key="settings_key_proxy_password" />
+					android:title="@string/settings_proxy_password" android:key="proxy_password" />
 			</PreferenceCategory>
 		</PreferenceScreen>
 		<PreferenceScreen android:key="advanced"