diff --git a/res/layout-sw533dp/main.xml b/res/layout-sw533dp/main.xml
new file mode 100644
index 000000000..cff1fe36f
--- /dev/null
+++ b/res/layout-sw533dp/main.xml
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+	xmlns:tools="http://schemas.android.com/tools"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<fragment
+		android:id="@+id/status"
+		android:name="org.linphone.StatusFragment"
+		android:layout_width="match_parent"
+		android:layout_height="35dp"
+		tools:layout="@layout/status" />
+
+	<android.support.v4.widget.DrawerLayout
+		android:id="@+id/side_menu"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout_below="@id/status">
+
+		<RelativeLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent">
+
+			<RelativeLayout
+				android:id="@+id/top_bar"
+				android:background="@color/colorF"
+				android:layout_width="match_parent"
+				android:layout_height="60dp"
+				android:visibility="gone"
+				android:layout_alignParentTop="true">
+
+				<TextView
+					android:id="@+id/menu_name"
+					android:text="@string/settings"
+					style="@style/font1"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:layout_centerInParent="true"
+					android:gravity="center_vertical"/>
+
+				<ImageView
+					android:id="@+id/cancel"
+					android:src="@drawable/dialer_back"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:padding="15dp"
+					android:layout_centerInParent="true"
+					android:layout_alignParentRight="true"/>
+
+			</RelativeLayout>
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:orientation="vertical"
+				android:layout_below="@id/top_bar" android:layout_toRightOf="@+id/footer"
+				android:layout_toEndOf="@+id/footer">
+
+				<FrameLayout
+					android:layout_width="match_parent"
+					android:layout_height="match_parent">
+
+					<LinearLayout
+						android:baselineAligned="false"
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:orientation="horizontal">
+
+						<LinearLayout
+							android:id="@+id/fragmentContainer"
+							android:layout_width="match_parent"
+							android:layout_height="match_parent"
+							android:layout_weight="0.63"
+							android:orientation="horizontal" />
+
+						<LinearLayout
+							android:id="@+id/fragmentContainer2"
+							android:visibility="gone"
+							android:layout_width="match_parent"
+							android:layout_height="match_parent"
+							android:layout_weight="0.37"
+							android:orientation="horizontal"/>
+
+					</LinearLayout>
+				</FrameLayout>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:id="@+id/footer"
+				android:layout_width="60dp"
+				android:layout_height="match_parent"
+				android:layout_alignParentBottom="true"
+				android:orientation="vertical">
+
+				<RelativeLayout
+					android:id="@+id/history"
+					android:background="@drawable/footer_button"
+					android:layout_weight="1"
+					android:layout_width="60dp"
+					android:layout_height="0dp">
+
+					<ImageView
+						android:src="@drawable/footer_history"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:padding="15dp"
+						android:layout_centerInParent="true"/>
+
+					<View
+						android:id="@+id/history_select"
+						android:background="@color/colorA"
+						android:layout_width="5dp"
+						android:layout_height="match_parent"
+						android:layout_alignParentLeft="true"
+						android:visibility="gone"/>
+
+					<TextView
+						android:id="@+id/missed_calls"
+						android:background="@drawable/history_chat_indicator"
+						style="@style/font18"
+						android:layout_width="25dp"
+						android:layout_height="25dp"
+						android:layout_margin="12dp"
+						android:gravity="center"
+						android:visibility="gone"/>
+
+				</RelativeLayout>
+
+				<RelativeLayout
+					android:id="@+id/contacts"
+					android:background="@drawable/footer_button"
+					android:layout_weight="1"
+					android:layout_width="60dp"
+					android:layout_height="0dp">
+
+					<ImageView
+						android:src="@drawable/footer_contacts"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:padding="15dp"
+						android:layout_centerInParent="true"/>
+
+					<View
+						android:id="@+id/contacts_select"
+						android:background="@color/colorA"
+						android:layout_width="5dp"
+						android:layout_height="match_parent"
+						android:layout_alignParentLeft="true"
+						android:visibility="gone"/>
+				</RelativeLayout>
+
+				<RelativeLayout
+					android:id="@+id/dialer"
+					android:background="@drawable/footer_button"
+					android:layout_weight="1"
+					android:layout_width="60dp"
+					android:layout_height="0dp">
+
+					<ImageView
+						android:src="@drawable/footer_dialer"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:padding="15dp"
+						android:layout_centerInParent="true"/>
+
+					<View
+						android:id="@+id/dialer_select"
+						android:background="@color/colorA"
+						android:layout_width="5dp"
+						android:layout_height="match_parent"
+						android:layout_alignParentLeft="true"/>
+
+				</RelativeLayout>
+
+				<RelativeLayout
+					android:id="@+id/chat"
+					android:background="@drawable/footer_button"
+					android:layout_weight="1"
+					android:layout_width="60dp"
+					android:layout_height="0dp">
+
+					<ImageView
+						android:src="@drawable/footer_chat"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:padding="15dp"
+						android:layout_centerInParent="true" />
+
+					<View
+						android:id="@+id/chat_select"
+						android:background="@color/colorA"
+						android:visibility="gone"
+						android:layout_width="5dp"
+						android:layout_height="match_parent"
+						android:layout_alignParentLeft="true"/>
+
+					<TextView
+						android:id="@+id/missed_chats"
+						android:background="@drawable/history_chat_indicator"
+						style="@style/font18"
+						android:layout_width="25dp"
+						android:layout_height="25dp"
+						android:layout_margin="12dp"
+						android:gravity="center"
+						android:visibility="gone" />
+
+				</RelativeLayout>
+			</LinearLayout>
+		</RelativeLayout>
+
+	<!-- Side Menu -->
+	<RelativeLayout
+		android:id="@+id/side_menu_content"
+		android:layout_width="400dp"
+		android:layout_height="match_parent"
+		android:layout_gravity="left">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:orientation="vertical">
+
+			<include layout="@layout/side_menu_main_account"/>
+
+			<ListView
+				android:id="@+id/accounts_list"
+				android:background="@color/colorB"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:choiceMode="singleChoice"
+				android:cacheColorHint="@color/transparent"
+				android:divider="@android:color/transparent"
+				android:dividerHeight="0dp"/>
+
+			<ListView
+				android:id="@+id/item_list"
+				android:background="@color/colorH"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:choiceMode="singleChoice"
+				android:divider="@color/colorE"
+				android:listSelector="@color/colorH"
+				android:dividerHeight="1dp"/>
+		</LinearLayout>
+
+		<RelativeLayout
+			android:id="@+id/side_menu_quit"
+			android:background="@color/colorA"
+			android:gravity="bottom"
+			android:layout_alignParentBottom="true"
+			android:layout_width="match_parent"
+			android:layout_height="50dp">
+
+			<ImageView
+				android:id="@+id/quit_button"
+				android:src="@drawable/quit"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:padding="5dp"
+				android:layout_alignParentLeft="true"
+				android:layout_centerVertical="true" />
+
+			<TextView
+				android:id="@+id/quit"
+				android:text="@string/quit"
+				style="@style/font14"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_toRightOf="@id/quit_button"
+				android:gravity="center_vertical"
+				android:layout_centerInParent="true"/>
+
+		</RelativeLayout>
+
+	</RelativeLayout>
+
+</android.support.v4.widget.DrawerLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/assistant_account_creation.xml b/res/layout/assistant_account_creation.xml
index bccdfec31..82509f4dd 100644
--- a/res/layout/assistant_account_creation.xml
+++ b/res/layout/assistant_account_creation.xml
@@ -175,7 +175,7 @@
 				android:background="@drawable/assistant_button"
 				android:textColor="@drawable/assistant_button_text_color"
 				style="@style/font8"
-				android:contentDescription="@string/content_description_validate"
+				android:contentDescription="@string/content_description_valid"
 				android:layout_width="wrap_content"
 				android:layout_height="40dp"
 				android:paddingLeft="10dp"
diff --git a/res/layout/assistant_account_creation_activation.xml b/res/layout/assistant_account_creation_activation.xml
index 398781197..db3c64506 100644
--- a/res/layout/assistant_account_creation_activation.xml
+++ b/res/layout/assistant_account_creation_activation.xml
@@ -33,7 +33,7 @@
 		android:text="@string/assistant_create_account"
 		android:background="@drawable/assistant_button"
 		style="@style/font8"
-		android:contentDescription="@string/content_description_validate"
+		android:contentDescription="@string/content_description_valid"
 		android:layout_width="wrap_content"
 		android:layout_height="40dp"
 		android:layout_margin="10dp"
diff --git a/res/layout/assistant_ec_calibration.xml b/res/layout/assistant_ec_calibration.xml
index 5b243bccf..b1350d11c 100644
--- a/res/layout/assistant_ec_calibration.xml
+++ b/res/layout/assistant_ec_calibration.xml
@@ -11,7 +11,7 @@
 		android:textAllCaps="true"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:gravity="center_horizontal"/>
+		android:layout_centerHorizontal="true"/>
 	
   	<ImageView
 		android:src="@drawable/linphone_logo_orange"
diff --git a/res/layout/assistant_remote_provisioning_login.xml b/res/layout/assistant_remote_provisioning_login.xml
index 514e64951..976d3a0b7 100644
--- a/res/layout/assistant_remote_provisioning_login.xml
+++ b/res/layout/assistant_remote_provisioning_login.xml
@@ -99,7 +99,7 @@
 			android:text="@string/connect"
 			android:background="@drawable/assistant_button"
 			style="@style/font8"
-			android:contentDescription="@string/content_description_validate"
+			android:contentDescription="@string/content_description_valid"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:paddingLeft="10dp"
diff --git a/res/values/custom.xml b/res/values/custom.xml
deleted file mode 100644
index d4fc85174..000000000
--- a/res/values/custom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="history_date_format">EEE, d MMM</string>
-	<string name="history_detail_date_format">yyyy/MM/dd - HH:mm - </string>
-	<string name="messages_date_format">dd/MM, HH:mm </string>
-	<string name="messages_list_date_format">dd/MM</string>
-	<string name="today_date_format">HH:mm</string>
-	<string name="picture_name_format">linphone-mms-%s.jpg</string>
-
-	<string name="app_name">Linphone</string>
-	<string name="service_name">Linphone Service</string>
-	<string name="addressbook_label">Linphone</string>
-	<string name="sync_account_type">org.linphone</string>
-	<string name="sync_account_name">linphone contacts</string>
-	<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string>
-	<string name="notification_title">Linphone</string>
-	<string name="wait_dialog_text">Starting up</string>
-	<string name="notification_registered">Registered to %s </string>
-	<string name="notification_register_failure">Fails to register to %s</string>
-	<string name="about_text">Linphone %s SIP (rfc 3261) compatible phone under GNU Public License V2</string>
-	<string name="about_link">http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/user-guide.html\n\n© 2015 Belledonne Communications</string>
-	<string name="button_sip_contacts">SIP</string>
-
-    <string name="tunnel_host"></string>
-</resources>
- 
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index fea153c50..6184d448a 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -28,7 +28,7 @@
 	<bool name="allow_cancel_remote_provisioning_login_activity">true</bool>
 	<bool name="hide_accounts">false</bool>
 	<bool name="display_account_wizard_at_first_start">true</bool>
-	<bool name="use_linphone_server_ports">true</bool>
+	<bool name="use_linphone_server_ports">false</bool>
 	<bool name="allow_only_phone_numbers_in_wizard">false</bool>
 
 	<bool name="enable_linphone_friends">false</bool>
diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index 6ef3b512f..bccb55e45 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -62,7 +62,6 @@
     <string name="pref_video_codec_h263_key">pref_video_codec_h263_key</string>
     <string name="pref_video_codec_mpeg4_key">pref_video_codec_mpeg4_key</string>
     <string name="pref_video_codec_h264_key">pref_video_codec_h264_key</string>
-    <string name="pref_video_automatically_share_my_video_key">pref_video_automatically_share_my_video_key</string>
     <string name="pref_video_automatically_accept_video_key">pref_video_automatically_accept_video_key</string>
     <string name="pref_video_initiate_call_with_video_key">pref_video_initiate_call_with_video_key</string>
     <string name="pref_video_enable_key">pref_video_enable_key</string>
@@ -155,6 +154,7 @@
 	<string name="pref_codec_silk16">silk 16 Khz</string>
 	<string name="pref_codec_silk24">silk 24 Khz</string>
 	<string name="pref_codec_g729">g729</string>
+
 	<string-array name="limit_bitrate_entry_values">
 		<item>10</item>
 		<item>15</item>
@@ -163,10 +163,15 @@
 		<item>64</item>
 		<item>128</item>
 	</string-array>
-	<string-array name="adaptive_rate_algorithm_entries">
-		<item>Simple</item>
-		<item>Stateful</item>
+	<string-array name="limit_bitrate_entries">
+		<item>10 kbits/s</item>
+		<item>15 kbits/s</item>
+		<item>20 kbits/s</item>
+		<item>36 kbits/s</item>
+		<item>64 kbits/s</item>
+		<item>128 kbits/s</item>
 	</string-array>
+
 	<string name="pref_video_codec_vp8_title">VP8</string>
 	<string name="media_encryption_srtp">SRTP</string>
 	<string name="media_encryption_zrtp">ZRTP</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3f49fe82c..da73f4e5e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,7 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
 
-	<!-- NEW STRINGS -->
+	<!-- Custom -->
+	<string name="app_name">Linphone</string>
+	<string name="service_name">Linphone Service</string>
+	<string name="addressbook_label">Linphone</string>
+	<string name="notification_title">Linphone</string>
+	<string name="wait_dialog_text">Starting up</string>
+	<string name="notification_registered">Registered to %s </string>
+	<string name="notification_register_failure">Fails to register to %s</string>
+	<string name="about_text">Linphone %s SIP (rfc 3261) compatible phone under GNU Public License V2</string>
+	<string name="about_link">http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/user-guide.html\n\n© 2015 Belledonne Communications</string>
+
+	<string name="sync_account_type">org.linphone</string>
+	<string name="sync_account_name">linphone contacts</string>
+	<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string>
+
+	<string name="history_date_format">EEE, d MMM</string>
+	<string name="history_detail_date_format">yyyy/MM/dd - HH:mm - </string>
+	<string name="messages_date_format">dd/MM, HH:mm </string>
+	<string name="messages_list_date_format">dd/MM</string>
+	<string name="today_date_format">HH:mm</string>
+	<string name="picture_name_format">linphone-mms-%s.jpg</string>
+	<string name="tunnel_host"></string>
 
 	<!-- Common -->
 	<string name="username">Username</string>
@@ -21,16 +42,17 @@
 	<string name="deny">Deny</string>
 	<string name="no_account">No account configured</string>
 	<string name="search">Search</string>
-	<string name="outgoing">outgoing</string>
-	<string name="incoming">incoming</string>
-	<string name="missed">missed</string>
+	<string name="outgoing">Outgoing</string>
+	<string name="incoming">Incoming</string>
+	<string name="missed">Missed</string>
 	<string name="settings">Settings</string>
 	<string name="connect">Connection</string>
+	<string name="decline">Decline</string>
 
-	<!-- splashscreen -->
+	<!-- Launch screen -->
 	<string name="app_description">free SIP VOIP client</string>
 
-	<!-- 0. Assistant -->
+	<!-- Assistant -->
 	<string name="welcome">Welcome</string>
 	<string name="assistant">Assistant</string>
 	<string name="assistant_create_account">Create account</string>
@@ -56,26 +78,58 @@
 	<string name="assistant_account_not_validated">Your account has not been validated yet.</string>
 	<string name="assistant_account_validated">Your account has been validated.</string>
 	<string name="assistant_error_bad_credentials">Incorrect username or passowrd</string>
+	<string name="wizard_failed">An error occurred, try again later.</string>
+	<string name="wizard_server_unavailable">Server unreachable, verify your internet connection.</string>
+	<string name="wizard_username_unavailable">This username is already in use.</string>
+	<string name="wizard_username_incorrect">Your username is not valid.</string>
+	<string name="wizard_email_incorrect">Your email is not valid.</string>
+	<string name="wizard_password_incorrect">Your password is not valid (6 characters min).</string>
+	<string name="wizard_passwords_unmatched">Passwords entered are different.</string>
+	<string name="setup_confirm_username">Your username will be %s.\r\n\r\nIt may differ from what you entered to match some requirements.\r\nDo you accept ?</string>
 
-	<!-- 1. Dailer -->
+	<!-- Dailer -->
 	<string name="address_bar_hint">Enter a number or an address</string>
 
-	<!-- 2. History -->
+	<!-- History -->
 	<string name="no_call_history">No call in your history</string>
 	<string name="no_missed_call_history">No missed call in your history</string>
 	<string name="delete_history_log">Do you want to delete selected log?</string>
+	<string name="today">Today</string>
+	<string name="yesterday">Yesterday</string>
 
-
-	<!-- 3. Contacts -->
+	<!-- Contacts -->
 	<string name="no_contact">No contact in your address book.</string>
 	<string name="no_sip_contact">No SIP contact in your address book.</string>
 	<string name="delete_contacts">Do you want to delete selected contact?</string>
 	<string name="delete_contact">Do you want to delete selected this contact?</string>
+	<string name="sip_address">SIP address</string>
+	<string name="phone_number">Phone number</string>
+	<string name="contact_first_name">First name</string>
+	<string name="contact_last_name">Last name</string>
 
-	<!-- 4. Chat -->
+	<!-- Chat -->
 	<string name="no_chat_history">No conversations</string>
 	<string name="delete_conversation">Do you want to delete selected conversation?</string>
 	<string name="delete_message">Do you want to delete selected message?</string>
+	<string name="remote_composing">Remote is writing...</string>
+	<string name="share_picture_size_small">Small</string>
+	<string name="share_picture_size_medium">Medium</string>
+	<string name="share_picture_size_large">Large</string>
+	<string name="share_picture_size_real">Real size</string>
+	<string name="text_copied_to_clipboard">Text copied to clipboard</string>
+	<string name="copy_text">Copy text</string>
+	<string name="image_picker_title">Select source</string>
+	<string name="image_saved">Image saved</string>
+	<string name="image_not_saved">Error, image not saved</string>
+	<string name="wait">Please wait...</string>
+	<string name="processing_image">Processing image, can take up to a few seconds depending on the size of the file</string>
+
+	<!-- Status Bar -->
+	<string name="status_connected">Registered</string>
+	<string name="status_not_connected">Not Registered</string>
+	<string name="status_in_progress">Registration in progress</string>
+	<string name="status_error">Registration failed</string>
+	<string name="voicemail_unread"> unread messages</string>
 
 	<!-- Side Menu -->
 	<string-array name="side_menu_item">
@@ -91,73 +145,80 @@
 	<string name="add_video_dialog">Your correspondent would like to turn on the video</string>
 	<string name="no_current_call">No active call</string>
 	<string name="call_paused_by_remote">Your correspondent paused the call</string>
+	<string name="couldnt_accept_call">An error occurred while accepting call</string>
 	<string name="zrtp_dialog">ZRTP token is %s\nYou should only accept if you have the same token as your correspondent</string>
+	<string name="unknown_incoming_call_name">Unknown</string>
+	<string name="call_stats_audio">Audio</string>
+	<string name="call_stats_video">Video</string>
+	<string name="call_stats_codec">Codec:</string>
+	<string name="call_stats_upload">Upload bandwidth:</string>
+	<string name="call_stats_download">Download bandwidth:</string>
+	<string name="call_stats_ice">ICE connectivity:</string>
+	<string name="call_stats_video_resolution">Video size:</string>
+
+	<!-- About -->
+	<string name="menu_send_log">Send log</string>
+	<string name="menu_reset_log">Reset log</string>
+
+	<!-- Service -->
+	<string name="incall_notif_active">Audio call ongoing</string>
+	<string name="incall_notif_paused">Paused call ongoing</string>
+	<string name="incall_notif_video">Video capturing call ongoing</string>
+	<string name="notification_started">started</string>
+	<string name="unread_messages">%i unread messages</string>
+
+	<!-- Errors -->
+	<string name="skipable_error_service_not_ready">Warning: service is not ready</string>
+	<string name="error">Error</string>
+	<string name="warning_wrong_destination_address">Cannot build destination address from [%s]</string>
+	<string name="error_unknown">Unknown error</string>
+	<string name="error_call_declined">Call declined</string>
+	<string name="error_user_not_found">User not found</string>
+	<string name="error_incompatible_media">Incompatible media parameters</string>
+	<string name="error_low_bandwidth">Your correspondent has low bandwidth, video can\'t be started</string>
+	<string name="error_network_unreachable">Network is unreachable</string>
+	<string name="error_bad_credentials">Bad credentials</string>
+	<string name="error_unauthorized">Unauthorized</string>
+	<string name="error_io_error">Network error</string>
+	<string name="download_image_failed">Download failed. Please check your internet access or try again later.</string>
+	<string name="remote_provisioning_failure">Failed to download or apply remote provisioning profile...</string>
+	<string name="remote_provisioning_again_title">Remote provisioning</string>
+	<string name="remote_provisioning_again_message">Do you want to change the provisioning URI ?</string>
+
+	<!-- Account Settings -->
+	<string name="pref_sipaccount">SIP Account</string>
+	<string name="pref_manage_title">Manage</string>
+	<string name="pref_disable_account">Disable</string>
+	<string name="pref_proxy">Proxy</string>
+	<string name="pref_domain">Domain*</string>
+	<string name="pref_passwd">Password*</string>
+	<string name="pref_username">Username*</string>
+	<string name="pref_enable_outbound_proxy">Outbound proxy</string>
+	<string name="pref_help_proxy">SIP proxy hostname or ip address (optional)</string>
+	<string name="pref_help_outbound_proxy">Route all calls through SIP proxy</string>
+	<string name="pref_help_username">Example: john if your account is john@sip.example.org</string>
+	<string name="pref_help_domain">sip.example.org if your account is john@sip.example.org</string>
+	<string name="pref_help_password">You have to re-enter your password if you edit your username and/or the domain</string>
+	<string name="pref_expire_title">Expire</string>
+	<string name="pref_avpf">AVPF</string>
+	<string name="pref_avpf_rr_interval"> AVPF regular RTCP interval in seconds (between 1 and 5)</string>
+	<string name="pref_escape_plus">Replace + by 00</string>
+	<string name="pref_auth_userid">Auth userid</string>
+	<string name="pref_help_auth_userid">Enter authentication userid (optionnal)</string>
+	<string name="pref_display_name">Display name</string>
+	<string name="pref_help_display_name">Enter display name (optionnal)</string>
+	<string name="pref_prefix">Prefix</string>
+	<string name="pref_transport">Transport</string>
+	<string name="pref_transport_udp">UDP</string>
+	<string name="pref_transport_tcp">TCP</string>
+	<string name="pref_transport_tls">TLS</string>
+	<string name="pref_delete_account">Delete this account</string>
+	<string name="pref_default_account">Use as default</string>
 
 	<!-- Settings -->
-	<string-array name="video_preset_entries">
-		<item>default</item>
-		<item>high-fps</item>
-		<item>custom</item>
-	</string-array>
-
-
-	<!-- Content description -->
-	<string name="content_description_back">Back</string>
-	<string name="content_description_dialer">Dialer</string>
-
-	<string name="content_description_toggle_micro">Toggle micro</string>
-	<string name="content_description_toggle_speaker">Toggle speaker</string>
-	<string name="content_description_decline">Decline</string>
-	<string name="content_description_hang_up">Hang up</string>
-	<string name="content_description_accept">Accept</string>
-
-
-	<string name="content_description_edit">Edit button</string>
-	<string name="content_description_valid">Valid button</string>
-	<string name="content_description_validate">Valid button</string>
-
-	<string name="content_description_add_contact">Add to contacts</string>
-	<string name="content_description_new_contact">New contact</string>
-	<string name="content_description_call">Call</string>
-	<string name="content_description_backspace">Backspace</string>
-	<string name="content_description_about">About page</string>
-	<string name="content_description_chat">Chat</string>
-	<string name="content_description_dial_back">Dial back</string>
-	<string name="content_description_contact_picture">Contact picture</string>
-	<string name="content_description_send_message">Send message</string>
-	<string name="content_description_detail">Detail</string>
-	<string name="content_description_delete">Delete button</string>
-	<string name="content_description_add">Add button</string>
-	<string name="content_description_new_discussion">New discussion</string>
-
-
-	<string name="content_description_search">Search</string>
-	<string name="content_description_all_contacts">All contacts</string>
-	<string name="content_description_linphone_contacts">Linphone contacts</string>
-	<string name="content_description_call_direction">Call direction</string>
-	<string name="content_description_all_calls">All calls</string>
-	<string name="content_description_missed_calls">Missed calls</string>
-	<string name="content_description_switch_video">Switch video</string>
-
-	<string name="content_description_add_call">Add call</string>
-	<string name="content_description_pause">Pause</string>
-	<string name="content_description_numpad">Numpad</string>
-	<string name="content_description_settings">Settings button</string>
-	<string name="content_description_history">History button</string>
-	<string name="content_description_chat_button">Chat button</string>
-	<string name="content_description_contacts">Contacts button</string>
-	<string name="content_description_led"></string>
-	<string name="content_description_call_quality">Call quality</string>
-	<string name="content_description_encryption">Encryption</string>
-	<string name="content_description_switch_camera">Switch camera</string>
-	<string name="content_description_cancel">Cancel</string>
-	<string name="content_description_cancel_button">Cancel button</string>
-	<string name="content_description_next">Next button</string>
-	<string name="content_description_message_status">Message status</string>
-	<string name="content_description_conference">Conference</string>
-
-
-	<string name="pref_disable_account">Disable</string>
+	<string name="pref_sipaccounts">SIP Accounts</string>
+	<string name="default_account_flag">Default account</string>
+	<string name="pref_add_account">Add account</string>
 	<string name="pref_tunnel">Tunnel</string>
 	<string name="pref_tunnel_host">Hostname</string>
 	<string name="pref_tunnel_port">Port</string>
@@ -169,320 +230,128 @@
 		<item>always</item>
 		<item>auto</item>
 	</string-array>
+	<string name="pref_none">None</string>
+	<string name="pref_preferences_title">Preferences</string>
+	<string name="pref_video_enable_title">Enable Video</string>
 
-	<string name="incall_notif_active">Audio call ongoing</string>
-	<string name="incall_notif_paused">Paused call ongoing</string>
-	<string name="incall_notif_video">Video capturing call ongoing</string>
-	<string name="not_ready_to_make_new_call">Not ready for a new call</string>
-	<string name="bad_target_uri">Bad contact : %s</string>
-	<string name="reset_sas_fmt">Reset verified %s</string>
-	<string name="verify_sas_fmt">Verify %s</string>
-	<string name="communication_encrypted">Encrypted</string>
-	<string name="waiting_for_startup">Starting up…</string>
-	<string name="couldnt_accept_call">An error occurred while accepting call</string>
-	<string name="error_adding_new_call">Error adding new call</string>
-	<string name="transfer_started">Transfer initiated</string>
-	<string name="transfer_dialog_title">Transfer call to</string>
-	<string name="transfer_to_new_call">New call</string>
-	<string name="resume_dialog_title">Resume call</string>
-	<string name="cannot_resume_paused_by_remote_call">Cannot resume call paused by remote</string>
-	<string name="conf_show_details_text">Show details</string>
-	<string name="skipable_error_service_not_ready">Warning: service is not ready</string>
-	<string name="close_button_text">Close</string>
-	<string name="status_conf_call">conf</string>
-	<string name="status_active_call">active</string>
-	<string name="state_paused">paused</string>
-	<string name="state_paused_by_remote">paused by remote</string>
-	<string name="state_streams_running"></string>
-	<string name="bluetooth_button_txt">Bluetooth</string>
-	<string name="AddCallButtonText">Add call</string>
-	<string name="TransferCallButtonText">Transfer call</string>
-	<string name="conf_admin_choice_enter">Enter conference</string>
-	<string name="conf_admin_choice_leave">Momentarily leave conference</string>
-	<string name="conf_admin_choice_terminate">Terminate conference</string>
-	<string name="hangup">Hang up</string>
-	<string name="conf_simple_merge_bt_txt">Merge</string>
-	<string name="conf_simple_transfer_bt_txt">Transfer</string>
-	<string name="conf_simple_video_bt_txt">video</string>
-	<!--<string name="conf_simple_no_current_call">No active call</string>-->
-	<string name="show_send_dtmfs_button">Dialpad</string>
-	<string name="conf_conference">Conference</string>
-	<string name="in_conf">You are part of it</string>
-	<string name="in_conf_leave">Go out</string>
-	<string name="out_conf">You are out of it</string>
-	<string name="out_conf_enter">Go in</string>
+	<!-- Audio settings -->
+	<string name="pref_audio_title">Audio</string>
+	<string name="pref_echo_cancellation">Echo cancellation</string>
+	<string name="pref_echo_cancellation_summary">Removes the echo heard by other end</string>
+	<string name="pref_echo_canceller_calibration">Echo canceller calibration</string>
+	<string name="ec_calibrating">Calibrating…</string>
+	<string name="ec_calibrated">Calibrated [%s ms]</string>
+	<string name="no_echo">No echo</string>
+	<string name="failed">failed</string>
+	<string name="pref_adaptive_rate_control">Adaptive rate control</string>
+	<string name="pref_adaptive_rate_algorithm">Adaptive rate algorithm</string>
+	<string-array name="adaptive_rate_algorithm_entries">
+		<item>Simple</item>
+		<item>Stateful</item>
+	</string-array>
+	<string name="pref_codec_bitrate_limit">Codec bitrate limit</string>
+	<string name="pref_codecs">Codecs</string>
+
+	<!-- Video settings -->
+	<string name="pref_video_title">Video</string>
+	<string name="pref_video_use_front_camera_title">Use front camera</string>
+	<string name="pref_video_initiate_call_with_video_title">Initiate video calls</string>
+	<string name="pref_video_initiate_call_with_video">Always send video requests</string>
+	<string name="pref_video_automatically_accept_video_title">Accept incoming video requests</string>
+	<string name="pref_video_automatically_accept_video">Always accept video requests</string>
+	<string name="pref_video_preset">Video preset</string>
+	<string-array name="video_preset_entries">
+		<item>default</item>
+		<item>high-fps</item>
+		<item>custom</item>
+	</string-array>
+	<string name="pref_preferred_video_size">Preferred video size</string>
+	<string name="pref_preferred_fps">Preferred FPS</string>
+
+	<string name="pref_bandwidth_limit">Bandwidth limit in kbits/s</string>
+	<string name="pref_video_codecs_title">Codecs</string>
+
+	<!-- Call settings -->
+	<string name="pref_call_title">Call</string>
+	<string name="pref_rfc2833_dtmf">Send RFC2833 DTMFs</string>
+	<string name="pref_sipinfo_dtmf">Send SIP INFO DTMFs</string>
+	<string name="pref_voice_mail">Voice mail uri</string>
+
+	<!-- Network settings -->
+	<string name="pref_network_title">Network</string>
+	<string name="pref_wifi_only">Use wifi only</string>
+	<string name="pref_stun_server">Stun server</string>
+	<string name="pref_ice_enable">Enable ICE</string>
+	<string name="pref_upnp_enable">Enable UPNP</string>
+	<string name="pref_transport_use_random_ports">Use random ports</string>
+	<string name="pref_sip_port_title">SIP port to use</string>
+	<string name="pref_video_port_title">Video port or port range</string>
+	<string name="pref_audio_port_title">Audio port or port range</string>
+	<string name="pref_video_port_description">Video port or port range (minport-maxport)</string>
+	<string name="pref_audio_port_description">Audio port or port range (minport-maxport)</string>
+	<string name="pref_media_encryption">Media encryption</string>
+	<string name="pref_push_notification">Enable push notifications</string>
+	<string name="pref_ipv6_title">Allow IPv6</string>
+
+	<!-- Advanced settings -->
+	<string name="pref_advanced_title">Advanced</string>
+	<string name="pref_debug">Debug</string>
+	<string name="pref_background_mode">Background mode</string>
+	<string name="pref_animation_enable_title">Enable Animations</string>
+	<string name="pref_autostart">Start at boot time</string>
+	<string name="pref_incoming_call_timeout_title">Incoming call timeout (in seconds)</string>
+	<string name="pref_image_sharing_server_title">Sharing server</string>
+	<string name="pref_remote_provisioning_title">Remote provisioning</string>
+	<string name="pref_primary_account_title">Primary account</string>
+	<string name="pref_display_name_title">Display name</string>
+	<string name="pref_user_name_title">Username</string>
+
+	<!-- Audio hack settings -->
 	<string name="pref_audio_hacks_title">Audio hacks</string>
 	<string name="pref_audio_use_specific_mode_title">Use specific mode hack</string>
 	<string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (default), 2=MODE_IN_CALL</string>
 	<string name="pref_audio_hacks_use_routing_api_title">Use routing API hack</string>
 	<string name="pref_audio_hacks_use_galaxys_hack_title">Use Galaxy S audio hack</string>
-	<string name="pref_audio_soft_volume_title">Use software volume</string>
-	<string name="pref_ipv6_title">Allow IPv6</string>
-	<string name="error_while_accepting_pending_call">Error while accepting pending call</string>
-	<string name="incoming_call_dialog_title">%s is calling you</string>
-	<string name="decline">Decline</string>
-	<string name="unknown_incoming_call_name">Unknown</string>
-	<string name="pref_network_title">Network</string>
-	<string name="pref_transport">Transport</string>
-	<string name="pref_transport_udp">UDP</string>
-	<string name="pref_transport_tcp">TCP</string>
-	<string name="pref_transport_tls">TLS</string>
-	<string name="pref_transport_use_random_ports">Use random ports</string>
-	<string name="pref_sip_port_title">SIP port to use</string>
-	<string name="at_least_a_protocol">At least one item is required</string>
-	<string name="first_launch_ok">Registration successful</string>
-	<string name="error">Error</string>
-	<string name="click_to_show_first_login_view">Start</string>
-	<string name="dialer_null_on_new_intent">Application not ready</string>
-	<string name="pref_add_account">Add account</string>
-	<string name="no_phone_numbers">No phone numbers found for %s</string>
-	<string name="filter_contacts">Filter contacts</string>
-	<string name="title_numbers_dialog">%s\'s phone numbers</string>
-	<string name="pref_delete_account">Delete this account</string>
-	<string name="pref_default_account">Use as default</string>
-	<string name="pref_echo_canceller_calibration">Echo canceller calibration</string>
-	<string name="pref_video_use_front_camera_title">Use front camera</string>
-	<string name="pref_video">Video</string>
-	<string name="pref_preferences">Preferences</string>
-	<string name="pref_video_codecs_title">Codecs</string>
-	<string name="pref_preferred_video_size">Preferred video size</string>
-	<string name="menu_videocall_back_to_dialer_title">Display dialer</string>
-	<string name="menu_videocall_switch_camera_title">Front/Rear Camera</string>
-	<string name="menu_videocall_change_resolution_when_low_resolution">Try High resolution</string>
-	<string name="menu_videocall_change_resolution_when_high_resolution">Low resolution</string>
-	<string name="menu_videocall_change_resolution_title">Change resolution</string>
-	<string name="menu_videocall_toggle_camera_title">Mute/Unmute camera</string>
-	<string name="menu_videocall_toggle_camera_disable">Disable camera</string>
-	<string name="menu_videocall_toggle_camera_enable">Enable camera</string>
-	<string name="menu_videocall_terminate_call_title">Terminate call</string>
-	<string name="pref_video_settings_title">Video settings</string>
-	<string name="pref_video_automatically_share_my_video_title">Share my camera</string>
-	<string name="pref_video_automatically_accept_video_title">Accept incoming video requests</string>
-	<string name="pref_video_automatically_share_my_video">Automatically send my camera</string>
-	<string name="pref_video_automatically_accept_video">Always accept video requests</string>
-	<string name="pref_video_initiate_call_with_video_title">Initiate video calls</string>
-	<string name="pref_video_initiate_call_with_video">Always send video requests</string>
-	<string name="pref_video_enable_title">Enable Video</string>
-	<string name="pref_bandwidth_limit">Bandwidth limit in kbits/s</string>
-	<string name="pref_animation_enable_title">Enable Animations</string>
-	<string name="pref_escape_plus">Replace + by 00</string>
-	<string name="pref_ilbc_summary">iLBC might be unavailable depending on ARM processor and Android OS version.</string>
-	<string name="pref_echo_cancellation">Echo cancellation</string>
-	<string name="pref_autostart">Start at boot time</string>
-	<string name="pref_enable_outbound_proxy">Outbound proxy</string>
 
-	<string name="pref_codecs">Codecs</string>
-	<string name="pref_communication_expire_title">Communication timeout</string>
-	<string name="pref_incoming_expire_title">Incoming call timeout</string>
-	<string name="pref_video_port_title">Video port or port range</string>
-	<string name="pref_audio_port_title">Audio port or port range</string>
-	<string name="pref_video_port_description">Video port or port range (minport-maxport)</string>
-	<string name="pref_audio_port_description">Audio port or port range (minport-maxport)</string>
-	<string name="pref_incoming_call_timeout_title">Incoming call timeout (in seconds)</string>
-	<string name="place_call_chooser">Place a call</string>
-	<string name="pref_adaptive_rate_control">Adaptive rate control</string>
-	<string name="pref_adaptive_rate_algorithm">Adaptive rate algorithm</string>
-	<string name="pref_codec_bitrate_limit">Codec bitrate limit</string>
-	<string-array name="limit_bitrate_entries">
-		<item>10 kbits/s</item>
-		<item>15 kbits/s</item>
-		<item>20 kbits/s</item>
-		<item>36 kbits/s</item>
-		<item>64 kbits/s</item>
-		<item>128 kbits/s</item>
-	</string-array>
-
-	<string name="pref_debug">Debug</string>
-	<string name="about_report_issue">Report issue</string>
-	<string name="about_bugreport_email_text">Describe problem here</string>
-	<string name="about_error_generating_bugreport_attachement">Error generating bug report</string>
-	<string name="about_logs_not_found">Logs not found.</string>
-	<string name="about_reading_logs">Reading logs, may takes time…</string>
-	<string name="about_mailer_chooser_text">Send bug report with…</string>
-	<string name="menu_about">About</string>
-	<string name="menu_send_log">Send log</string>
-	<string name="menu_reset_log">Reset log</string>
-	<string name="pref_audio">Audio</string>
-	<string name="pref_prefix">Prefix</string>
-	<string name="pref_advanced">Advanced</string>
-	<string name="pref_proxy">Proxy</string>
-	<string name="pref_domain">Domain*</string>
-	<string name="pref_passwd">Password*</string>
-	<string name="pref_username">Username*</string>
-	<string name="pref_sipaccount">SIP Account</string>
-	<string name="wrong_username">wrong user name</string>
-	<string name="wrong_passwd">wrong password</string>
-	<string name="wrong_domain">Wrong domain</string>
-	<string name="wrong_settings">Wrong settings</string>
-	<string name="tab_dialer">Dialer</string>
-	<string name="tab_contact">Contact</string>
-	<string name="call_error">Cannot call %s</string>
-	<string name="yes">Yes</string>
-	<string name="no">No</string>
-	<string name="dismiss">Dismiss</string>
-	<string name="cont">Continue</string>
-	<string name="never_remind">Never remind me</string>
-	<string name="config_error">%s, do you want to go to the settings page ?</string>
-	<string name="ec_calibration_launch_message">Starting echo cancelation audio calibration </string>
-	<string name="warning_already_incall">Cannot initiate a new call because a call is already engaged</string>
-	<string name="tab_history">History</string>
-	<string name="warning_wrong_destination_address">Cannot build destination address from [%s]</string>
-	<string name="menu_clear_history">Clear</string>
-	<string name="error_cannot_get_call_parameters">Cannot get call parameters</string>
-	<string name="error_cannot_create_default_parameters">Cannot create default call parameters</string>
-	<string name="error_cannot_invite_address">Cannot invite destination address [%s]</string>
-	<string name="notification_started">started</string>
-	<string name="pref_echo_cancellation_summary">Removes the echo heard by other end</string>
-	<string name="pref_stun_server">Stun server</string>
-	<string name="pref_ice_enable">Enable ICE</string>
-	<string name="pref_ice_enable_summary">A STUN server must be configured to use ICE</string>
-	<string name="ec_calibrating">Calibrating…</string>
-	<string name="ec_calibrated">Calibrated [%s ms]</string>
-	<string name="no_echo">No echo</string>
-	<string name="failed">failed</string>
-	<string name="first_login_explanation">Enter your username and password to connect to the service.</string>
-	<string name="first_login_username">Username</string>
-	<string name="first_login_password">Password</string>
-	<string name="first_login_connect">Connect</string>
-	<string name="first_launch_no_login_password">Please enter your login and password</string>
-	<string name="first_launch_bad_login_password">Couldn\'t connect; check your login and password and start again</string>
-	<string name="pref_amr_summary">AMR codec might not be present on your phone</string>
-	<string name="pref_media_encryption">Media encryption</string>
-	<string name="media_encryption_none">None</string>
-	<string name="pref_video_codec_h264_unavailable">Codec disabled, build the app from source code to enable it</string>
-	<string name="pref_video_codec_mpeg4_unavailable">Codec disabled, build the app from source code to enable it</string>
-	<string name="pref_sipaccounts">SIP Accounts</string>
-	<string name="pref_wifi_only">Use wifi only</string>
-	<string name="pref_push_notification">Enable push notifications</string>
-	<string name="wizard_failed">An error occurred, try again later.</string>
-	<string name="wizard_server_unavailable">Server unreachable, verify your internet connection.</string>
-	<string name="wizard_username_unavailable">This username is already in use.</string>
-	<string name="wizard_username_incorrect">Your username is not valid.</string>
-	<string name="wizard_email_incorrect">Your email is not valid.</string>
-	<string name="wizard_password_incorrect">Your password is not valid (6 characters min).</string>
-	<string name="wizard_passwords_unmatched">Passwords entered are different.</string>
-	<string name="pref_help_proxy">SIP proxy hostname or ip address (optional)</string>
-	<string name="pref_help_outbound_proxy">Route all calls through SIP proxy</string>
-	<string name="pref_help_username">Example: john if your account is john@sip.example.org</string>
-	<string name="pref_help_domain">sip.example.org if your account is john@sip.example.org</string>
-	<string name="pref_help_password">You have to re-enter your password if you edit your username and/or the domain</string>
-
-	<string name="chat">Chat</string>
-	<string name="call">Call</string>
-	<string name="add_to_contacts">Add to contacts</string>
-	<string name="status_connected">Registered</string>
-	<string name="status_not_connected">Not Registered</string>
-	<string name="status_in_progress">Registration in progress</string>
-	<string name="status_error">Registration failed</string>
-	<string name="conference">Conference</string>
-	<string name="draft">Draft</string>
-	<string name="new_fast_chat">Enter a SIP address to chat with…</string>
-	<string name="call_stats_audio">Audio</string>
-	<string name="call_stats_video">Video</string>
-	<string name="call_stats_codec">Codec:</string>
-	<string name="call_stats_upload">Upload bandwidth:</string>
-	<string name="call_stats_download">Download bandwidth:</string>
-	<string name="call_stats_ice">ICE connectivity:</string>
-	<string name="call_stats_video_resolution">Video size:</string>
-	<!--Used by Android to help blind people by describing them images-->
-
-	<string name="button_history">History</string>
-	<string name="button_contacts">Contacts</string>
-	<string name="button_settings">Settings</string>
-	<string name="button_chat">Chat</string>
-	<string name="button_about">About</string>
-	<string name="button_new_chat">New conversation</string>
-	<string name="button_edit">Edit</string>
-	<string name="button_ok">Okay</string>
-	<string name="button_back">Back</string>
-	<string name="button_all_contacts">All</string>
-	<string name="button_add_contact">New contact</string>
-	<string name="button_all_call">All</string>
-	<string name="button_missed_call">Missed</string>
-	<string name="button_delete_all">Delete</string>
-	<string name="button_transfer">Transfer</string>
-	<string name="button_add_call">Add call</string>
-	<string name="button_video">Video</string>
-	<string name="button_micro">Micro</string>
-	<string name="button_speaker">Speaker</string>
-	<string name="button_route">Route</string>
-	<string name="button_receiver">Receiver</string>
-	<string name="button_bluetooth">Bluetooth</string>
-	<string name="button_options">Options</string>
-	<string name="button_send_message">Send</string>
-	<string name="button_send_picture">Pic</string>
-	<string name="uploading_image">Uploading…</string>
-	<string name="call_update_title">Call update requested</string>
-	<string name="call_update_desc">Your correspondent would like to add video to the current call.</string>
-	<string name="call_update_yes">Accept</string>
-	<string name="call_update_no">Decline</string>
-	<string name="share_picture_size_small">Small</string>
-	<string name="share_picture_size_medium">Medium</string>
-	<string name="share_picture_size_large">Large</string>
-	<string name="share_picture_size_real">Real size</string>
-	<string name="save_picture">Save picture</string>
-	<string name="text_copied_to_clipboard">Text copied to clipboard</string>
-	<string name="copy_text">Copy text</string>
-	<string name="image_picker_title">Select source</string>
-	<string name="image_saved">Image saved</string>
-	<string name="image_not_saved">Error, image not saved</string>
-	<string name="pref_linphone_friend_title">Friends</string>
-	<string name="pref_auto_accept_friends_title">New friends</string>
-	<string name="pref_auto_accept_friends_desc">Automatically accept new friend requests</string>
-	<string name="linphone_friend_new_request_title">Friend request</string>
-	<string name="linphone_friend_new_request_desc">wants to share it\'s presence status with you and be aware of yours.</string>
-
-	<string name="pref_image_sharing_server_title">Sharing server</string>
-	<string name="pref_remote_provisioning_title">Remote provisioning</string>
-	<string name="sip_address">SIP address</string>
-	<string name="phone_number">Phone number</string>
-	<string name="contact_first_name">First name</string>
-	<string name="contact_last_name">Last name</string>
-	<string name="pref_primary_account_title">Primary account</string>
-	<string name="pref_display_name_title">Display name</string>
-	<string name="pref_user_name_title">Username</string>
-	<string name="pref_expire_title">Expire</string>
-	<string name="pref_avpf">AVPF</string>
-	<string name="pref_avpf_rr_interval"> AVPF regular RTCP interval in seconds (between 1 and 5)</string>
-	<string name="pref_rfc2833_dtmf">Send RFC2833 DTMFs</string>
-	<string name="pref_sipinfo_dtmf">Send SIP INFO DTMFs</string>
-	<string name="pref_voice_mail">Voice mail uri</string>
-	<string name="voicemail_unread"> unread messages</string>
-	<string name="error_unknown">Unknown error</string>
-	<string name="error_call_declined">Call declined</string>
-	<string name="error_user_not_found">User not found</string>
-	<string name="error_incompatible_media">Incompatible media parameters</string>
-	<string name="error_low_bandwidth">Your correspondent has low bandwidth, video can\'t be started</string>
-	<string name="error_network_unreachable">Network is unreachable</string>
-	<string name="error_bad_credentials">Bad credentials</string>
-	<string name="error_unauthorized">Unauthorized</string>
-	<string name="error_io_error">Network error</string>
-	<string name="today">Today</string>
-	<string name="yesterday">Yesterday</string>
-	<string name="call_state_missed">Missed</string>
-	<string name="call_state_outgoing">Outgoing</string>
-	<string name="call_state_incoming">Incoming</string>
-	<string name="pref_background_mode">Background mode</string>
-	<string name="show_image">Show</string>
-	<string name="download_image">Download</string>
-	<string name="download_image_failed">Download failed. Please check your internet access or try again later.</string>
-	<string name="pref_auth_userid">Auth userid</string>
-	<string name="pref_help_auth_userid">Enter authentication userid (optionnal)</string>
-	<string name="pref_display_name">Display name</string>
-	<string name="pref_help_display_name">Enter display name (optionnal)</string>
-	<string name="pref_upnp_enable">Enable UPNP</string>
-	<string name="pref_manage">Manage</string>
-	<string name="wait">Please wait...</string>
-	<string name="importing_messages">Updating messages database</string>
-	<string name="default_account_flag">Default account</string>
-	<string name="setup_remote_provisioning_hint">This assistant will download an existing configuration.</string>
-	<string name="setup_remote_provisioning_url_hint">provisioning url</string>
-	<string name="setup_remote_provisioning_login_hint">The configuration you downloaded doesn\'t include your account. Please fill it in.</string>
-	<string name="setup_confirm_username">Your username will be %s.\r\n\r\nIt may differ from what you entered to match some requirements.\r\nDo you accept ?</string>
-
-	<string name="remote_composing">Remote is writing...</string>
-	<string name="unread_messages">%i unread messages</string>
-	<string name="remote_provisioning_failure">Failed to download or apply remote provisioning profile...</string>
-	<string name="remote_provisioning_again_title">Remote provisioning</string>
-	<string name="remote_provisioning_again_message">Do you want to change the provisioning URI ?</string>
-	<string name="processing_image">Processing image, can take up to a few seconds depending on the size of the file</string></resources>
+	<!-- Content description -->
+	<string name="content_description_back">Back</string>
+	<string name="content_description_dialer">Dialer</string>
+	<string name="content_description_toggle_micro">Toggle micro</string>
+	<string name="content_description_toggle_speaker">Toggle speaker</string>
+	<string name="content_description_decline">Decline</string>
+	<string name="content_description_hang_up">Hang up</string>
+	<string name="content_description_accept">Accept</string>
+	<string name="content_description_edit">Edit button</string>
+	<string name="content_description_valid">Valid button</string>
+	<string name="content_description_add_contact">Add to contacts</string>
+	<string name="content_description_new_contact">New contact</string>
+	<string name="content_description_call">Call</string>
+	<string name="content_description_backspace">Backspace</string>
+	<string name="content_description_chat">Chat</string>
+	<string name="content_description_dial_back">Dial back</string>
+	<string name="content_description_contact_picture">Contact picture</string>
+	<string name="content_description_send_message">Send message</string>
+	<string name="content_description_detail">Detail</string>
+	<string name="content_description_delete">Delete button</string>
+	<string name="content_description_add">Add button</string>
+	<string name="content_description_new_discussion">New discussion</string>
+	<string name="content_description_search">Search</string>
+	<string name="content_description_all_contacts">All contacts</string>
+	<string name="content_description_linphone_contacts">Linphone contacts</string>
+	<string name="content_description_call_direction">Call direction</string>
+	<string name="content_description_all_calls">All calls</string>
+	<string name="content_description_missed_calls">Missed calls</string>
+	<string name="content_description_switch_video">Switch video</string>
+	<string name="content_description_add_call">Add call</string>
+	<string name="content_description_pause">Pause</string>
+	<string name="content_description_numpad">Numpad</string>
+	<string name="content_description_history">History button</string>
+	<string name="content_description_chat_button">Chat button</string>
+	<string name="content_description_contacts">Contacts button</string>
+	<string name="content_description_call_quality">Call quality</string>
+	<string name="content_description_encryption">Encryption</string>
+	<string name="content_description_switch_camera">Switch camera</string>
+	<string name="content_description_cancel_button">Cancel button</string>
+	<string name="content_description_message_status">Message status</string>
+	<string name="content_description_conference">Conference</string>
+</resources>
diff --git a/res/xml/account_preferences.xml b/res/xml/account_preferences.xml
index ae8bcd940..cd70b14fd 100644
--- a/res/xml/account_preferences.xml
+++ b/res/xml/account_preferences.xml
@@ -33,7 +33,7 @@
     </PreferenceCategory>
     
     <PreferenceCategory
-    	android:title="@string/pref_advanced"
+    	android:title="@string/pref_advanced_title"
 		android:key="@string/pref_advanced_key">
         
 		<ListPreference 
@@ -76,7 +76,7 @@
     </PreferenceCategory>
     
 	<PreferenceCategory
-       	android:title="@string/pref_manage"
+       	android:title="@string/pref_manage_title"
 		android:key="@string/pref_manage_key">
        
         <CheckBoxPreference
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 2c96ad9ec..bf59a9549 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -31,14 +31,14 @@
     </PreferenceCategory>
 
 	<PreferenceCategory
-	    android:title="@string/pref_preferences">
+	    android:title="@string/pref_preferences_title">
 
 		<CheckBoxPreference
 			android:title="@string/pref_video_enable_title"
 			android:key="@string/pref_video_enable_key"/>
 
 		<PreferenceScreen
-		    android:title="@string/pref_audio">
+		    android:title="@string/pref_audio_title">
 
 		    <CheckBoxPreference
 				android:title="@string/pref_echo_cancellation"
@@ -72,7 +72,7 @@
 		</PreferenceScreen>
 
 		<PreferenceScreen
-		    android:title="@string/pref_video"
+		    android:title="@string/pref_video_title"
 		    android:key="@string/pref_video_key"
 		    android:dependency="@string/pref_video_enable_key"
 		    android:shouldDisableView="true">
@@ -89,13 +89,6 @@
 				android:summary="@string/pref_video_initiate_call_with_video"
 				android:dependency="@string/pref_video_enable_key"/>
 
-			<CheckBoxPreference
-				android:title="@string/pref_video_automatically_share_my_video_title"
-				android:key="@string/pref_video_automatically_share_my_video_key"
-				android:summary="@string/pref_video_automatically_share_my_video"
-				android:dependency="@string/pref_video_enable_key"
-				android:layout="@layout/hidden"/>
-
 		    <CheckBoxPreference
 				android:title="@string/pref_video_automatically_accept_video_title"
 				android:key="@string/pref_video_automatically_accept_video_key"
@@ -103,7 +96,7 @@
 				android:dependency="@string/pref_video_enable_key"/>
 
 			<ListPreference
-				android:title="Video preset"
+				android:title="@string/pref_video_preset"
 				android:key="@string/pref_video_preset_key"
 				android:entries="@array/video_preset_entries"
 				android:entryValues="@array/video_preset_entries" />
@@ -113,7 +106,7 @@
 				android:key="@string/pref_preferred_video_size_key"/>
 
 			<ListPreference
-				android:title="Preferred FPS"
+				android:title="@string/pref_preferred_fps"
 				android:key="@string/pref_preferred_video_fps_key"/>
 
 			<EditTextPreference
@@ -130,7 +123,7 @@
 		</PreferenceScreen>
 
 		<PreferenceScreen
-		    android:title="@string/call">
+		    android:title="@string/pref_call_title">
 
 			<CheckBoxPreference
 				android:title="@string/pref_sipinfo_dtmf"
@@ -201,7 +194,7 @@
 		</PreferenceScreen>
 
 		<PreferenceScreen
-		    android:title="@string/pref_advanced">
+		    android:title="@string/pref_advanced_title">
 
 			<CheckBoxPreference
 				android:title="@string/pref_debug"
diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java
index 6fbbdab8a..006a9ee25 100644
--- a/src/org/linphone/SettingsFragment.java
+++ b/src/org/linphone/SettingsFragment.java
@@ -339,7 +339,7 @@ public class SettingsFragment extends PreferencesListFragment {
 	private void initMediaEncryptionPreference(ListPreference pref) {
 		List<CharSequence> entries = new ArrayList<CharSequence>();
 		List<CharSequence> values = new ArrayList<CharSequence>();
-		entries.add(getString(R.string.media_encryption_none));
+		entries.add(getString(R.string.pref_none));
 		values.add(getString(R.string.pref_media_encryption_key_none));
 
 		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
@@ -402,7 +402,7 @@ public class SettingsFragment extends PreferencesListFragment {
 	private void initializePreferredVideoFpsPreferences(ListPreference pref) {
 		List<CharSequence> entries = new ArrayList<CharSequence>();
 		List<CharSequence> values = new ArrayList<CharSequence>();
-		entries.add("none");
+		entries.add(getString(R.string.pref_none));
 		values.add("0");
 		for (int i = 5; i <= 30; i += 5) {
 			String str = Integer.toString(i);
@@ -412,7 +412,7 @@ public class SettingsFragment extends PreferencesListFragment {
 		setListPreferenceValues(pref, entries, values);
 		String value = Integer.toString(mPrefs.getPreferredVideoFps());
 		if (value.equals("0")) {
-			value = "none";
+			value = getString(R.string.pref_none);
 		}
 		pref.setSummary(value);
 		pref.setValue(value);
@@ -620,7 +620,7 @@ public class SettingsFragment extends PreferencesListFragment {
 		int fps = mPrefs.getPreferredVideoFps();
 		String fpsStr = Integer.toString(fps);
 		if (fpsStr.equals("0")) {
-			fpsStr = "none";
+			fpsStr = getString(R.string.pref_none);
 		}
 		findPreference(getString(R.string.pref_preferred_video_fps_key)).setSummary(fpsStr);
 		findPreference(getString(R.string.pref_bandwidth_limit_key)).setSummary(Integer.toString(mPrefs.getBandwidthLimit()));