diff --git a/linphone-android-obiane.iml b/linphone-android-obiane.iml
index 3c1ff026e..d2ae187b0 100644
--- a/linphone-android-obiane.iml
+++ b/linphone-android-obiane.iml
@@ -73,13 +73,18 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
diff --git a/res/drawable-xhdpi/camera_disabled.png b/res/drawable-xhdpi/camera_disabled.png
deleted file mode 100644
index 0fa899521..000000000
Binary files a/res/drawable-xhdpi/camera_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/contact_add_disabled.png b/res/drawable-xhdpi/contact_add_disabled.png
deleted file mode 100644
index 2be5d9cc9..000000000
Binary files a/res/drawable-xhdpi/contact_add_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/delete_disabled.png b/res/drawable-xhdpi/delete_disabled.png
deleted file mode 100644
index ce7025092..000000000
Binary files a/res/drawable-xhdpi/delete_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/fast_scroll_default.png b/res/drawable-xhdpi/fast_scroll_default.png
deleted file mode 100644
index 947a24d95..000000000
Binary files a/res/drawable-xhdpi/fast_scroll_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/fast_scroll_over.png b/res/drawable-xhdpi/fast_scroll_over.png
deleted file mode 100644
index 134b728f7..000000000
Binary files a/res/drawable-xhdpi/fast_scroll_over.png and /dev/null differ
diff --git a/res/drawable-xhdpi/micro_disabled.png b/res/drawable-xhdpi/micro_disabled.png
deleted file mode 100644
index a2e952780..000000000
Binary files a/res/drawable-xhdpi/micro_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/options_add_call_disabled.png b/res/drawable-xhdpi/options_add_call_disabled.png
deleted file mode 100644
index 82a0e832e..000000000
Binary files a/res/drawable-xhdpi/options_add_call_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/options_disabled.png b/res/drawable-xhdpi/options_disabled.png
deleted file mode 100644
index 533713d97..000000000
Binary files a/res/drawable-xhdpi/options_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/options_start_conference_disabled.png b/res/drawable-xhdpi/options_start_conference_disabled.png
deleted file mode 100644
index 468dc128d..000000000
Binary files a/res/drawable-xhdpi/options_start_conference_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/options_transfer_call_disabled.png b/res/drawable-xhdpi/options_transfer_call_disabled.png
deleted file mode 100644
index bbb11170b..000000000
Binary files a/res/drawable-xhdpi/options_transfer_call_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/resizable_assistant_button_disabled.9.png b/res/drawable-xhdpi/resizable_assistant_button_disabled.9.png
deleted file mode 100644
index df69f9217..000000000
Binary files a/res/drawable-xhdpi/resizable_assistant_button_disabled.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/speaker_disabled.png b/res/drawable-xhdpi/speaker_disabled.png
deleted file mode 100644
index aa2a0b78a..000000000
Binary files a/res/drawable-xhdpi/speaker_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/valid_disabled.png b/res/drawable-xhdpi/valid_disabled.png
deleted file mode 100644
index a7c040c4b..000000000
Binary files a/res/drawable-xhdpi/valid_disabled.png and /dev/null differ
diff --git a/res/drawable/assistant_button.xml b/res/drawable/assistant_button.xml
index 20d6cca2c..e42184824 100644
--- a/res/drawable/assistant_button.xml
+++ b/res/drawable/assistant_button.xml
@@ -3,7 +3,7 @@
 	<item android:state_pressed="true"
 		  android:drawable="@drawable/resizable_cancel_button_over" />
 	<item android:state_enabled="false"
-		  android:drawable="@drawable/resizable_assistant_button_disabled" />
+		  android:drawable="@drawable/resizable_cancel_button_over" />
 	<item
 		android:drawable="@drawable/resizable_cancel_button" />
 </selector>
diff --git a/res/drawable/camera_button.xml b/res/drawable/camera_button.xml
deleted file mode 100644
index 844fb67b3..000000000
--- a/res/drawable/camera_button.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false"
-		  android:drawable="@drawable/camera_disabled" />
-	<item
-		android:drawable="@drawable/camera_default" />
-</selector>
diff --git a/res/drawable/fast_scroll.xml b/res/drawable/fast_scroll.xml
deleted file mode 100644
index 438a7ad42..000000000
--- a/res/drawable/fast_scroll.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/fast_scroll_over" />
-    <item android:drawable="@drawable/fast_scroll_default" />
-</selector>
-
diff --git a/res/drawable/fast_scroll_preview.xml b/res/drawable/fast_scroll_preview.xml
deleted file mode 100644
index cdf8aeccb..000000000
--- a/res/drawable/fast_scroll_preview.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-	    <shape android:shape="rectangle">
-	        <size android:width="70dp" android:height="70dp"/>
-	        <solid android:color="@color/colorA" />
-	    </shape>
-	</item>
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/options_add_call_button.xml b/res/drawable/options_add_call_button.xml
deleted file mode 100644
index 83a0120bc..000000000
--- a/res/drawable/options_add_call_button.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false"
-		  android:drawable="@drawable/options_add_call_disabled" />
-	<item
-		android:drawable="@drawable/options_add_call" />
-</selector>
diff --git a/res/drawable/options_start_conference_button.xml b/res/drawable/options_start_conference_button.xml
deleted file mode 100644
index b04e79480..000000000
--- a/res/drawable/options_start_conference_button.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false"
-		  android:drawable="@drawable/options_start_conference_disabled" />
-	<item
-		android:drawable="@drawable/options_start_conference" />
-</selector>
diff --git a/res/drawable/options_transfer_call_button.xml b/res/drawable/options_transfer_call_button.xml
deleted file mode 100644
index 4ba682b61..000000000
--- a/res/drawable/options_transfer_call_button.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false"
-		  android:drawable="@drawable/options_transfer_call_disabled" />
-	<item
-		android:drawable="@drawable/options_transfer_call" />
-</selector>
diff --git a/res/layout-land/about.xml b/res/layout-land/about.xml
deleted file mode 100644
index 6d9d277b9..000000000
--- a/res/layout-land/about.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:background="@color/colorH"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
-
-    <LinearLayout
-        android:id="@+id/top_bar"
-        android:orientation="horizontal"
-        android:background="@color/colorF"
-        android:layout_width="match_parent"
-        android:layout_height="60dp">
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"/>
-
-        <TextView
-            android:id="@+id/menu_name"
-            android:text="@string/about"
-            style="@style/font1"
-            android:singleLine="true"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.4"
-            android:gravity="center"
-            android:padding="15dp"/>
-
-        <ImageView
-            android:id="@+id/cancel"
-            android:src="@drawable/dialer_back"
-            android:background="@drawable/toolbar_button"
-            android:contentDescription="@string/content_description_dialer_back"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"
-            android:padding="15dp"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:background="@color/colorC"
-        android:orientation="horizontal"
-        android:layout_weight="1"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_gravity="center">
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:layout_gravity="center">
-
-            <ImageView
-                android:src="@drawable/splashscreen"
-                android:layout_width="wrap_content"
-                android:layout_height="60dp"
-                android:layout_gravity="center"/>
-
-            <TextView
-                android:text="@string/app_name"
-                style="@style/font15"
-                android:paddingTop="5dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"/>
-
-            <TextView
-                android:text="@string/app_description"
-                style="@style/font3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_weight="1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_gravity="center">
-
-            <TextView
-                android:id="@+id/about_android_version"
-                android:text="@string/about_version"
-                style="@style/font12"
-                android:layout_gravity="left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-            <TextView
-                android:id="@+id/about_liblinphone_version"
-                android:text="@string/about_liblinphone_version"
-                style="@style/font12"
-                android:layout_gravity="left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:background="@color/colorH"
-        android:orientation="vertical"
-        android:padding="10dp"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_gravity="center">
-
-        <TextView
-            android:id="@+id/about_link"
-            android:text="@string/about_link"
-            android:autoLink="web"
-            style="@style/font2"
-            android:textColorLink="@color/colorA"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
-        <TextView
-            android:id="@+id/about_text"
-            android:text="@string/about_text"
-            style="@style/font23"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:textSize="18sp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-
-        <View
-            android:background="@color/colorE"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"/>
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center">
-
-            <Button
-                android:id="@+id/send_log"
-                android:background="@drawable/button_background"
-                android:layout_margin="5dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/menu_send_log" />
-
-            <Button
-                android:id="@+id/reset_log"
-                android:background="@drawable/button_background"
-                android:layout_margin="5dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/menu_reset_log" />
-
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout-land/call.xml b/res/layout-land/call.xml
index 6b6ae64b2..450293da2 100644
--- a/res/layout-land/call.xml
+++ b/res/layout-land/call.xml
@@ -212,27 +212,32 @@
                         android:layout_weight="0.8"
                         android:padding="15dp" />
 
+                    <ImageView
+                        android:id="@+id/hang_up"
+                        android:src="@drawable/call_hangup"
+                        android:background="@drawable/hangup"
+                        android:layout_gravity="center"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.4"
+                        android:padding="12dp"/>
 
-					<ImageView
-						android:id="@+id/hang_up"
-						android:src="@drawable/call_hangup"
-						android:background="@drawable/hangup"
-						android:contentDescription="@string/content_description_hang_up"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="0.5"
-						android:padding="12dp"/>
+                    <ImageView
+                        android:id="@+id/chat"
+                        android:src="@drawable/chat"
+                        android:background="@color/colorC"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.8"
+                        android:padding="15dp"/>
+                </LinearLayout>
 
-					<ImageView
-						android:id="@+id/chat"
-						android:src="@drawable/footer_chat"
-						android:background="@color/colorC"
-						android:contentDescription="@string/content_description_chat_button"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						android:padding="15dp"/>
-				</LinearLayout>
+                <LinearLayout
+                    android:id="@+id/menu"
+                    android:layout_width="match_parent"
+                    android:layout_weight="1"
+                    android:layout_height="60dp"
+                    android:orientation="vertical">
 
                     <LinearLayout
                         android:background="@color/colorF"
@@ -246,19 +251,22 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1">
 
-					<RelativeLayout
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:layout_weight="1">
+                            <ImageView
+                                android:id="@+id/video"
+                                android:src="@drawable/camera_default"
+                                android:background="@drawable/button_background"
+                                android:padding="20dp"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"/>
 
-						<ImageView
-							android:id="@+id/video"
-							android:src="@drawable/camera_default"
-							android:background="@drawable/button_background"
-							android:contentDescription="@string/content_description_switch_video"
-							android:padding="20dp"
-							android:layout_width="match_parent"
-							android:layout_height="match_parent"/>
+                            <ProgressBar
+                                android:id="@+id/video_in_progress"
+                                style="?android:attr/progressBarStyle"
+                                android:layout_centerHorizontal="true"
+                                android:layout_centerVertical="true"
+                                android:visibility="gone"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"/>
 
                         </RelativeLayout>
 
@@ -271,46 +279,37 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1" />
 
-					<ImageView
-						android:id="@+id/micro"
-						android:src="@drawable/micro_default"
-						android:background="@drawable/button_background"
-						android:contentDescription="@string/content_description_toggle_micro"
-						android:padding="10dp"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1" />
+                    <ImageView
+                        android:id="@+id/speaker"
+                        android:src="@drawable/speaker_default"
+                        android:background="@drawable/button_background"
+                        android:padding="15dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1" />
 
-					<ImageView
-						android:id="@+id/speaker"
-						android:src="@drawable/speaker_default"
-						android:background="@drawable/button_background"
-						android:contentDescription="@string/content_description_toggle_speaker"
-						android:padding="15dp"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:layout_weight="1" />
+                    <ImageView
+                        android:id="@+id/audio_route"
+                        android:src="@drawable/routes"
+                        android:background="@drawable/button_background"
+                        android:visibility="gone"
+                        android:padding="20dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1" />
 
-					<ImageView
-						android:id="@+id/audio_route"
-						android:src="@drawable/routes_default"
-						android:background="@drawable/button_background"
-						android:contentDescription="@string/content_description_audio_route"
-						android:visibility="gone"
-						android:padding="20dp"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:layout_weight="1" />
+                    <ImageView
+                        android:id="@+id/options"
+                        android:src="@drawable/options_default"
+                        android:background="@drawable/button_background"
+                        android:padding="15dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
+                </LinearLayout>
 
-					<ImageView
-						android:id="@+id/options"
-						android:src="@drawable/options_default"
-						android:background="@drawable/button_background"
-						android:contentDescription="@string/content_description_call_options"
-						android:padding="15dp"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1" />
+            </LinearLayout>
+        </LinearLayout>
 
 			<LinearLayout
                 android:id="@+id/menu_bottom"
@@ -331,27 +330,25 @@
                     android:visibility="invisible"
                     android:layout_weight="0.5"/>
 
-				<ImageView
-					android:id="@+id/route_bluetooth"
-					android:src="@drawable/route_bluetooth"
-					android:background="@drawable/button_background"
-					android:contentDescription="@string/content_description_bluetooth"
-					android:padding="15dp"
-					android:visibility="invisible"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.4" />
+                <ImageView
+                    android:id="@+id/route_bluetooth"
+                    android:src="@drawable/route_bluetooth"
+                    android:background="@drawable/button_call_background"
+                    android:padding="15dp"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5" />
 
-				<ImageView
-					android:id="@+id/add_call"
-					android:src="@drawable/options_add_call"
-					android:background="@drawable/button_background"
-					android:contentDescription="@string/content_description_add_call"
-					android:padding="15dp"
-					android:visibility="invisible"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.4" />
+                <ImageView
+                    android:id="@+id/add_call"
+                    android:src="@drawable/options_add_call"
+                    android:background="@drawable/button_call_background"
+                    android:padding="15dp"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5" />
 
             </LinearLayout>
 
@@ -374,27 +371,25 @@
                     android:visibility="invisible"
                     android:layout_weight="0.5"/>
 
-				<ImageView
-					android:id="@+id/route_earpiece"
-					android:src="@drawable/route_earpiece"
-					android:background="@drawable/button_background"
-					android:contentDescription="@string/content_description_earpiece"
-					android:padding="15dp"
-					android:visibility="invisible"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.4"/>
+                <ImageView
+                    android:id="@+id/route_earpiece"
+                    android:src="@drawable/route_earpiece"
+                    android:background="@drawable/button_call_background"
+                    android:padding="15dp"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"/>
 
-				<ImageView
-					android:id="@+id/transfer"
-					android:src="@drawable/options_transfer_call"
-					android:background="@drawable/button_background"
-					android:contentDescription="@string/content_description_transfer"
-					android:padding="15dp"
-					android:visibility="invisible"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.4"/>
+                <ImageView
+                    android:id="@+id/transfer"
+                    android:src="@drawable/options_transfer_call"
+                    android:background="@drawable/button_call_background"
+                    android:padding="15dp"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"/>
 
             </LinearLayout>
 
@@ -419,8 +414,7 @@
 				<ImageView
 					android:id="@+id/route_speaker"
 					android:src="@drawable/route_speaker"
-					android:background="@drawable/button_background"
-					android:contentDescription="@string/content_description_toggle_speaker"
+					android:background="@drawable/button_call_background"
 					android:visibility="invisible"
 					android:padding="15dp"
 					android:layout_width="match_parent"
@@ -430,8 +424,7 @@
 				<ImageView
 					android:id="@+id/conference"
 					android:src="@drawable/options_start_conference"
-					android:background="@drawable/button_background"
-					android:contentDescription="@string/content_description_conference"
+					android:background="@drawable/button_call_background"
 					android:visibility="invisible"
 					android:padding="15dp"
 					android:layout_width="match_parent"
diff --git a/res/layout-land/call_incoming.xml b/res/layout-land/call_incoming.xml
index 7685afaef..e6260d477 100644
--- a/res/layout-land/call_incoming.xml
+++ b/res/layout-land/call_incoming.xml
@@ -52,9 +52,9 @@
 		android:id="@+id/contact_detail"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
+		android:layout_below="@id/top_bar"
 		android:paddingTop="10dp"
-		android:layout_above="@+id/menu"
-		android:layout_below="@+id/top_bar">
+		android:layout_above="@+id/menu">
 
 		<LinearLayout
 			android:background="@color/colorG"
diff --git a/res/layout-land/call_outgoing.xml b/res/layout-land/call_outgoing.xml
index 2f0803b1c..861fa8566 100644
--- a/res/layout-land/call_outgoing.xml
+++ b/res/layout-land/call_outgoing.xml
@@ -53,8 +53,8 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:layout_above="@id/menu"
-		android:paddingTop="10dp"
-		android:layout_below="@+id/top_bar">
+		android:layout_below="@id/top_bar"
+		android:paddingTop="10dp">
 
 		<LinearLayout
 			android:background="@color/colorG"
@@ -107,7 +107,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:padding="10dp"/>
+			android:padding="12dp"/>
 
 		<ImageView
 			android:id="@+id/speaker"
diff --git a/res/layout-land/chatlist_cell.xml b/res/layout-land/chatlist_cell.xml
deleted file mode 100644
index a8f3d65b8..000000000
--- a/res/layout-land/chatlist_cell.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="60dp"
-    android:gravity="center_vertical"
-    android:paddingLeft="10dp"
-	android:paddingRight="10dp"
-	android:paddingTop="5dp"
-    android:background="@drawable/list_selector">
-
-	<CheckBox
-		android:id="@+id/delete_chatroom"
-		android:button="@drawable/checkbox"
-		android:contentDescription="@string/content_description_delete"
-		android:paddingRight="5dp"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:adjustViewBounds="true"
-		android:layout_alignParentRight="true"
-		android:layout_centerVertical="true"
-		android:visibility="invisible" android:layout_alignParentTop="true"/>
-
-	<LinearLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
-	    android:layout_centerVertical="true"
-	    android:orientation="horizontal">
-
-		<RelativeLayout
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:gravity="center">
-
-			<RelativeLayout
-				android:id="@+id/avatar_layout"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_centerHorizontal="true">
-
-				<ImageView
-					android:id="@+id/contact_picture"
-					android:src="@drawable/avatar"
-					android:contentDescription="@string/content_description_contact_picture"
-					android:layout_width="35dp"
-					android:layout_height="35dp"
-					android:adjustViewBounds="true"/>
-
-				<ImageView
-					android:id="@+id/mask"
-					android:src="@drawable/avatar_mask"
-					android:contentDescription="@string/content_description_contact_picture"
-					android:layout_width="35dp"
-					android:layout_height="35dp"
-					android:adjustViewBounds="true"/>
-
-			</RelativeLayout>
-
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:paddingLeft="10dp">
-
-			<TextView
-				android:id="@+id/date"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="5dp"
-				android:singleLine="true"
-				android:layout_alignBottom="@id/sipUri"
-				style="@style/font2"/>
-
-			<TextView
-				android:id="@+id/sipUri"
-				android:lines="1"
-				android:ellipsize="end"
-				android:singleLine="true"
-				style="@style/font6"
-				android:paddingLeft="10dp"
-				android:layout_marginTop="5dp"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@id/date"
-				android:layout_marginRight="30dp"/>
-
-			<TextView
-				android:id="@+id/unreadMessages"
-				android:layout_width="20dp"
-				android:layout_height="20dp"
-				android:background="@drawable/chat_list_indicator"
-				android:contentDescription="@string/content_description_unread_chat_message"
-				style="@style/font18"
-				android:gravity="center"
-				android:singleLine="true"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentEnd="true"
-				android:layout_alignParentTop="true"/>
-
-			<TextView
-				android:id="@+id/lastMessage"
-				android:maxLines="2"
-				android:ellipsize="end"
-				android:layout_below="@id/sipUri"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				style="@style/font11"/>
-
-		</RelativeLayout>
-	    
-	</LinearLayout>
-    
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-land/dialer.xml b/res/layout-land/dialer.xml
deleted file mode 100644
index 2722d36c2..000000000
--- a/res/layout-land/dialer.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:background="@color/colorH"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-	<RelativeLayout
-		android:id="@+id/address_bar"
-		android:background="@color/colorF"
-		android:layout_width="match_parent"
-		android:layout_height="60dp"
-		android:layout_marginBottom="10dp"
-		android:layout_alignParentTop="true">
-
-		<org.linphone.ui.EraseButton
-			android:id="@+id/erase"
-			android:src="@drawable/backspace"
-			android:contentDescription="@string/content_description_backspace"
-			android:layout_width="40dp"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_centerVertical="true"
-			android:layout_marginRight="10dp"
-			android:layout_marginLeft="10dp" />
-
-		<org.linphone.ui.AddressText
-			android:id="@+id/address"
-			android:background="@color/colorF"
-			android:textColorHint="@color/colorE"
-			style="@style/font5"
-			android:ellipsize="start"
-			android:inputType="textEmailAddress"
-			android:hint="@string/address_bar_hint"
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:paddingLeft="20dp"
-			android:paddingRight="5dp"
-			android:layout_toLeftOf="@id/erase"
-			android:layout_centerVertical="true"/>
-
-	</RelativeLayout>
-
-	<org.linphone.ui.Numpad
-		android:id="@+id/numpad"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:padding="10dp"
-		android:visibility="gone"
-		android:layout_above="@id/controls"
-		android:layout_below="@id/address_bar"
-		android:layout_centerInParent="true"/>
-
-	<ImageView
-		android:src="@drawable/dialer_background"
-		android:layout_centerHorizontal="true"
-		android:layout_width="100dp"
-		android:layout_height="wrap_content"/>
-    
-    <LinearLayout
-        android:id="@+id/controls"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="60dp">
-
-		<RelativeLayout
-			android:focusable="true"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:adjustViewBounds="true">
-
-			<ImageView
-				android:id="@+id/add_contact"
-				android:src="@drawable/contact_add_button"
-				android:background="@drawable/toolbar_button"
-				android:contentDescription="@string/content_description_add_contact"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:padding="15dp"
-				android:layout_alignParentBottom="true"/>
-
-		</RelativeLayout>
-
-        <org.linphone.ui.CallButton
-			android:id="@+id/call"
-			android:src="@drawable/call_audio_start"
-			android:background="@drawable/call"
-			android:contentDescription="@string/content_description_call"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-			android:padding="12dp"
-            android:layout_weight="0.5"/>
-
-	</LinearLayout>
-
-</RelativeLayout>
diff --git a/res/layout-land/launch_screen.xml b/res/layout-land/launch_screen.xml
deleted file mode 100644
index df3c72964..000000000
--- a/res/layout-land/launch_screen.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:background="@color/colorC"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:gravity="center"
-		android:layout_marginBottom="20dp"
-		android:orientation="vertical">
-
-		<ImageView
-			android:src="@drawable/splashscreen"
-			android:layout_width="100dp"
-			android:layout_height="100dp"
-			android:layout_gravity="center_horizontal"/>
-
-		<TextView
-			android:text="@string/app_name"
-			style="@style/font21"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="5dp"
-			android:layout_gravity="center"/>
-
-		<TextView
-			android:text="@string/app_description"
-			android:textSize="28sp"
-			android:textColor="@color/colorA"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center"/>
-
-	</LinearLayout>
-
-    <ProgressBar
-        android:layout_height="wrap_content" 
-        android:layout_width="wrap_content"
-		android:layout_marginBottom="20dp"
-        android:layout_gravity="center_horizontal|bottom" />
-
-	<View
-		android:background="@color/colorA"
-		android:layout_height="10dp"
-		android:layout_width="100dp"
-		android:layout_gravity="center_horizontal|bottom" />
-
-</FrameLayout>
diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
index a7b0ed390..88d6d7d6f 100644
--- a/res/layout-land/main.xml
+++ b/res/layout-land/main.xml
@@ -42,7 +42,6 @@
 				<ImageView
 					android:id="@+id/cancel"
 					android:src="@drawable/dialer_back"
-					android:contentDescription="@string/content_description_dialer_back"
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
 					android:padding="15dp"
@@ -89,7 +88,6 @@
 					<ImageView
 						android:id="@+id/history_image"
 						android:layout_width="match_parent"
-						android:contentDescription="@string/content_description_history"
 						android:layout_height="match_parent"
 						android:padding="18dp"
 						android:layout_centerInParent="true"
@@ -99,14 +97,14 @@
 					<TextView
 						android:id="@+id/missed_calls"
 						style="@style/font7"
-						android:layout_width="20dp"
-						android:layout_height="20dp"
-						android:gravity="center"
+						android:layout_width="25dp"
+						android:layout_height="25dp"
+						android:layout_margin="12dp"
+						android:background="@drawable/history_chat_indicator"
 						android:visibility="gone"
-						android:layout_marginTop="15dp"
-						android:layout_marginRight="5dp"
-						android:layout_alignParentRight="true"
-						android:layout_alignParentEnd="true"/>
+						android:gravity="center"
+						android:layout_alignParentBottom="true"
+						android:layout_alignParentRight="true"/>
 
 				</RelativeLayout>
 
@@ -121,24 +119,7 @@
 					android:padding="18dp"
 					android:layout_centerInParent="true" />
 
-					<ImageView
-						android:src="@drawable/footer_contacts"
-						android:contentDescription="@string/content_description_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
+				<ImageView
 					android:id="@+id/dialer"
 					android:src="@drawable/footer_dialer"
 					android:background="@drawable/footer_button"
@@ -149,23 +130,6 @@
 					android:padding="18dp"
 					android:layout_centerInParent="true"/>
 
-					<ImageView
-						android:src="@drawable/footer_dialer"
-						android:contentDescription="@string/content_description_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"
@@ -176,7 +140,6 @@
 					<ImageView
 						android:id="@+id/chat_image"
 						android:src="@drawable/footer_chat"
-						android:contentDescription="@string/content_description_chat_button"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:padding="18dp"
@@ -185,14 +148,14 @@
 					<TextView
 						android:id="@+id/missed_chats"
 						style="@style/font7"
-						android:layout_width="20dp"
-						android:layout_height="20dp"
-						android:gravity="center"
+						android:layout_width="25dp"
+						android:layout_height="25dp"
+						android:layout_margin="12dp"
+						android:background="@drawable/history_chat_indicator"
 						android:visibility="gone"
-						android:layout_marginTop="15dp"
-						android:layout_marginRight="5dp"
-						android:layout_alignParentRight="true"
-						android:layout_alignParentEnd="true"/>
+						android:gravity="center"
+						android:layout_alignParentBottom="true"
+						android:layout_alignParentRight="true"/>
 
 				</RelativeLayout>
 			</LinearLayout>
@@ -223,7 +186,7 @@
 
 			<ListView
 				android:id="@+id/accounts_list"
-				android:background="@color/colorB"
+				android:background="@color/colorG"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:choiceMode="singleChoice"
@@ -233,12 +196,12 @@
 
 			<ListView
 				android:id="@+id/item_list"
-				android:background="@color/colorH"
+				android:background="@color/colorG"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
 				android:choiceMode="singleChoice"
 				android:divider="@color/colorE"
-				android:listSelector="@color/colorH"
+				android:listSelector="@color/colorG"
 				android:dividerHeight="1dp"/>
 		</LinearLayout>
 
@@ -269,44 +232,9 @@
 				android:layout_toRightOf="@id/quit_button"
 				android:gravity="center_vertical"
 				android:layout_centerInParent="true"/>
+
 		</RelativeLayout>
 
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:background="@color/colorH"
-			android:layout_above="@id/side_menu_quit"
-			android:orientation="vertical">
-
-			<include layout="@layout/side_menu_main_account"/>
-
-			<ListView
-				android:id="@+id/accounts_list"
-				android:background="@color/colorH"
-				android:layout_width="match_parent"
-				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="wrap_content"
-				android:choiceMode="singleChoice"
-				android:divider="@color/colorE"
-				android:listSelector="@color/colorH"
-				android:footerDividersEnabled="true"
-				android:dividerHeight="1dp"/>
-
-			<View
-				android:layout_width="match_parent"
-				android:layout_height="1dp"
-				android:background="@color/colorE"/>
-
-		</LinearLayout>
 	</RelativeLayout>
 
 </android.support.v4.widget.DrawerLayout>
diff --git a/res/layout-land/search_contact_cell.xml b/res/layout-land/search_contact_cell.xml
deleted file mode 100644
index 173941114..000000000
--- a/res/layout-land/search_contact_cell.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-	android:background="@drawable/list_selector"
-    android:layout_width="match_parent"
-    android:layout_height="40dp"
-	android:padding="5dp"
-    android:gravity="center_vertical"
-    android:orientation="horizontal" >
-
-	<TextView
-		android:id="@+id/contact_name"
-		style="@style/font6"
-		android:lines="1"
-		android:layout_weight="1"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content" />
-
-	<TextView
-		android:id="@+id/contact_address"
-		style="@style/font2"
-		android:lines="1"
-		android:layout_weight="1"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"/>
-</LinearLayout>
diff --git a/res/layout-land/video_no_opengl.xml b/res/layout-land/video_no_opengl.xml
deleted file mode 100644
index 7e71989de..000000000
--- a/res/layout-land/video_no_opengl.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/video_frame"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    
-    <SurfaceView
-        android:visibility="visible" 
-        android:layout_height="match_parent" 
-        android:layout_width="match_parent" 
-        android:id="@+id/videoSurface" />
-	
-	<SurfaceView
-	    android:id="@+id/videoCaptureSurface"
-	    android:layout_width="145dp"
-	    android:layout_height="120dp"
-	    android:layout_alignParentBottom="true"
-	    android:layout_alignParentRight="true" />
-
-</RelativeLayout>
diff --git a/res/layout-sw533dp-land/assistant_account_creation.xml b/res/layout-sw533dp-land/assistant_account_creation.xml
index 43e475558..38415e4e4 100644
--- a/res/layout-sw533dp-land/assistant_account_creation.xml
+++ b/res/layout-sw533dp-land/assistant_account_creation.xml
@@ -56,7 +56,6 @@
 					android:background="@drawable/resizable_textfield"
 					android:textColor="@color/colorB"
 					android:inputType="text|textEmailAddress"
-					android:contentDescription="@string/content_description_username_field"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
 					android:singleLine="true"/>
@@ -133,7 +132,6 @@
 					android:background="@drawable/resizable_textfield"
 					android:textColor="@color/colorB"
 					android:inputType="textPassword"
-					android:contentDescription="@string/content_description_confirm_password_field"
 					android:textCursorDrawable="@null"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
@@ -171,7 +169,6 @@
 					android:background="@drawable/resizable_textfield"
 					android:textColor="@color/colorB"
 					android:inputType="text|textEmailAddress"
-					android:contentDescription="@string/content_description_email_field"
 					android:textCursorDrawable="@null"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
diff --git a/res/layout-sw533dp-land/assistant_linphone_login.xml b/res/layout-sw533dp-land/assistant_linphone_login.xml
index 54239505d..ba91408ed 100644
--- a/res/layout-sw533dp-land/assistant_linphone_login.xml
+++ b/res/layout-sw533dp-land/assistant_linphone_login.xml
@@ -50,7 +50,6 @@
 					android:background="@drawable/resizable_textfield"
 					android:textColor="@color/colorB"
 					android:inputType="text|textEmailAddress"
-					android:contentDescription="@string/content_description_username_field"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
 					android:singleLine="true"/>
@@ -104,7 +103,6 @@
 					android:background="@drawable/resizable_textfield"
 					android:textColor="@color/colorB"
 					android:inputType="textEmailAddress"
-					android:contentDescription="@string/content_description_display_field"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
 					android:singleLine="true"/>
diff --git a/res/layout-sw533dp-land/assistant_login.xml b/res/layout-sw533dp-land/assistant_login.xml
index 0d02af245..0f36ca6cb 100644
--- a/res/layout-sw533dp-land/assistant_login.xml
+++ b/res/layout-sw533dp-land/assistant_login.xml
@@ -54,7 +54,6 @@
 						android:background="@drawable/resizable_textfield"
 						android:textColor="@color/colorB"
 						android:inputType="text|textEmailAddress"
-						android:contentDescription="@string/content_description_username_field"
 						android:layout_width="match_parent"
 						android:layout_height="40dp"
 						android:singleLine="true"/>
@@ -108,7 +107,6 @@
 						android:background="@drawable/resizable_textfield"
 						android:textColor="@color/colorB"
 						android:inputType="textEmailAddress"
-						android:contentDescription="@string/content_description_display_field"
 						android:layout_width="match_parent"
 						android:layout_height="40dp"
 						android:singleLine="true"/>
@@ -133,7 +131,6 @@
 						android:background="@drawable/resizable_textfield"
 						android:textColor="@color/colorB"
 						android:inputType="textEmailAddress"
-						android:contentDescription="@string/content_description_domain_field"
 						android:layout_width="match_parent"
 						android:layout_height="40dp"
 						android:singleLine="true"/>
diff --git a/res/layout-sw533dp-land/call.xml b/res/layout-sw533dp-land/call.xml
index 378f29885..c9994dafb 100644
--- a/res/layout-sw533dp-land/call.xml
+++ b/res/layout-sw533dp-land/call.xml
@@ -185,36 +185,17 @@
 
                     </LinearLayout>
 
-					<ImageView
-						android:id="@+id/dialer"
-						android:src="@drawable/footer_dialer"
-						android:background="@color/colorC"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						android:padding="15dp"
-						android:contentDescription="@string/content_description_numpad"/>
 
-					<ImageView
-						android:id="@+id/hang_up"
-						android:src="@drawable/call_hangup"
-						android:background="@drawable/hangup"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="0.5"
-						android:padding="12dp"
-						android:contentDescription="@string/content_description_hang_up"/>
+                </RelativeLayout>
+			</FrameLayout>
 
-					<ImageView
-						android:id="@+id/chat"
-						android:src="@drawable/footer_chat"
-						android:background="@color/colorC"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						android:padding="15dp"
-						android:contentDescription="@string/content_description_chat_button"/>
-				</LinearLayout>
+            <LinearLayout
+                android:id="@+id/call_bar"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:layout_alignParentBottom="true"
+                android:layout_gravity="center"
+                android:orientation="horizontal" >
 
                 <LinearLayout
                     android:id="@+id/main_bar"
@@ -250,14 +231,7 @@
                         android:layout_weight="0.2"
                         android:padding="12dp"/>
 
-						<ImageView
-							android:id="@+id/video"
-							android:src="@drawable/camera_default"
-							android:background="@drawable/button_background"
-							android:padding="20dp"
-							android:layout_width="match_parent"
-							android:layout_height="match_parent"
-							android:contentDescription="@string/content_description_switch_video"/>
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/menu"
@@ -272,46 +246,30 @@
                         android:layout_height="60dp"
                         android:orientation="horizontal">
 
-					<ImageView
-						android:id="@+id/micro"
-						android:src="@drawable/micro_default"
-						android:background="@drawable/button_background"
-						android:padding="10dp"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						android:contentDescription="@string/content_description_toggle_micro"/>
+                        <RelativeLayout
+                            android:background="@drawable/button_background"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
 
-					<ImageView
-						android:id="@+id/speaker"
-						android:src="@drawable/speaker_default"
-						android:background="@drawable/button_background"
-						android:padding="15dp"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:layout_weight="1"
-						android:contentDescription="@string/content_description_toggle_speaker"/>
+                            <ImageView
+                                android:id="@+id/video"
+                                android:src="@drawable/camera_default"
+                                android:background="@drawable/button_background"
+                                android:padding="20dp"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"/>
 
-					<ImageView
-						android:id="@+id/audio_route"
-						android:src="@drawable/routes_default"
-						android:background="@drawable/button_background"
-						android:visibility="gone"
-						android:padding="15dp"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:layout_weight="1"
-						android:contentDescription="@string/content_description_audio_route"/>
+                            <ProgressBar
+                                android:id="@+id/video_in_progress"
+                                style="?android:attr/progressBarStyle"
+                                android:layout_centerHorizontal="true"
+                                android:layout_centerVertical="true"
+                                android:visibility="gone"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"/>
 
-					<ImageView
-						android:id="@+id/options"
-						android:src="@drawable/options_default"
-						android:background="@drawable/button_background"
-						android:padding="15dp"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						android:contentDescription="@string/content_description_call_options"/>
+                        </RelativeLayout>
 
                         <ImageView
                             android:id="@+id/micro"
@@ -331,14 +289,15 @@
                             android:layout_height="match_parent"
                             android:layout_weight="1" />
 
-			<LinearLayout
-				android:id="@+id/menu_bottom"
-				android:layout_width="match_parent"
-				android:layout_height="60dp"
-				android:layout_above="@id/menu"
-				android:orientation="horizontal"
-				android:layout_alignParentLeft="true"
-				android:layout_alignParentStart="true">
+                        <ImageView
+                            android:id="@+id/audio_route"
+                            android:src="@drawable/routes"
+                            android:background="@drawable/button_background"
+                            android:visibility="gone"
+                            android:padding="20dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1" />
 
                         <ImageView
                             android:id="@+id/options"
@@ -353,27 +312,18 @@
                 </LinearLayout>
             </LinearLayout>
 
-				<ImageView
-					android:id="@+id/route_bluetooth"
-					android:src="@drawable/route_bluetooth"
-					android:background="@drawable/button_background"
-					android:padding="15dp"
-					android:visibility="invisible"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.4"
-					android:contentDescription="@string/content_description_bluetooth"/>
+                <LinearLayout
+                    android:id="@+id/menu_bottom"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:layout_above="@id/call_bar"
+                    android:orientation="horizontal" >
 
-				<ImageView
-					android:id="@+id/add_call"
-					android:src="@drawable/options_add_call"
-					android:background="@drawable/button_background"
-					android:padding="15dp"
-					android:visibility="invisible"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.4"
-					android:contentDescription="@string/content_description_add_call"/>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="invisible"
+                        android:layout_weight="0.2"/>
 
                     <ImageView
                         android:id="@+id/route_bluetooth"
@@ -404,27 +354,21 @@
                     android:layout_above="@id/menu_bottom"
                     android:orientation="horizontal" >
 
-				<ImageView
-					android:id="@+id/route_earpiece"
-					android:src="@drawable/route_earpiece"
-					android:background="@drawable/button_background"
-					android:padding="15dp"
-					android:visibility="invisible"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.4"
-					android:contentDescription="@string/content_description_earpiece"/>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="invisible"
+                        android:layout_weight="0.2"/>
 
-				<ImageView
-					android:id="@+id/transfer"
-					android:src="@drawable/options_transfer_call"
-					android:background="@drawable/button_background"
-					android:padding="15dp"
-					android:visibility="invisible"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.4"
-					android:contentDescription="@string/content_description_transfer"/>
+                    <ImageView
+                        android:id="@+id/route_earpiece"
+                        android:src="@drawable/route_earpiece"
+                        android:background="@drawable/button_call_background"
+                        android:padding="15dp"
+                        android:visibility="invisible"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.22" />
 
                     <ImageView
                         android:id="@+id/transfer"
@@ -450,27 +394,26 @@
                         android:visibility="invisible"
                         android:layout_weight="0.2"/>
 
-				<ImageView
-					android:id="@+id/route_speaker"
-					android:src="@drawable/route_speaker"
-					android:background="@drawable/button_background"
-					android:visibility="invisible"
-					android:padding="15dp"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.4"
-					android:contentDescription="@string/content_description_toggle_speaker"/>
+                    <ImageView
+                        android:id="@+id/route_speaker"
+                        android:src="@drawable/route_speaker"
+                        android:background="@drawable/button_call_background"
+                        android:visibility="invisible"
+                        android:padding="15dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.22" />
 
-				<ImageView
-					android:id="@+id/conference"
-					android:src="@drawable/options_start_conference"
-					android:background="@drawable/button_background"
-					android:visibility="invisible"
-					android:padding="15dp"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.4"
-					android:contentDescription="@string/content_description_conference"/>
+                    <ImageView
+                        android:id="@+id/conference"
+                        android:src="@drawable/options_start_conference"
+                        android:background="@drawable/button_call_background"
+                        android:visibility="invisible"
+                        android:padding="15dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.22" />
+                </LinearLayout>
 
 			<org.linphone.ui.Numpad
 				android:id="@+id/numpad"
diff --git a/res/layout-sw533dp-land/call_incoming.xml b/res/layout-sw533dp-land/call_incoming.xml
index b6dfda967..674aa02c8 100644
--- a/res/layout-sw533dp-land/call_incoming.xml
+++ b/res/layout-sw533dp-land/call_incoming.xml
@@ -161,6 +161,7 @@
 				android:layout_height="wrap_content"
 				android:alpha="0.2"/>
 
+
 			<ImageView
 				android:src="@drawable/arrow_hangup"
 				android:layout_width="wrap_content"
diff --git a/res/layout-sw533dp-land/chatlist_cell.xml b/res/layout-sw533dp-land/chatlist_cell.xml
index e160c4969..ba8a46342 100644
--- a/res/layout-sw533dp-land/chatlist_cell.xml
+++ b/res/layout-sw533dp-land/chatlist_cell.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="80dp"
+    android:layout_height="60dp"
     android:gravity="center_vertical"
     android:paddingLeft="10dp"
 	android:paddingRight="10dp"
@@ -12,13 +12,13 @@
 		android:id="@+id/delete_chatroom"
 		android:button="@drawable/checkbox"
 		android:contentDescription="@string/content_description_delete"
+		android:paddingRight="5dp"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:adjustViewBounds="true"
 		android:layout_alignParentRight="true"
 		android:layout_centerVertical="true"
-		android:visibility="invisible"
-		android:layout_alignParentTop="true"/>
+		android:visibility="invisible" />
 	
 	<LinearLayout
 	    android:layout_width="match_parent"
@@ -38,15 +38,6 @@
 					android:layout_width="35dp"
 					android:layout_height="35dp"
 					android:adjustViewBounds="true"/>
-			<TextView
-				android:id="@+id/date"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_below="@id/avatar_layout"
-				android:layout_marginTop="5dp"
-				android:singleLine="true"
-				style="@style/font2"/>
-
 		</RelativeLayout>
 
 		<RelativeLayout
@@ -55,13 +46,27 @@
 			android:paddingLeft="10dp">
 
 			<TextView
-				android:id="@+id/sipUri"
-				android:lines="1"
-				android:ellipsize="end"
-				android:singleLine="true"
-				style="@style/font6"
+				android:id="@+id/date"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
+				android:layout_marginTop="5dp"
+				android:singleLine="true"
+				style="@style/font2"/>
+
+			<TextView
+				android:id="@+id/sipUri"
+				android:lines="1"
+				android:ellipsize="marquee"
+				android:marqueeRepeatLimit="marquee_forever"
+				android:scrollHorizontally="true"
+				android:fadingEdge="horizontal"
+				android:singleLine="true"
+				style="@style/font2"
+				android:paddingLeft="10dp"
+				android:layout_marginTop="5dp"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_toRightOf="@id/date"
 				android:layout_marginRight="30dp"/>
 
 			<TextView
@@ -69,8 +74,7 @@
 				android:layout_width="20dp"
 				android:layout_height="20dp"
 				android:background="@drawable/chat_list_indicator"
-				android:contentDescription="@string/content_description_unread_chat_message"
-				style="@style/font18"
+				style="@style/font7"
 				android:gravity="center"
 				android:singleLine="true"
 				android:layout_alignParentRight="true"
@@ -84,7 +88,6 @@
 				android:layout_below="@id/sipUri"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_marginRight="30dp"
 				style="@style/font11"/>
 
 		</RelativeLayout>
diff --git a/res/layout-sw533dp-land/dialer.xml b/res/layout-sw533dp-land/dialer.xml
index 6119d4ff8..612971258 100644
--- a/res/layout-sw533dp-land/dialer.xml
+++ b/res/layout-sw533dp-land/dialer.xml
@@ -24,7 +24,6 @@
 			<org.linphone.ui.EraseButton
 				android:id="@+id/erase"
 				android:src="@drawable/backspace"
-				android:contentDescription="@string/content_description_backspace"
 				android:layout_width="40dp"
 				android:layout_height="wrap_content"
 				android:layout_alignParentRight="true"
@@ -70,23 +69,12 @@
 				android:background="@drawable/button_back_background"
 				android:layout_width="102dp"
 				android:layout_height="wrap_content"
-				android:layout_weight="1"
-				android:adjustViewBounds="true">
-
-				<ImageView
-					android:id="@+id/add_contact"
-					android:src="@drawable/contact_add_button"
-					android:contentDescription="@string/content_description_add_contact"
-					android:background="@drawable/toolbar_button"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:padding="15dp"
-					android:layout_alignParentBottom="true"/>
+				android:padding="20dp"
+				android:visibility="gone"/>
 
 			<org.linphone.ui.CallButton
 				android:id="@+id/call"
 				android:src="@drawable/call_audio_start"
-				android:contentDescription="@string/content_description_call"
 				android:background="@drawable/call"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
diff --git a/res/layout-sw533dp-land/main.xml b/res/layout-sw533dp-land/main.xml
index db07249d2..54375b5a6 100644
--- a/res/layout-sw533dp-land/main.xml
+++ b/res/layout-sw533dp-land/main.xml
@@ -42,7 +42,6 @@
 				<ImageView
 					android:id="@+id/cancel"
 					android:src="@drawable/dialer_back"
-					android:contentDescription="@string/content_description_dialer_back"
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
 					android:padding="15dp"
@@ -72,7 +71,7 @@
 							android:id="@+id/fragmentContainer"
 							android:layout_width="match_parent"
 							android:layout_height="match_parent"
-							android:layout_weight="1"
+							android:layout_weight="0.63"
 							android:orientation="horizontal" />
 
 						<LinearLayout
@@ -80,7 +79,7 @@
 							android:visibility="gone"
 							android:layout_width="match_parent"
 							android:layout_height="match_parent"
-							android:layout_weight="1"
+							android:layout_weight="0.37"
 							android:orientation="horizontal">
 
 							<View
@@ -111,7 +110,6 @@
 					<ImageView
 						android:id="@+id/history_image"
 						android:src="@drawable/footer_history"
-						android:contentDescription="@string/content_description_history"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:padding="15dp"
@@ -121,14 +119,13 @@
 						android:id="@+id/missed_calls"
 						android:background="@drawable/history_chat_indicator"
 						style="@style/font7"
-						android:layout_width="20dp"
-						android:layout_height="20dp"
-						android:gravity="center"
-						android:layout_marginRight="5dp"
+						android:layout_width="25dp"
+						android:layout_height="25dp"
 						android:visibility="gone"
-						android:layout_centerVertical="true"
-						android:layout_alignParentRight="true"
-						android:layout_alignParentEnd="true"/>
+						android:layout_marginBottom="10dp"
+						android:layout_alignBottom="@+id/history_image"
+						android:gravity="center"
+						android:layout_alignParentRight="true"/>
 
 				</RelativeLayout>
 
@@ -142,39 +139,16 @@
 					android:padding="15dp"
 					android:layout_centerInParent="true" />
 
-					<ImageView
-						android:src="@drawable/footer_contacts"
-						android:contentDescription="@string/content_description_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
+				<ImageView
 					android:id="@+id/dialer"
 					android:src="@drawable/footer_dialer"
 					android:background="@drawable/footer_button"
 					android:contentDescription="@string/content_description_dialer"
 					android:layout_weight="1"
 					android:layout_width="60dp"
-					android:layout_height="0dp">
-
-					<ImageView
-						android:src="@drawable/footer_dialer"
-						android:contentDescription="@string/content_description_dialer"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
+					android:layout_height="0dp"
+					android:padding="15dp"
+					android:layout_centerInParent="true"/>
 
 				<RelativeLayout
 					android:id="@+id/chat"
@@ -186,7 +160,6 @@
 					<ImageView
 						android:id="@+id/chat_image"
 						android:src="@drawable/footer_chat"
-						android:contentDescription="@string/content_description_chat_button"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:padding="15dp"
@@ -196,12 +169,12 @@
 						android:id="@+id/missed_chats"
 						android:background="@drawable/history_chat_indicator"
 						style="@style/font7"
-						android:layout_width="20dp"
-						android:layout_height="20dp"
-						android:gravity="center"
-						android:layout_marginRight="5dp"
+						android:layout_width="25dp"
+						android:layout_height="25dp"
 						android:visibility="gone"
-						android:layout_centerVertical="true"
+						android:layout_alignBottom="@+id/chat_image"
+						android:layout_marginBottom="10dp"
+						android:gravity="center"
 						android:layout_alignParentRight="true"
 						android:layout_alignParentEnd="true"/>
 
diff --git a/res/layout-sw533dp-land/video_no_opengl.xml b/res/layout-sw533dp-land/video_no_opengl.xml
deleted file mode 100644
index 4a20a7911..000000000
--- a/res/layout-sw533dp-land/video_no_opengl.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/video_frame"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    
-    <SurfaceView
-        android:visibility="visible" 
-        android:layout_height="match_parent" 
-        android:layout_width="match_parent" 
-        android:id="@+id/videoSurface" />
-	
-	<SurfaceView
-	    android:id="@+id/videoCaptureSurface"
-	    android:layout_width="218dp"
-	    android:layout_height="160dp"
-	    android:layout_alignParentBottom="true"
-	    android:layout_alignParentRight="true" />
-
-</RelativeLayout>
diff --git a/res/layout-sw533dp/chatlist_cell.xml b/res/layout-sw533dp/chatlist_cell.xml
deleted file mode 100644
index d92015b53..000000000
--- a/res/layout-sw533dp/chatlist_cell.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="100dp"
-    android:gravity="center_vertical"
-    android:paddingLeft="10dp"
-	android:paddingRight="10dp"
-	android:paddingTop="5dp"
-    android:background="@drawable/list_selector">
-
-	<CheckBox
-		android:id="@+id/delete_chatroom"
-		android:button="@drawable/checkbox"
-		android:contentDescription="@string/content_description_delete"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:adjustViewBounds="true"
-		android:layout_alignParentRight="true"
-		android:layout_centerVertical="true"
-		android:visibility="invisible"
-		android:layout_alignParentTop="true"/>
-	
-	<LinearLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
-	    android:layout_centerVertical="true"
-	    android:orientation="horizontal">
-
-		<RelativeLayout
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:gravity="center">
-
-			<RelativeLayout
-				android:id="@+id/avatar_layout"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_centerHorizontal="true">
-
-				<ImageView
-					android:id="@+id/contact_picture"
-					android:src="@drawable/avatar"
-					android:contentDescription="@string/content_description_contact_picture"
-					android:layout_width="35dp"
-					android:layout_height="35dp"
-					android:adjustViewBounds="true"/>
-
-				<ImageView
-					android:id="@+id/mask"
-					android:src="@drawable/avatar_mask"
-					android:layout_width="35dp"
-					android:layout_height="35dp"
-					android:adjustViewBounds="true"/>
-
-			</RelativeLayout>
-
-			<TextView
-				android:id="@+id/date"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_below="@id/avatar_layout"
-				android:layout_marginTop="5dp"
-				android:singleLine="true"
-				style="@style/font2"/>
-
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:paddingLeft="10dp">
-
-			<TextView
-				android:id="@+id/sipUri"
-				android:lines="1"
-				android:ellipsize="end"
-				android:fadingEdge="horizontal"
-				android:singleLine="true"
-				style="@style/font6"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginRight="30dp"/>
-
-			<TextView
-				android:id="@+id/unreadMessages"
-				android:layout_width="20dp"
-				android:layout_height="20dp"
-				android:background="@drawable/chat_list_indicator"
-				android:contentDescription="@string/content_description_unread_chat_message"
-				style="@style/font18"
-				android:gravity="center"
-				android:singleLine="true"
-				android:layout_above="@+id/lastMessage"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentEnd="true"/>
-
-			<TextView
-				android:id="@+id/lastMessage"
-				android:maxLines="3"
-				android:ellipsize="end"
-				android:layout_below="@id/sipUri"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginRight="30dp"
-				style="@style/font11"/>
-
-		</RelativeLayout>
-	    
-	</LinearLayout>
-    
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp/dialer.xml b/res/layout-sw533dp/dialer.xml
index 72bde7272..d4cf2d8a4 100644
--- a/res/layout-sw533dp/dialer.xml
+++ b/res/layout-sw533dp/dialer.xml
@@ -24,7 +24,6 @@
 			<org.linphone.ui.EraseButton
 				android:id="@+id/erase"
 				android:src="@drawable/backspace"
-				android:contentDescription="@string/content_description_backspace"
 				android:layout_width="40dp"
 				android:layout_height="wrap_content"
 				android:layout_alignParentRight="true"
@@ -73,23 +72,10 @@
 				android:padding="20dp"
 				android:visibility="gone"/>
 
-				<ImageView
-					android:id="@+id/add_contact"
-					android:src="@drawable/contact_add_button"
-					android:background="@drawable/toolbar_button"
-					android:contentDescription="@string/content_description_add_contact"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:padding="15dp"
-					android:layout_alignParentBottom="true"/>
-
-			</RelativeLayout>
-
 			<org.linphone.ui.CallButton
 				android:id="@+id/call"
 				android:src="@drawable/call_audio_start"
 				android:background="@drawable/call"
-				android:contentDescription="@string/content_description_call"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:padding="12dp"
diff --git a/res/layout-sw533dp/main.xml b/res/layout-sw533dp/main.xml
index 33f0b31aa..bbec2e26d 100644
--- a/res/layout-sw533dp/main.xml
+++ b/res/layout-sw533dp/main.xml
@@ -42,7 +42,6 @@
 				<ImageView
 					android:id="@+id/cancel"
 					android:src="@drawable/dialer_back"
-					android:contentDescription="@string/content_description_dialer_back"
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
 					android:padding="15dp"
@@ -89,6 +88,7 @@
 								android:layout_height="match_parent"/>
 
 						</LinearLayout>
+
 					</LinearLayout>
 				</FrameLayout>
 
@@ -109,9 +109,7 @@
 					android:layout_height="match_parent">
 
 					<ImageView
-						android:id="@+id/footer_history"
-						android:src="@drawable/footer_history"
-						android:contentDescription="@string/content_description_history"
+						android:id="@+id/history_image"
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
 						android:padding="18dp"
@@ -126,14 +124,10 @@
 						android:layout_height="25dp"
 						android:layout_margin="12dp"
 						android:background="@drawable/history_chat_indicator"
-						style="@style/font18"
-						android:layout_width="20dp"
-						android:layout_height="20dp"
+						android:visibility="gone"
 						android:gravity="center"
-						android:layout_margin="20dp"
-						android:layout_alignParentTop="true"
-						android:layout_alignParentRight="true"
-						android:visibility="visible"/>
+						android:layout_alignParentBottom="true"
+						android:layout_alignParentRight="true"/>
 
 				</RelativeLayout>
 
@@ -148,39 +142,16 @@
 					android:padding="18dp"
 					android:layout_centerInParent="true" />
 
-					<ImageView
-						android:src="@drawable/footer_contacts"
-						android:contentDescription="@string/content_description_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="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"
-						android:visibility="gone"/>
-				</RelativeLayout>
-
-				<RelativeLayout
+				<ImageView
 					android:id="@+id/dialer"
 					android:src="@drawable/footer_dialer"
 					android:background="@drawable/footer_button"
 					android:contentDescription="@string/content_description_dialer"
 					android:layout_weight="1"
 					android:layout_width="0dp"
-					android:layout_height="match_parent">
-
-					<ImageView
-						android:src="@drawable/footer_dialer"
-						android:contentDescription="@string/content_description_dialer"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
+					android:layout_height="match_parent"
+					android:padding="18dp"
+					android:layout_centerInParent="true"/>
 
 				<RelativeLayout
 					android:id="@+id/chat"
@@ -192,7 +163,6 @@
 					<ImageView
 						android:id="@+id/chat_image"
 						android:src="@drawable/footer_chat"
-						android:contentDescription="@string/content_description_chat"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:padding="18dp"
@@ -205,14 +175,10 @@
 						android:layout_height="25dp"
 						android:layout_margin="12dp"
 						android:background="@drawable/history_chat_indicator"
-						style="@style/font18"
-						android:layout_width="20dp"
-						android:layout_height="20dp"
-						android:layout_margin="20dp"
+						android:visibility="gone"
 						android:gravity="center"
-						android:layout_alignParentTop="true"
-						android:layout_alignParentRight="true"
-						android:visibility="gone"/>
+						android:layout_alignParentBottom="true"
+						android:layout_alignParentRight="true"/>
 
 				</RelativeLayout>
 			</LinearLayout>
diff --git a/res/layout-sw720dp-land/video_no_opengl.xml b/res/layout-sw720dp-land/video_no_opengl.xml
deleted file mode 100644
index 42131ad95..000000000
--- a/res/layout-sw720dp-land/video_no_opengl.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/video_frame"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    
-    <SurfaceView
-        android:visibility="visible" 
-        android:layout_height="match_parent" 
-        android:layout_width="match_parent" 
-        android:id="@+id/videoSurface" />
-	
-	<SurfaceView
-	    android:id="@+id/videoCaptureSurface"
-	    android:layout_width="290dp"
-	    android:layout_height="240dp"
-	    android:layout_alignParentBottom="true"
-	    android:layout_alignParentRight="true" />
-
-</RelativeLayout>
diff --git a/res/layout/about.xml b/res/layout/about.xml
index b2d8c4e6d..abb66b800 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -31,7 +31,7 @@
         <ImageView
             android:id="@+id/cancel"
             android:src="@drawable/footer_dialer"
-            android:contentDescription="@string/content_description_dialer_back"
+            android:contentDescription="@string/content_description_edit"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.2"
diff --git a/res/layout/assistant_account_creation.xml b/res/layout/assistant_account_creation.xml
index 584fed935..ff5121c61 100644
--- a/res/layout/assistant_account_creation.xml
+++ b/res/layout/assistant_account_creation.xml
@@ -49,7 +49,6 @@
 					android:id="@+id/username"
 					android:background="@drawable/resizable_textfield"
 					android:textColor="@color/colorB"
-					android:contentDescription="@string/content_description_username_field"
 					android:inputType="text|textEmailAddress"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
@@ -118,7 +117,6 @@
 					android:background="@drawable/resizable_textfield"
 					android:textColor="@color/colorB"
 					android:inputType="textPassword"
-					android:contentDescription="@string/content_description_confirm_password_field"
 					android:textCursorDrawable="@null"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
@@ -154,7 +152,6 @@
 					android:background="@drawable/resizable_textfield"
 					android:textColor="@color/colorB"
 					android:inputType="text|textEmailAddress"
-					android:contentDescription="@string/content_description_email_field"
 					android:textCursorDrawable="@null"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
@@ -178,6 +175,7 @@
 				android:background="@drawable/assistant_button"
 				android:textColor="@drawable/assistant_button_text_color"
 				style="@style/font8"
+				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 f3d795e41..35fd6da7e 100644
--- a/res/layout/assistant_account_creation_activation.xml
+++ b/res/layout/assistant_account_creation_activation.xml
@@ -1,49 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+	android:padding="30dp"
+	android:gravity="center_horizontal"
+    android:orientation="vertical" >
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:padding="30dp"
-		android:gravity="center_horizontal"
-		android:orientation="vertical" >
+	<TextView
+		android:text="@string/assistant_create_account"
+		style="@style/font6"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"/>
 
-		<TextView
-			android:text="@string/assistant_create_account"
-			style="@style/font6"
-			android:textAllCaps="true"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
+	<TextView
+		android:text="@string/assistant_create_account_part_2"
+		style="@style/font11"
+		android:paddingTop="10dp"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"/>
 
-		<TextView
-			android:text="@string/assistant_create_account_part_2"
-			style="@style/font11"
-			android:paddingTop="10dp"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
+	<TextView
+		android:text="@string/assistant_validate_account"
+		style="@style/font11"
+		android:paddingTop="10dp"
+		android:gravity="center"
+		android:layout_gravity="center"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"/>
 
-		<TextView
-			android:text="@string/assistant_validate_account"
-			style="@style/font11"
-			android:paddingTop="10dp"
-			android:gravity="center"
-			android:layout_gravity="center"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
+	<Button
+		android:id="@+id/assistant_check"
+		android:text="@string/assistant_create_account"
+		android:background="@drawable/assistant_button"
+		style="@style/font8"
+		android:contentDescription="@string/content_description_valid"
+		android:layout_width="wrap_content"
+		android:layout_height="40dp"
+		android:layout_margin="10dp"
+		android:paddingLeft="10dp"
+		android:paddingRight="10dp"/>
 
-		<Button
-			android:id="@+id/assistant_check"
-			android:text="@string/assistant_finish"
-			android:background="@drawable/assistant_button"
-			android:textColor="@drawable/assistant_button_text_color"
-			style="@style/font8"
-			android:layout_width="wrap_content"
-			android:layout_height="40dp"
-			android:layout_margin="10dp"
-			android:paddingLeft="10dp"
-			android:paddingRight="10dp"/>
-
-	</LinearLayout>
-</ScrollView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/assistant_linphone_login.xml b/res/layout/assistant_linphone_login.xml
index ddea0130f..7af202cf8 100644
--- a/res/layout/assistant_linphone_login.xml
+++ b/res/layout/assistant_linphone_login.xml
@@ -46,7 +46,6 @@
 				android:background="@drawable/resizable_textfield"
 				android:textColor="@color/colorB"
 				android:inputType="text|textEmailAddress"
-				android:contentDescription="@string/content_description_username_field"
 				android:layout_width="match_parent"
 				android:layout_height="40dp"
 				android:singleLine="true"/>
@@ -81,7 +80,6 @@
 				android:background="@drawable/resizable_textfield"
 				android:textColor="@color/colorB"
 				android:inputType="textEmailAddress"
-				android:contentDescription="@string/content_description_username_field"
 				android:layout_width="match_parent"
 				android:layout_height="40dp"
 				android:singleLine="true"/>
diff --git a/res/layout/assistant_login.xml b/res/layout/assistant_login.xml
index 5ae935206..0cf94cf8f 100644
--- a/res/layout/assistant_login.xml
+++ b/res/layout/assistant_login.xml
@@ -46,7 +46,6 @@
 				android:background="@drawable/resizable_textfield"
 				android:textColor="@color/colorB"
 				android:inputType="text|textEmailAddress"
-				android:contentDescription="@string/content_description_username_field"
 				android:layout_width="match_parent"
 				android:layout_height="40dp"
 				android:singleLine="true"/>
@@ -81,7 +80,6 @@
 				android:background="@drawable/resizable_textfield"
 				android:textColor="@color/colorB"
 				android:inputType="textEmailAddress"
-				android:contentDescription="@string/content_description_domain_field"
 				android:layout_width="match_parent"
 				android:layout_height="40dp"
 				android:singleLine="true"/>
@@ -99,7 +97,6 @@
 				android:background="@drawable/resizable_textfield"
 				android:textColor="@color/colorB"
 				android:inputType="textEmailAddress"
-				android:contentDescription="@string/content_description_display_field"
 				android:layout_width="match_parent"
 				android:layout_height="40dp"
 				android:singleLine="true"/>
diff --git a/res/layout/assistant_remote_provisioning.xml b/res/layout/assistant_remote_provisioning.xml
index 483131e1e..e9e1b601e 100644
--- a/res/layout/assistant_remote_provisioning.xml
+++ b/res/layout/assistant_remote_provisioning.xml
@@ -42,7 +42,6 @@
 			android:background="@drawable/resizable_textfield"
 			android:textColor="@color/colorB"
 			android:inputType="textUri"
-			android:contentDescription="@string/content_description_url_field"
 			android:layout_width="match_parent"
 			android:layout_height="40dp"
 			android:singleLine="true"/>
diff --git a/res/layout/assistant_topbar.xml b/res/layout/assistant_topbar.xml
index 516e741ce..152bf0487 100644
--- a/res/layout/assistant_topbar.xml
+++ b/res/layout/assistant_topbar.xml
@@ -27,10 +27,10 @@
 	<ImageView
 		android:id="@+id/assistant_cancel"
 		android:src="@drawable/dialer_back"
-		android:contentDescription="@string/content_description_dialer_back"
+		android:contentDescription="@string/content_description_dialer"
 		android:layout_width="0dp"
 		android:layout_height="match_parent"
 		android:layout_weight="0.2"
 		android:padding="15dp"/>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/call.xml b/res/layout/call.xml
index 58d6d4b38..a545a09f7 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -70,15 +70,14 @@
 							android:layout_alignParentBottom="true"
 							android:orientation="vertical">
 
-							<TextView
-								android:id="@+id/current_contact_name"
-								style="@style/font5"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:paddingTop="5dp"
-								android:gravity="center"
-								android:layout_alignParentTop="true"
-								android:layout_gravity="center"/>
+                            <TextView
+                                android:id="@+id/current_contact_name"
+                                style="@style/font13"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:paddingTop="5dp"
+                                android:layout_alignParentTop="true"
+                                android:layout_gravity="center"/>
 
                             <Chronometer
                                 android:id="@+id/current_call_timer"
@@ -194,19 +193,25 @@
 					android:layout_weight="0.8"
 					android:padding="15dp" />
 
-					<RelativeLayout
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1">
+				<ImageView
+					android:id="@+id/hang_up"
+					android:src="@drawable/call_hangup"
+					android:background="@drawable/hangup"
+					android:layout_gravity="center"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_weight="0.4"
+					android:padding="12dp"/>
 
-					<ImageView
-						android:id="@+id/video"
-						android:src="@drawable/camera_button"
-						android:background="@drawable/button_background"
-						android:contentDescription="@string/content_description_switch_video"
-						android:padding="20dp"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"/>
+				<ImageView
+					android:id="@+id/chat"
+					android:src="@drawable/chat"
+					android:background="@color/colorC"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_weight="0.8"
+					android:padding="15dp"/>
+			</LinearLayout>
 
 			<LinearLayout
                 android:id="@+id/menu"
@@ -221,47 +226,30 @@
                     android:layout_height="60dp"
                     android:orientation="horizontal">
 
-					<ImageView
-						android:id="@+id/micro"
-						android:src="@drawable/micro_default"
-						android:background="@drawable/button_background"
-						android:contentDescription="@string/content_description_toggle_micro"
-						android:padding="10dp"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1" />
+                    <RelativeLayout
+                        android:background="@drawable/button_background"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1">
 
-					<ImageView
-						android:id="@+id/speaker"
-						android:src="@drawable/speaker_default"
-						android:background="@drawable/button_background"
-						android:contentDescription="@string/content_description_toggle_speaker"
-						android:padding="15dp"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:layout_weight="1" />
+                        <ImageView
+                            android:id="@+id/video"
+                            android:src="@drawable/camera_default"
+                            android:background="@drawable/button_background"
+                            android:padding="20dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"/>
 
-					<ImageView
-						android:id="@+id/audio_route"
-						android:src="@drawable/routes_default"
-						android:background="@drawable/button_background"
-						android:contentDescription="@string/content_description_audio_route"
-						android:visibility="gone"
-						android:padding="15dp"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:layout_weight="1" />
+                        <ProgressBar
+                            android:id="@+id/video_in_progress"
+                            style="?android:attr/progressBarStyle"
+                            android:layout_centerHorizontal="true"
+                            android:layout_centerVertical="true"
+                            android:visibility="gone"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"/>
 
-					<ImageView
-						android:id="@+id/options"
-						android:src="@drawable/options_default"
-						android:background="@drawable/button_background"
-						android:contentDescription="@string/content_description_call_options"
-						android:padding="15dp"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1" />
-				</LinearLayout>
+                    </RelativeLayout>
 
                 <ImageView
                     android:id="@+id/micro"
@@ -272,37 +260,34 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1" />
 
-					<ImageView
-						android:id="@+id/dialer"
-						android:src="@drawable/footer_dialer"
-						android:background="@color/colorC"
-						android:contentDescription="@string/content_description_numpad"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="0.8"
-						android:padding="15dp" />
+                <ImageView
+                    android:id="@+id/speaker"
+                    android:src="@drawable/speaker_default"
+                    android:background="@drawable/button_background"
+                    android:padding="15dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1" />
 
-					<ImageView
-						android:id="@+id/hang_up"
-						android:src="@drawable/call_hangup"
-						android:background="@drawable/hangup"
-						android:contentDescription="@string/content_description_hang_up"
-						android:layout_gravity="center"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="0.4"
-						android:padding="12dp"/>
+                <ImageView
+                    android:id="@+id/audio_route"
+                    android:src="@drawable/routes"
+                    android:background="@drawable/button_background"
+                    android:visibility="gone"
+                    android:padding="20dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1" />
 
-					<ImageView
-						android:id="@+id/chat"
-						android:src="@drawable/footer_chat"
-						android:background="@color/colorC"
-						android:contentDescription="@string/content_description_chat_button"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="0.8"
-						android:padding="15dp"/>
-				</LinearLayout>
+                <ImageView
+                    android:id="@+id/options"
+                    android:src="@drawable/options_default"
+                    android:background="@drawable/button_background"
+                    android:padding="15dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
+            </LinearLayout>
 
         </LinearLayout>
 
@@ -325,27 +310,25 @@
                     android:visibility="invisible"
                     android:layout_weight="0.5"/>
 
-				<ImageView
-					android:id="@+id/route_bluetooth"
-					android:src="@drawable/route_bluetooth"
-					android:background="@drawable/button_background"
-					android:contentDescription="@string/content_description_bluetooth"
-					android:padding="15dp"
-					android:visibility="invisible"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="0.5" />
+                <ImageView
+                    android:id="@+id/route_bluetooth"
+                    android:src="@drawable/route_bluetooth"
+                    android:background="@drawable/button_call_background"
+                    android:padding="15dp"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5" />
 
-				<ImageView
-					android:id="@+id/add_call"
-					android:src="@drawable/options_add_call_button"
-					android:background="@drawable/button_background"
-					android:contentDescription="@string/content_description_add_call"
-					android:padding="15dp"
-					android:visibility="invisible"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="0.5" />
+                <ImageView
+                    android:id="@+id/add_call"
+                    android:src="@drawable/options_add_call"
+                    android:background="@drawable/button_call_background"
+                    android:padding="15dp"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5" />
 
             </LinearLayout>
 
@@ -368,27 +351,25 @@
                     android:visibility="invisible"
                     android:layout_weight="0.5"/>
 
-				<ImageView
-					android:id="@+id/route_earpiece"
-					android:src="@drawable/route_earpiece"
-					android:background="@drawable/button_background"
-					android:contentDescription="@string/content_description_earpiece"
-					android:padding="15dp"
-					android:visibility="invisible"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="0.5"/>
+                <ImageView
+                    android:id="@+id/route_earpiece"
+                    android:src="@drawable/route_earpiece"
+                    android:background="@drawable/button_call_background"
+                    android:padding="15dp"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"/>
 
-				<ImageView
-					android:id="@+id/transfer"
-					android:src="@drawable/options_transfer_call_button"
-					android:background="@drawable/button_background"
-					android:contentDescription="@string/content_description_transfer"
-					android:padding="15dp"
-					android:visibility="invisible"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="0.5"/>
+                <ImageView
+                    android:id="@+id/transfer"
+                    android:src="@drawable/options_transfer_call"
+                    android:background="@drawable/button_call_background"
+                    android:padding="15dp"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"/>
 
             </LinearLayout>
 
@@ -413,8 +394,7 @@
 				<ImageView
 					android:id="@+id/route_speaker"
 					android:src="@drawable/route_speaker"
-					android:background="@drawable/button_background"
-					android:contentDescription="@string/content_description_toggle_speaker"
+					android:background="@drawable/button_call_background"
 					android:visibility="invisible"
 					android:padding="15dp"
 					android:layout_width="match_parent"
@@ -423,9 +403,8 @@
 
 				<ImageView
 					android:id="@+id/conference"
-					android:src="@drawable/options_start_conference_button"
-					android:background="@drawable/button_background"
-					android:contentDescription="@string/content_description_conference"
+					android:src="@drawable/options_start_conference"
+					android:background="@drawable/button_call_background"
 					android:visibility="invisible"
 					android:padding="15dp"
 					android:layout_width="match_parent"
diff --git a/res/layout/call_incoming.xml b/res/layout/call_incoming.xml
index e19a43af4..f732a0493 100644
--- a/res/layout/call_incoming.xml
+++ b/res/layout/call_incoming.xml
@@ -56,28 +56,9 @@
 		android:paddingTop="10dp"
 		android:layout_above="@+id/menu">
 
-		<TextView
-			android:id="@+id/contact_name"
-			style="@style/font5"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentTop="true"
-			android:layout_centerHorizontal="true"
-			android:gravity="center"
-			android:paddingTop="5dp"/>
-
-		<TextView
-			android:id="@+id/contact_number"
-			style="@style/font2"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/contact_name"
-			android:layout_gravity="center"
-			android:layout_centerHorizontal="true"
-			android:paddingBottom="10dp"/>
-
-		<RelativeLayout
-			android:id="@+id/avatar_layout"
+		<LinearLayout
+			android:background="@color/colorG"
+			android:layout_alignParentBottom="true"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:gravity="center_horizontal"
diff --git a/res/layout/call_outgoing.xml b/res/layout/call_outgoing.xml
index 8f71a0647..b9d1e2a6a 100644
--- a/res/layout/call_outgoing.xml
+++ b/res/layout/call_outgoing.xml
@@ -56,28 +56,9 @@
 		android:layout_below="@id/top_bar"
 		android:paddingTop="10dp">
 
-		<TextView
-			android:id="@+id/contact_name"
-			style="@style/font5"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentTop="true"
-			android:gravity="center"
-			android:layout_centerHorizontal="true"
-			android:paddingTop="5dp"/>
-
-		<TextView
-			android:id="@+id/contact_number"
-			style="@style/font2"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/contact_name"
-			android:layout_gravity="center"
-			android:layout_centerHorizontal="true"
-			android:paddingBottom="10dp"/>
-
-		<RelativeLayout
-			android:id="@+id/avatar_layout"
+		<LinearLayout
+			android:background="@color/colorG"
+			android:layout_alignParentBottom="true"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:gravity="center_horizontal"
@@ -125,7 +106,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:padding="10dp"/>
+			android:padding="12dp"/>
 
 		<ImageView
 			android:id="@+id/speaker"
diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index ce87426bb..9c247643f 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -41,9 +41,7 @@
 
 		<ImageView
 			android:id="@+id/back_to_call"
-			android:src="@drawable/call_back"
-			android:background="@drawable/toolbar_button"
-			android:contentDescription="@string/content_description_back_call"
+			android:src="@drawable/call_back_button"
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
 			android:layout_weight="0.2"
@@ -53,8 +51,6 @@
 		<ImageView
 			android:id="@+id/edit"
 			android:src="@drawable/edit_list_button"
-			android:background="@drawable/toolbar_button"
-			android:contentDescription="@string/content_description_edit_list"
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
 			android:layout_weight="0.2"
@@ -69,33 +65,25 @@
 		android:layout_width="match_parent"
 		android:layout_height="1dp"/>
 
-		<LinearLayout
-			android:id="@+id/message_layout"
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
-
-			<ImageView
-				android:id="@+id/send_picture"
-				android:src="@drawable/chat_send_file"
-				android:contentDescription="@string/content_description_send_file"
-				android:padding="5dp"
-				android:layout_weight="0.1"
+	<LinearLayout
+        android:id="@+id/footer"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:orientation="vertical"
+	    android:layout_alignParentBottom="true"
+	    android:layout_centerHorizontal="true"
+   		android:background="@color/colorD">
+       
+	    <RelativeLayout 
+	        android:id="@+id/message_layout"
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content">
+	        
+	        <ImageView
+	            android:id="@+id/send_picture"
+				android:padding="15dp"
+				android:scaleType="center"
 				android:layout_width="wrap_content"
-				android:layout_height="wrap_content" />
-
-			<EditText
-				android:id="@+id/message"
-				android:textColor="@color/colorB"
-				android:imeOptions="flagNoExtractUi"
-				android:textCursorDrawable="@null"
-				android:inputType="textMultiLine"
-				android:contentDescription="@string/content_description_message"
-				android:maxLines="3"
-				android:padding="5dp"
-				android:layout_margin="5dp"
-				android:layout_weight="1"
-				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_alignParentLeft="true"
 				android:layout_centerVertical="true"
@@ -109,11 +97,9 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:src="@drawable/chat_send_message"
-				android:contentDescription="@string/content_description_send_message"
-				android:padding="5dp"
-				android:layout_weight="0.1"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"/>
+				android:layout_alignTop="@+id/message"
+				android:layout_alignParentRight="true"/>
+
 
 			<EditText
 				android:id="@+id/message"
diff --git a/res/layout/chat_bubble_incoming.xml b/res/layout/chat_bubble_incoming.xml
index a75b2e02a..acfe99f1d 100644
--- a/res/layout/chat_bubble_incoming.xml
+++ b/res/layout/chat_bubble_incoming.xml
@@ -1,13 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/bubble"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-   	android:gravity="left"
-    android:orientation="horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/bubble"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:gravity="left"
+	android:orientation="horizontal" >
+
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:background="@drawable/resizable_chat_bubble_incoming"
+		android:orientation="horizontal" >
+
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp">
+
+			<TextView
+				android:id="@+id/contact_header"
+				style="@style/font12"
+				android:singleLine="true"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content" />
+
+			<TextView
+				android:id="@+id/message"
+				style="@style/font14"
+				android:linksClickable="true"
+				android:autoLink="web"
+				android:layout_gravity="left"
+				android:visibility="gone"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content" />
+
+			<ImageView
+				android:id="@+id/image"
+				android:visibility="gone"
+				android:layout_width="150dp"
+				android:layout_height="150dp"
+				android:scaleType="centerInside"
+				android:maxWidth="250dp"
+				android:maxHeight="250dp" />
+
+			<RelativeLayout
+				android:id="@+id/file_transfer_layout"
+				android:visibility="gone"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content">
+
+				<ProgressBar
+					android:id="@+id/progress_bar"
+					android:paddingRight="5dp"
+					android:layout_marginTop="10dp"
+					android:layout_marginBottom="10dp"
+					style="@android:style/Widget.ProgressBar.Horizontal"
+					android:layout_width="150dp"
+					android:layout_height="5dp"/>
+
+				<Button
+					android:id="@+id/accept_download"
+					android:text="@string/download"
+					android:background="@drawable/resizable_confirm_delete_button"
+					style="@style/font7"
+					android:textAllCaps="true"
+					android:paddingLeft="10dp"
+					android:paddingRight="10dp"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="10dp"
+					android:layout_below="@id/progress_bar"/>
+
+			</RelativeLayout>
+
+		</LinearLayout>
+
+	</LinearLayout>
 
 	<CheckBox
-		android:id="@+id/delete_message"
+		android:id="@+id/delete"
 		android:button="@drawable/checkbox"
 		android:contentDescription="@string/content_description_delete"
 		android:layout_marginLeft="5dp"
@@ -18,95 +91,5 @@
 		android:layout_alignParentRight="true"
 		android:visibility="gone" />
 
-	<LinearLayout
-		android:id="@+id/message_content"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
 
-		<LinearLayout
-			android:background="@drawable/resizable_chat_bubble_incoming"
-			android:layout_height="wrap_content"
-			android:padding="10dp"
-			android:orientation="horizontal">
-			<RelativeLayout
-				android:id="@+id/avatar_layout"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content">
-				<ImageView
-					android:id="@+id/contact_picture"
-					android:src="@drawable/avatar"
-					android:contentDescription="@string/content_description_contact_picture"
-					android:layout_width="40dp"
-					android:layout_height="40dp"/>
-
-				<ImageView
-					android:id="@+id/mask"
-					android:src="@drawable/avatar_chat_mask"
-					android:layout_width="40dp"
-					android:layout_height="40dp"/>
-
-			</RelativeLayout>
-
-			<LinearLayout
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:orientation="vertical"
-				android:paddingLeft="10dp">
-
-				<TextView
-					android:id="@+id/contact_header"
-					style="@style/font9"
-					android:singleLine="true"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"/>
-
-				<TextView
-					android:id="@+id/message"
-					style="@style/font11"
-					android:linksClickable="true"
-					android:autoLink="web"
-					android:visibility="gone"
-				android:maxHeight="250dp" />
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"/>
-
-				<ImageView
-					android:id="@+id/image"
-					android:layout_width="150dp"
-					android:layout_height="150dp"
-					android:scaleType="centerInside"
-					android:visibility="gone"
-					android:maxWidth="250dp"
-					android:maxHeight="250dp"/>
-
-				<RelativeLayout
-					android:id="@+id/file_transfer_layout"
-					android:visibility="gone"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content">
-
-					<ProgressBar
-						android:id="@+id/progress_bar"
-						style="@android:style/Widget.ProgressBar.Horizontal"
-						android:paddingRight="5dp"
-						android:layout_marginTop="10dp"
-						android:layout_marginBottom="10dp"
-						android:layout_width="150dp"
-						android:layout_height="5dp"/>
-
-					<Button
-						android:id="@+id/accept_download"
-						android:text="@string/accept"
-						android:background="@drawable/resizable_assistant_button"
-						style="@style/font8"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_below="@id/progress_bar"/>
-
-				</RelativeLayout>
-			</LinearLayout>
-		</LinearLayout>
-
-	</LinearLayout>
-
-</RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/chat_bubble_outgoing.xml b/res/layout/chat_bubble_outgoing.xml
index ba0165d33..a4119a566 100644
--- a/res/layout/chat_bubble_outgoing.xml
+++ b/res/layout/chat_bubble_outgoing.xml
@@ -6,7 +6,7 @@
 	android:orientation="horizontal">
 
 	<CheckBox
-		android:id="@+id/delete_message"
+		android:id="@+id/delete"
 		android:button="@drawable/checkbox"
 		android:contentDescription="@string/content_description_delete"
 		android:layout_marginLeft="5dp"
@@ -21,7 +21,7 @@
 		android:background="@drawable/resizable_chat_bubble_outgoing"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_toLeftOf="@id/delete_message"
+		android:layout_toLeftOf="@id/delete"
 		android:orientation="horizontal">
 
 
diff --git a/res/layout/chatlist.xml b/res/layout/chatlist.xml
index c8b09f6b4..80090fa34 100644
--- a/res/layout/chatlist.xml
+++ b/res/layout/chatlist.xml
@@ -24,7 +24,7 @@
 		<ImageView
 			android:id="@+id/back_in_call"
 			android:src="@drawable/call_back_button"
-			android:contentDescription="@string/content_description_back_call"
+			android:contentDescription="@string/content_description_call"
 			android:visibility="invisible"
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
@@ -39,7 +39,7 @@
 		<ImageView
 			android:id="@+id/edit"
 			android:src="@drawable/edit_list_button"
-			android:contentDescription="@string/content_description_edit_list"
+			android:contentDescription="@string/content_description_edit"
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
 			android:layout_weight="0.2"
diff --git a/res/layout/chatlist_cell.xml b/res/layout/chatlist_cell.xml
index 01a4459e1..c73cac5ec 100644
--- a/res/layout/chatlist_cell.xml
+++ b/res/layout/chatlist_cell.xml
@@ -11,11 +11,13 @@
 		android:id="@+id/delete_chatroom"
 		android:button="@drawable/checkbox"
 		android:contentDescription="@string/content_description_delete"
+		android:paddingRight="5dp"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:adjustViewBounds="true"
 		android:layout_alignParentRight="true"
 		android:layout_centerVertical="true"
+		android:visibility="gone" />
 	
 	<LinearLayout
 	    android:layout_width="match_parent"
@@ -42,13 +44,6 @@
 					android:layout_height="35dp"
 					android:adjustViewBounds="true"/>
 
-				<ImageView
-					android:id="@+id/mask"
-					android:src="@drawable/avatar_mask"
-					android:layout_width="35dp"
-					android:layout_height="35dp"
-					android:adjustViewBounds="true"/>
-
 			</RelativeLayout>
 
 			<TextView
@@ -70,8 +65,10 @@
 			<TextView
 				android:id="@+id/sipUri"
 				android:lines="1"
-				android:ellipsize="end"
+				android:ellipsize="marquee"
+				android:marqueeRepeatLimit="marquee_forever"
 				android:scrollHorizontally="true"
+				android:fadingEdge="horizontal"
 				android:singleLine="true"
 				style="@style/font2"
 				android:layout_width="wrap_content"
@@ -82,7 +79,6 @@
 				android:id="@+id/unreadMessages"
 				android:layout_width="20dp"
 				android:layout_height="20dp"
-				android:contentDescription="@string/content_description_unread_chat_message"
 				android:background="@drawable/chat_list_indicator"
 				style="@style/font7"
 				android:gravity="center"
@@ -98,8 +94,7 @@
 				android:layout_below="@id/sipUri"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_marginRight="30dp"
-				style="@style/font11"/>
+				style="@style/font9"/>
 
 		</RelativeLayout>
 	    
diff --git a/res/layout/conf_call_control_row.xml b/res/layout/conf_call_control_row.xml
index 9e875eab0..e6f07a378 100644
--- a/res/layout/conf_call_control_row.xml
+++ b/res/layout/conf_call_control_row.xml
@@ -49,9 +49,9 @@
 	<ImageView
 		android:id="@+id/quitConference"
 		android:src="@drawable/conference_exit_default"
-		android:contentDescription="@string/content_description_exit_conference"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+		android:padding="20dp"
         android:gravity="center_vertical"
         android:scaleType="fitCenter"
         android:adjustViewBounds="true" />
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index 8582a1a72..0832ef893 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -69,14 +69,12 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
 
-				<ImageView
-					android:id="@+id/mask"
-					android:src="@drawable/avatar_mask"
-					android:layout_width="100dp"
-					android:layout_height="100dp"
-					android:adjustViewBounds="true"
-					android:layout_alignParentLeft="true"
-					android:layout_marginLeft="5dp"/>
+				<TextView
+					android:id="@+id/contact_function"
+					style="@style/font2"
+					android:singleLine="true"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
 
 			</LinearLayout>
 		</LinearLayout>
diff --git a/res/layout/contact_cell.xml b/res/layout/contact_cell.xml
index 0d613fc23..ed5223df9 100644
--- a/res/layout/contact_cell.xml
+++ b/res/layout/contact_cell.xml
@@ -33,29 +33,6 @@
 			android:layout_alignParentLeft="true"
 			android:layout_marginLeft="5dp"/>
 
-			<ImageView
-				android:id="@+id/mask"
-				android:src="@drawable/avatar_mask"
-				android:layout_width="35dp"
-				android:layout_height="35dp"
-				android:adjustViewBounds="true"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="5dp"/>
-
-		</RelativeLayout>
-
-		<CheckBox
-			android:id="@+id/delete"
-			android:button="@drawable/checkbox"
-			android:contentDescription="@string/content_description_delete"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_centerInParent="true"
-			android:visibility="gone"
-			android:paddingLeft="5dp"
-			android:paddingRight="5dp" />
-
 		<TextView 
 		    android:id="@+id/name"
 		    android:lines="1"
@@ -79,6 +56,18 @@
 	        android:scaleType="centerInside"
 	        android:src="@drawable/led_connected" />
 
+		<CheckBox
+			android:id="@+id/delete"
+			android:button="@drawable/checkbox"
+			android:contentDescription="@string/content_description_delete"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_centerInParent="true"
+			android:visibility="gone"
+			android:paddingLeft="5dp"
+			android:paddingRight="5dp" />
+	
 	</RelativeLayout>
     
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/contact_control_row.xml b/res/layout/contact_control_row.xml
index 4817266c3..6ac3b8e3f 100644
--- a/res/layout/contact_control_row.xml
+++ b/res/layout/contact_control_row.xml
@@ -32,7 +32,7 @@
 			<ImageView
 				android:id="@+id/contact_call"
 				android:src="@drawable/call_start_button"
-				android:contentDescription="@string/content_description_call"
+				android:contentDescription="@string/content_description_dial_back"
 				android:layout_width="60dp"
 				android:layout_height="60dp"
 				android:layout_margin="10dp"
diff --git a/res/layout/contact_edit.xml b/res/layout/contact_edit.xml
index c933568be..1be9925b8 100644
--- a/res/layout/contact_edit.xml
+++ b/res/layout/contact_edit.xml
@@ -14,7 +14,7 @@
 		<ImageView
 			android:id="@+id/back"
 			android:src="@drawable/back"
-			android:contentDescription="@string/content_description_cancel_button"
+			android:contentDescription="@string/content_description_back"
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
 			android:layout_weight="0.2"
@@ -37,7 +37,7 @@
 		<ImageView
 			android:id="@+id/ok"
 			android:src="@drawable/valid"
-			android:contentDescription="@string/content_description_valid"
+			android:contentDescription="@string/content_description_edit"
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
 			android:layout_weight="0.2"
@@ -74,19 +74,6 @@
 					android:layout_alignParentLeft="true"
 					android:layout_marginLeft="5dp"/>
 
-					<ImageView
-						android:id="@+id/mask"
-						android:src="@drawable/avatar_mask"
-						android:contentDescription="@string/content_description_contact_picture"
-						android:layout_width="100dp"
-						android:layout_height="100dp"
-						android:adjustViewBounds="true"
-						android:layout_alignParentLeft="true"
-						android:layout_marginLeft="5dp"/>
-
-				</RelativeLayout>
-
-
 				<TextView
 					android:text="@string/contact_last_name"
 					style="@style/font13"
@@ -99,7 +86,6 @@
 					android:id="@+id/contactLastName"
 					android:background="@drawable/resizable_textfield"
 					style="@style/font6"
-					android:contentDescription="@string/content_description_contact_last_name"
 					android:textCursorDrawable="@null"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
@@ -120,7 +106,6 @@
 					android:textCursorDrawable="@null"
 					android:background="@drawable/resizable_textfield"
 					style="@style/font6"
-					android:contentDescription="@string/content_description_contact_first_name"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
 					android:gravity="left"
@@ -130,7 +115,6 @@
 		    </LinearLayout>
 
 			<LinearLayout
-				android:id="@+id/sip_addresses"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:padding="10dp"
@@ -168,8 +152,8 @@
 
 			</LinearLayout>
 
+
 			<LinearLayout
-				android:id="@+id/phone_numbers"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:padding="10dp"
diff --git a/res/layout/contact_edit_row.xml b/res/layout/contact_edit_row.xml
index 0fcd30a54..e1a494c6f 100644
--- a/res/layout/contact_edit_row.xml
+++ b/res/layout/contact_edit_row.xml
@@ -18,8 +18,7 @@
 			android:layout_toStartOf="@+id/delete"/>
 
 		<ImageView
-			android:id="@+id/delete_field"
-			android:src="@drawable/delete_field_default"
+			android:id="@+id/delete"
 			android:contentDescription="@string/content_description_add"
 			android:layout_gravity="center"
 			android:layout_width="30dp"
diff --git a/res/layout/contacts_list.xml b/res/layout/contacts_list.xml
index 778c14c1a..c3249d4c5 100644
--- a/res/layout/contacts_list.xml
+++ b/res/layout/contacts_list.xml
@@ -6,91 +6,13 @@
 	android:orientation="vertical" >
 
 	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="60dp">
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_weight="0.2">
-
-			<ImageView
-				android:id="@+id/all_contacts"
-				android:src="@drawable/contacts_all"
-				android:background="@drawable/toolbar_button"
-				android:contentDescription="@string/content_description_all_contacts"
-				android:padding="15dp"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"/>
-
-			<View
-				android:id="@+id/all_contacts_select"
-				android:background="@color/colorA"
-				android:layout_width="match_parent"
-				android:layout_height="5dp"
-				android:layout_alignParentBottom="true"/>
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_weight="0.2">
-
-			<ImageView
-				android:id="@+id/linphone_contacts"
-				android:src="@drawable/contacts_sip"
-				android:background="@drawable/toolbar_button"
-				android:contentDescription="@string/content_description_linphone_contacts"
-				android:gravity="center"
-				android:padding="15dp"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"/>
-
-			<View
-				android:id="@+id/linphone_contacts_select"
-				android:background="@color/colorA"
-				android:layout_width="match_parent"
-				android:layout_height="5dp"
-				android:visibility="gone"
-				android:layout_alignParentBottom="true"/>
-		</RelativeLayout>
-
-		<View
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_weight="0.2"/>
-
-		<ImageView
-			android:id="@+id/newContact"
-			android:src="@drawable/contact_add"
-			android:background="@drawable/toolbar_button"
-			android:contentDescription="@string/content_description_edit"
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_weight="0.2"
-			android:padding="15dp"/>
-
-		<ImageView
-			android:id="@+id/edit"
-			android:src="@drawable/edit_list_button"
-			android:background="@drawable/toolbar_button"
-			android:contentDescription="@string/content_description_edit"
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_weight="0.2"
-			android:padding="15dp"/>
-	</LinearLayout>
-
-	<include layout="@layout/edit_list"/>
-
-	<RelativeLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
 		android:layout_margin="10dp">
 
 		<EditText
-            android:contentDescription="@string/content_description_search_contact"
+            android:contentDescription="@string/content_description_search"
 			android:textCursorDrawable="@null"
 			android:id="@+id/searchField"
 			android:layout_weight="0.15"
@@ -122,8 +44,9 @@
 			android:id="@+id/contactsList"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:divider="@color/colorE"
+			android:divider="@color/colorF"
 			android:fastScrollAlwaysVisible="true"
+			android:fastScrollEnabled="true"
 			android:dividerHeight="1dp" />
 
 		<TextView
diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index b05c347f1..a0daaa354 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -15,12 +15,7 @@
 
 		<org.linphone.ui.EraseButton
 			android:id="@+id/erase"
-<<<<<<< HEAD
 			android:src="@drawable/erase_button"
-=======
-			android:src="@drawable/backspace"
-			android:contentDescription="@string/content_description_backspace"
->>>>>>> public/master
 			android:layout_width="40dp"
 			android:layout_height="wrap_content"
 			android:layout_alignParentRight="true"
@@ -66,31 +61,13 @@
 			android:background="@drawable/button_back_background"
 			android:layout_width="102dp"
 			android:layout_height="wrap_content"
-<<<<<<< HEAD
 			android:padding="20dp"
 			android:visibility="gone"/>
-=======
-			android:layout_weight="1"
-			android:adjustViewBounds="true">
-
-			<ImageView
-				android:id="@+id/add_contact"
-				android:src="@drawable/contact_add_button"
-				android:background="@drawable/toolbar_button"
-				android:contentDescription="@string/content_description_add_contact"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:padding="15dp"
-				android:layout_alignParentBottom="true"/>
-
-		</RelativeLayout>
->>>>>>> public/master
 
         <org.linphone.ui.CallButton
 			android:id="@+id/call"
 			android:src="@drawable/call_audio_start"
 			android:background="@drawable/call"
-			android:contentDescription="@string/content_description_call"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
 			android:padding="12dp"
diff --git a/res/layout/edit_list.xml b/res/layout/edit_list.xml
index 5858deca2..dbd9344b7 100644
--- a/res/layout/edit_list.xml
+++ b/res/layout/edit_list.xml
@@ -9,13 +9,7 @@
 
 	<ImageView
 		android:id="@+id/cancel"
-<<<<<<< HEAD
 		android:src="@drawable/cancel_button"
-=======
-		android:src="@drawable/cancel_edit"
-		android:background="@drawable/toolbar_button"
-		android:contentDescription="@string/content_description_cancel_button"
->>>>>>> public/master
 		android:layout_width="0dp"
 		android:layout_height="match_parent"
 		android:layout_weight="0.2"
@@ -28,13 +22,7 @@
 
 	<ImageView
 		android:id="@+id/select_all"
-<<<<<<< HEAD
 		android:src="@drawable/select_all_button"
-=======
-		android:src="@drawable/select_all"
-		android:background="@drawable/toolbar_button"
-		android:contentDescription="@string/content_description_select_all"
->>>>>>> public/master
 		android:layout_width="0dp"
 		android:layout_height="match_parent"
 		android:layout_weight="0.2"
@@ -42,13 +30,7 @@
 
 	<ImageView
 		android:id="@+id/deselect_all"
-<<<<<<< HEAD
 		android:src="@drawable/deselect_all_button"
-=======
-		android:src="@drawable/deselect_all"
-		android:background="@drawable/toolbar_button"
-		android:contentDescription="@string/content_description_deselect_all"
->>>>>>> public/master
 		android:layout_width="0dp"
 		android:layout_height="match_parent"
 		android:layout_weight="0.2"
@@ -58,11 +40,6 @@
 	<ImageView
 		android:id="@+id/delete"
 		android:src="@drawable/delete_button"
-<<<<<<< HEAD
-=======
-		android:background="@drawable/toolbar_button"
-		android:contentDescription="@string/content_description_delete_selection"
->>>>>>> public/master
 		android:layout_width="0dp"
 		android:layout_height="match_parent"
 		android:layout_weight="0.2"
diff --git a/res/layout/history.xml b/res/layout/history.xml
index fc64d4dcf..e795ac71c 100644
--- a/res/layout/history.xml
+++ b/res/layout/history.xml
@@ -38,12 +38,7 @@
 		<ImageView
 			android:id="@+id/edit"
 			android:src="@drawable/edit_list_button"
-<<<<<<< HEAD
 			android:contentDescription="@string/content_description_edit"
-=======
-			android:background="@drawable/toolbar_button"
-			android:contentDescription="@string/content_description_edit_list"
->>>>>>> public/master
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
 			android:layout_weight="0.2"
diff --git a/res/layout/history_cell.xml b/res/layout/history_cell.xml
index 111870717..8292e2c5b 100644
--- a/res/layout/history_cell.xml
+++ b/res/layout/history_cell.xml
@@ -22,7 +22,6 @@
 		android:layout_margin="5dp"
 		android:gravity="center_vertical">
 
-<<<<<<< HEAD
 		<ImageView
 			android:id="@+id/contact_picture"
 			android:src="@drawable/avatar"
@@ -32,34 +31,6 @@
 			android:adjustViewBounds="true"
 			android:layout_alignParentLeft="true"
 			android:layout_marginLeft="5dp"/>
-=======
-		<RelativeLayout
-			android:id="@+id/avatar_layout"
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:gravity="center">
-
-			<ImageView
-				android:id="@+id/contact_picture"
-				android:src="@drawable/avatar"
-				android:contentDescription="@string/content_description_contact_picture"
-				android:layout_width="35dp"
-				android:layout_height="35dp"
-				android:adjustViewBounds="true"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="5dp"/>
-
-			<ImageView
-				android:id="@+id/mask"
-				android:src="@drawable/avatar_mask"
-				android:layout_width="35dp"
-				android:layout_height="35dp"
-				android:adjustViewBounds="true"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="5dp"/>
-
-		</RelativeLayout>
->>>>>>> public/master
 
 		<ImageView
 			android:id="@+id/icon"
@@ -98,7 +69,10 @@
 			android:id="@+id/sip_uri"
 			style="@style/font2"
 			android:lines="1"
-			android:ellipsize="end"
+			android:ellipsize="marquee"
+			android:marqueeRepeatLimit="marquee_forever"
+			android:scrollHorizontally="true"
+			android:fadingEdge="horizontal"
 			android:singleLine="true"
 			android:gravity="center_vertical"
 			android:layout_width="wrap_content"
diff --git a/res/layout/history_detail.xml b/res/layout/history_detail.xml
index 70dad6d01..0d1fd6dd3 100644
--- a/res/layout/history_detail.xml
+++ b/res/layout/history_detail.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-<<<<<<< HEAD
 			  android:background="@color/colorG"
 			  android:layout_width="match_parent"
 			  android:layout_height="match_parent"
 			  android:orientation="vertical" >
-=======
-	android:background="@color/colorH"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
->>>>>>> public/master
 
 	<LinearLayout
 		android:id="@+id/top_bar"
@@ -21,12 +14,7 @@
 
 		<ImageView
 			android:id="@+id/back"
-<<<<<<< HEAD
 			android:src="@drawable/back_button"
-=======
-			android:src="@drawable/back"
-			android:background="@drawable/toolbar_button"
->>>>>>> public/master
 			android:contentDescription="@string/content_description_back"
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
@@ -51,7 +39,6 @@
 		android:orientation="horizontal">
 
 		<ImageView
-<<<<<<< HEAD
 			android:id="@+id/contact_picture"
 			android:src="@drawable/avatar"
 			android:contentDescription="@string/content_description_contact_picture"
@@ -83,16 +70,6 @@
 
 		</LinearLayout>
 
-=======
-			android:id="@+id/add_contact"
-			android:src="@drawable/contact_add"
-			android:background="@drawable/toolbar_button"
-			android:contentDescription="@string/content_description_add_contact"
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_weight="0.2"
-			android:padding="15dp"/>
->>>>>>> public/master
 	</LinearLayout>
 
 	<ScrollView
@@ -174,14 +151,8 @@
 			android:padding="10dp">
 
 			<TextView
-<<<<<<< HEAD
 				android:id="@+id/date"
 				style="@style/font2"
-=======
-				android:id="@+id/contact_name"
-				style="@style/font5"
-				android:gravity="center_horizontal"
->>>>>>> public/master
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"/>
 
@@ -191,83 +162,6 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"/>
 
-<<<<<<< HEAD
-=======
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:padding="10dp"
-				android:gravity="center"
-				android:orientation="horizontal">
-
-				<ImageView
-					android:id="@+id/call"
-					android:src="@drawable/call_start_body_default"
-					android:contentDescription="@string/content_description_call"
-					android:layout_width="60dp"
-					android:layout_height="60dp"
-					android:layout_margin="10dp"/>
-
-				<ImageView
-					android:id="@+id/chat"
-					android:src="@drawable/chat_start_body_default"
-					android:contentDescription="@string/content_description_chat"
-					android:layout_width="60dp"
-					android:layout_height="60dp"
-					android:layout_margin="10dp"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:id="@+id/log_row"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="vertical">
-
-				<View
-					android:background="@color/colorE"
-					android:layout_width="wrap_content"
-					android:layout_height="1dp"/>
-
-				<TextView
-					android:text="@string/call"
-					style="@style/font13"
-					android:textAllCaps="true"
-					android:layout_marginTop="2dp"
-					android:layout_gravity="center"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"/>
-
-				<LinearLayout
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:orientation="horizontal"
-					android:gravity="center"
-					android:padding="10dp">
-
-					<ImageView
-						android:id="@+id/direction"
-						android:paddingLeft="10dp"
-						android:paddingRight="10dp"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"/>
-
-					<TextView
-						android:id="@+id/date"
-						style="@style/font10"
-						android:paddingRight="10dp"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"/>
-
-					<TextView
-						android:id="@+id/time"
-						style="@style/font10"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"/>
-
-				</LinearLayout>
-			</LinearLayout>
->>>>>>> public/master
 		</LinearLayout>
 	</LinearLayout>
 			</LinearLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 60a0e2394..ec4399b25 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -42,7 +42,6 @@
 				<ImageView
 					android:id="@+id/cancel"
 					android:src="@drawable/dialer_back"
-					android:contentDescription="@string/content_description_dialer_back"
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
 					android:padding="15dp"
@@ -89,26 +88,11 @@
 					<ImageView
 						android:id="@+id/history_image"
 						android:layout_width="match_parent"
-<<<<<<< HEAD
 						android:layout_height="match_parent"
 						android:padding="18dp"
 						android:layout_centerInParent="true"
 						android:contentDescription="@string/content_description_history"
 						android:src="@drawable/footer_history"/>
-=======
-						android:layout_height="wrap_content"
-						android:contentDescription="@string/content_description_history"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
-
-					<View
-						android:id="@+id/history_select"
-						android:background="@color/colorA"
-						android:layout_width="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"
-						android:visibility="gone"/>
->>>>>>> public/master
 
 					<TextView
 						android:id="@+id/missed_calls"
@@ -131,30 +115,9 @@
 					android:contentDescription="@string/content_description_contacts"
 					android:layout_weight="1"
 					android:layout_width="0dp"
-<<<<<<< HEAD
 					android:layout_height="match_parent"
 					android:padding="18dp"
 					android:layout_centerInParent="true" />
-=======
-					android:layout_height="match_parent">
-
-					<ImageView
-						android:src="@drawable/footer_contacts"
-						android:contentDescription="@string/content_description_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="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"
-						android:visibility="gone"/>
-				</RelativeLayout>
->>>>>>> public/master
 
 				<ImageView
 					android:id="@+id/dialer"
@@ -163,30 +126,9 @@
 					android:contentDescription="@string/content_description_dialer"
 					android:layout_weight="1"
 					android:layout_width="0dp"
-<<<<<<< HEAD
 					android:layout_height="match_parent"
 					android:padding="18dp"
 					android:layout_centerInParent="true"/>
-=======
-					android:layout_height="match_parent">
-
-					<ImageView
-						android:src="@drawable/footer_dialer"
-						android:contentDescription="@string/content_description_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="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"/>
-
-				</RelativeLayout>
->>>>>>> public/master
 
 				<RelativeLayout
 					android:id="@+id/chat"
@@ -198,7 +140,6 @@
 					<ImageView
 						android:id="@+id/chat_image"
 						android:src="@drawable/footer_chat"
-						android:contentDescription="@string/content_description_chat_button"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:padding="18dp"
@@ -236,7 +177,6 @@
 		android:layout_height="match_parent"
 		android:layout_gravity="left">
 
-<<<<<<< HEAD
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
@@ -265,8 +205,6 @@
 				android:dividerHeight="1dp"/>
 		</LinearLayout>
 
-=======
->>>>>>> public/master
 		<RelativeLayout
 			android:id="@+id/side_menu_quit"
 			android:background="@color/colorA"
@@ -294,44 +232,9 @@
 				android:layout_toRightOf="@id/quit_button"
 				android:gravity="center_vertical"
 				android:layout_centerInParent="true"/>
+
 		</RelativeLayout>
 
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:background="@color/colorH"
-			android:layout_above="@id/side_menu_quit"
-			android:orientation="vertical">
-
-			<include layout="@layout/side_menu_main_account"/>
-
-			<ListView
-				android:id="@+id/accounts_list"
-				android:background="@color/colorH"
-				android:layout_width="match_parent"
-				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="wrap_content"
-				android:choiceMode="singleChoice"
-				android:divider="@color/colorE"
-				android:listSelector="@color/colorH"
-				android:footerDividersEnabled="true"
-				android:dividerHeight="1dp"/>
-			
-			<View
-				android:layout_width="match_parent"
-				android:layout_height="1dp"
-				android:background="@color/colorE"/>
-
-		</LinearLayout>
 	</RelativeLayout>
 
 </android.support.v4.widget.DrawerLayout>
diff --git a/res/layout/progress_dialog.xml b/res/layout/progress_dialog.xml
deleted file mode 100644
index cde6ce898..000000000
--- a/res/layout/progress_dialog.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"
-			  android:gravity="center"
-			  android:layout_width="fill_parent"
-			  android:layout_height="fill_parent">
-
-	<ProgressBar
-		android:layout_height="wrap_content"
-		android:layout_width="wrap_content"
-		android:layout_marginBottom="20dp"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/side_menu_main_account.xml b/res/layout/side_menu_main_account.xml
index ec9ae8b9b..5c3a69acc 100644
--- a/res/layout/side_menu_main_account.xml
+++ b/res/layout/side_menu_main_account.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/default_account"
-	android:contentDescription="@string/content_description_default_account"
 	android:background="@color/colorF"
 	android:layout_width="match_parent"
 	android:layout_height="70dp">
@@ -43,15 +42,8 @@
 		android:src="@drawable/led_connected"
 		android:layout_width="25dp"
 		android:layout_height="25dp"
-<<<<<<< HEAD
 		android:layout_alignParentRight="true"
 		android:padding="7dp"
 		android:layout_marginTop="10dp"/>
-=======
-		android:padding="5dp"
-		android:layout_marginTop="10dp"
-		android:layout_alignParentRight="true"
-		android:layout_alignParentTop="true"/>
->>>>>>> public/master
 
 </RelativeLayout>
diff --git a/res/layout/status.xml b/res/layout/status.xml
index ff88ed79d..ce66c88b5 100644
--- a/res/layout/status.xml
+++ b/res/layout/status.xml
@@ -14,7 +14,6 @@
 		<ImageView
 			android:id="@+id/side_menu_button"
 			android:src="@drawable/menu_burger"
-			android:contentDescription="@string/content_description_menu"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:padding="10dp"
diff --git a/res/layout/tuto_carddav.xml b/res/layout/tuto_carddav.xml
deleted file mode 100644
index a3b6795dc..000000000
--- a/res/layout/tuto_carddav.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_height="match_parent" 
-	android:layout_width="match_parent"
-	android:gravity="top|center_horizontal"
-	android:orientation="vertical">
-	
-    <LinearLayout 
-		android:layout_height="wrap_content" 
-		android:layout_width="match_parent"
-        android:orientation="horizontal">
-        
-        <EditText 
-            android:id="@+id/carddav_username"
-            android:hint="Username"
-            android:text="sylvain"
-			android:layout_height="wrap_content" 
-			android:layout_width="wrap_content"/>
-        
-        <EditText 
-            android:id="@+id/carddav_pwd"
-            android:hint="Pwd"
-			android:layout_height="wrap_content" 
-			android:layout_width="wrap_content"/>
-        
-        <EditText 
-            android:id="@+id/carddav_ha1"
-            android:hint="HA1"
-            android:text="4747ce2517a985f2fc20234a38f068b6"
-			android:layout_height="wrap_content" 
-			android:layout_width="wrap_content"/>
-        
-    </LinearLayout>
-        
-   	<EditText 
-		android:id="@+id/carddav_server"
-		android:hint="Server URL"
-		android:text="http://192.168.0.230/sabredav/addressbookserver.php/addressbooks/sylvain/default"
-		android:layout_height="wrap_content" 
-		android:layout_width="wrap_content"/>
-       
-	<Button
-		android:id="@+id/carddav_synchronize"
-		android:text="Synchronize"
-		android:layout_height="wrap_content" 
-		android:layout_width="wrap_content"/>
-	
-	<TextView 
-	    android:id="@+id/carddav_events"
-		android:layout_height="match_parent" 
-		android:layout_width="match_parent"
-		android:layout_weight="1"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/tutorials.xml b/res/layout/tutorials.xml
index 2db762809..105f595c6 100644
--- a/res/layout/tutorials.xml
+++ b/res/layout/tutorials.xml
@@ -29,11 +29,5 @@
         android:layout_height="wrap_content"
 		android:layout_margin="10dp"
         android:onClick="startBuddyStatusTutorial" />
-    
-    <Button android:text="CardDAV Sync"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-		android:layout_margin="10dp"
-        android:onClick="startCardDavSyncTutorial"/>
 
 </LinearLayout>
diff --git a/res/layout/video_no_opengl.xml b/res/layout/video_no_opengl.xml
deleted file mode 100644
index ea88c256d..000000000
--- a/res/layout/video_no_opengl.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/video_frame"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    
-    <SurfaceView
-        android:visibility="visible" 
-        android:layout_height="match_parent" 
-        android:layout_width="match_parent" 
-        android:id="@+id/videoSurface" />
-	
-	<SurfaceView
-	    android:id="@+id/videoCaptureSurface"
-	    android:layout_width="120dp"
-	    android:layout_height="145dp"
-	    android:layout_alignParentBottom="true"
-	    android:layout_alignParentRight="true" />
-
-</RelativeLayout>
diff --git a/res/raw/hold.mkv b/res/raw/hold.mkv
deleted file mode 100644
index a3e00966f..000000000
Binary files a/res/raw/hold.mkv and /dev/null differ
diff --git a/res/raw/linphonerc_default b/res/raw/linphonerc_default
index 2238536a3..27dcac0ab 100644
--- a/res/raw/linphonerc_default
+++ b/res/raw/linphonerc_default
@@ -15,7 +15,6 @@ size=qvga
 sharing_server=https://www.linphone.org:444/lft.php
 tunnel=disabled
 push_notification=1
-auto_start=1
 
 [tunnel]
 host=
diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 7aafbb182..785851bef 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -5,7 +5,6 @@
 [net]
 mtu=1300
 
-<<<<<<< HEAD
 [app]
 animations=0
 show_login_view=1
@@ -13,8 +12,6 @@ debug_popup_magic=#1234
 debug=1
 server_url=http://85.233.205.218:443/xmlrpc
 
-=======
->>>>>>> public/master
 [sip]
 guess_hostname=1
 inc_timeout=15
@@ -40,6 +37,7 @@ dtmf_player_amp=0.1
 #remove this property for any application that is not Linphone public version itself
 ec_calibrator_cool_tones=1
 
+
 [misc]
 max_calls=10
 log_collection_upload_server_url=https://www.linphone.org:444/lft.php
\ No newline at end of file
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
deleted file mode 100644
index 8bdff422b..000000000
--- a/res/values-ar/strings.xml
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Custom-->
-  <string name="app_name">لِنْفُونْ</string>
-  <string name="service_name">خدمة لِنْفُونْ</string>
-  <string name="addressbook_label">لِنْفُونْ</string>
-  <string name="notification_title">لِنْفُونْ</string>
-  <string name="wait_dialog_text">يجري التشغيل</string>
-  <string name="notification_registered">‫%s مُسجَّل‬</string>
-  <string name="notification_register_failure">‫فشل %s في التسجيل‬</string>
-  <string name="tunnel_host"></string>
-  <!--Common-->
-  <string name="username">إسم المستخدم</string>
-  <string name="display_name">الإسم المعروض</string>
-  <string name="password">كلمة السر</string>
-  <string name="confirm_password">تأكيد كلمة السر</string>
-  <string name="domain">النطاق</string>
-  <string name="remote_provisioning_url">عنوان الموقع</string>
-  <string name="email">البريد الإلكتروني</string>
-  <string name="delete_text">أأنت متأكد من حذف تحديدك ؟</string>
-  <string name="delete">حذف</string>
-  <string name="retry">إعادة المحاولة</string>
-  <string name="cancel">إلغاء</string>
-  <string name="accept">قبول</string>
-  <string name="continue_text">استمرار</string>
-  <string name="about">حول</string>
-  <string name="deny">رفض</string>
-  <string name="no_account">لم يُهيَّأ أي حساب</string>
-  <string name="search">بحث</string>
-  <string name="outgoing">الصادرة</string>
-  <string name="incoming">الواردة</string>
-  <string name="missed">الفائتة</string>
-  <string name="settings">اﻹعدادات</string>
-  <string name="connect">الاتصال</string>
-  <string name="decline">رفض</string>
-  <string name="conference">اجتماع</string>
-  <!--Launch screen-->
-  <string name="app_description">‫الزبون SIP <i>الحر</i>‬</string>
-  <!--Assistant-->
-  <string name="welcome">مرحبا</string>
-  <string name="assistant">المرشد</string>
-  <string name="assistant_create_account">إنشاء الحساب</string>
-  <string name="assistant_finish">أنهِ التهئية</string>
-  <string name="assistant_validate_account">لقد أُنشِيء حسابك. يُرجى الاطلاع على رسائل بريدك الإلكتروني لتأكيد حسابك. حالما تنتهي من ذلك، عُد إلى هنا واضغط على الزر.</string>
-  <string name="assistant_welcome_desc">سيمكنك هذا المرشد من إعداد حسابك SIP لإجراء المكالمات.</string>
-  <string name="assistant_linphone_login_desc">أدخِل اسم المستخدم وكلمة السر لحساب لِنْفُونْ</string>
-  <string name="assistant_login_desc">‫أدخِل اسم المستخدم وكلمة السر الحساب مع نطاق SIP‬</string>
-  <string name="assistant_remote_provisioning_desc">يٌرجى إدخال عنوان التهئية البعيدة</string>
-  <string name="transport">النقل</string>
-  <string name="assistant_login_linphone">استخدم حساب لِنْفُونْ</string>
-  <string name="assistant_login_generic">استخدم حساب SIP</string>
-  <string name="assistant_remote_provisioning">اجذب التهئية البعيدة</string>
-  <string name="assistant_create_account_part_1">1/2</string>
-  <string name="assistant_create_account_part_2">2/2</string>
-  <string name="assistant_display_name_optional">الاسم المعروض (اختياري)</string>
-  <string name="assistant_linphone_account">هيِّءْ حساب لِنْفُونْ</string>
-  <string name="assistant_generic_account">هيِّءْ حساب SIP</string>
-  <string name="assistant_remote_provisioning_title">اجذب التهئية البعيدة</string>
-  <string name="assistant_fetch_apply">اجذبْ وطبِّق</string>
-  <string name="assistant_login">الولوج</string>
-  <string name="assistant_ec_calibration">معايرة مزيل الصدى في طور الإنجاز</string>
-  <string name="assistant_remote_provisioning_login">أدخل اسم الولوج</string>
-  <string name="assistant_account_not_validated">لم يتم تأكيد حسابك بعد.</string>
-  <string name="assistant_account_validated">تم تأكيد حسابك.</string>
-  <string name="assistant_error_bad_credentials">اسم المسخدم أو كلمة السر غير صحيحة</string>
-  <string name="wizard_failed">حدث خطأ، حاول لاحقا.</string>
-  <string name="wizard_server_unavailable">انعدام الوصول للخادم، تأكد من اتصالك بالشبكة.</string>
-  <string name="wizard_username_unavailable">إن إسم المستخدم هذا مُستعمَل.</string>
-  <string name="wizard_username_incorrect">اسم المستخدم غير صحيح.</string>
-  <string name="wizard_email_incorrect">عنوانك الإلكتروني غير صحيح.</string>
-  <string name="wizard_password_incorrect">كلمة السر غير صحيحة.</string>
-  <string name="wizard_passwords_unmatched">كلمتا السر غير متطابقتين.</string>
-  <string name="setup_confirm_username">سيكون اسم المستخدم هو %s.\r\n\r\nقد يختلف عما أدخلته ليوافق المعايير.\r\nأتقبل ذلك ؟</string>
-  <string name="first_launch_no_login_password">يُرجى إدخال إسم المستخدم وكلمة السر</string>
-  <!--Dailer-->
-  <string name="address_bar_hint">أدخل رقما أو عنوانا</string>
-  <!--History-->
-  <string name="no_call_history">لا وجود للمكالمات في تاريخك</string>
-  <string name="no_missed_call_history">لا وجود للمكالمات الفائتة في تاريخك</string>
-  <string name="delete_history_log">أتود حذف سجل المكالمات المحددة ؟</string>
-  <string name="today">اليوم</string>
-  <string name="yesterday">اﻷمس</string>
-  <!--Contacts-->
-  <string name="no_contact">لا وجود لأي جهة اتصال في دفتر عناوينك.</string>
-  <string name="no_sip_contact">لا وجود لأي جهة اتصال SIP في دفتر عناوينك.</string>
-  <string name="delete_contacts">أتود حذف جهات الاتصال المحددة ؟</string>
-  <string name="delete_contact">أتود حذف جهة الاتصال المحددة ؟</string>
-  <string name="sip_address">عنوان SIP</string>
-  <string name="phone_number">رقم الهاتف</string>
-  <string name="contact_first_name">اﻹسم</string>
-  <string name="contact_last_name">اللقب</string>
-  <!--Chat-->
-  <string name="no_chat_history">لا وجود لأي محادثة</string>
-  <string name="delete_conversation">أتود حذف المحادثات المحددة ؟</string>
-  <string name="delete_message">أتود حذف الرسالة المحددة ؟</string>
-  <string name="remote_composing">المُراسِل يكتب...</string>
-  <string name="share_picture_size_small">صغيرة</string>
-  <string name="share_picture_size_medium">متوسطة</string>
-  <string name="share_picture_size_large">كبيرة</string>
-  <string name="share_picture_size_real">الحجم الحقيقي</string>
-  <string name="text_copied_to_clipboard">نُسخ النص في الحافظة</string>
-  <string name="copy_text">نسخ النص</string>
-  <string name="image_picker_title">اختر المصدر</string>
-  <string name="image_saved">حُفظَت الصورة</string>
-  <string name="image_not_saved">خطأ، لم تُحفَظ الصورة</string>
-  <string name="wait">يُرجى الانتظار...</string>
-  <string name="processing_image">قد تستلزم معالجة الصور بضع ثوان حسب حجم الملف.</string>
-  <!--Status Bar-->
-  <string name="status_connected">مُسجَّل</string>
-  <string name="status_not_connected">غير مُسجَّل</string>
-  <string name="status_in_progress">يجري التسجيل</string>
-  <string name="status_error">فشِل التسجيل</string>
-  <string name="voicemail_unread">الرسائل غير المقروءة</string>
-  <!--Side Menu-->
-  <string name="menu_assistant">المرشد</string>
-  <string name="menu_settings">اﻹعدادات</string>
-  <string name="menu_about">حول</string>
-  <string name="quit">غادِرْ</string>
-  <!--Call-->
-  <string name="incoming_call">مكالمة واردة</string>
-  <string name="outgoing_call">مكالمة صادرة</string>
-  <string name="add_video_dialog">يود مخاطبك تشغيل الفيديو</string>
-  <string name="no_current_call">لا وجود لأي مكالمة نشيطة</string>
-  <string name="call_paused_by_remote">أوقف مخاطبك المكالمة مؤقتا</string>
-  <string name="couldnt_accept_call">حدث خطأ خلال قبول المكالمة</string>
-  <string name="zrtp_dialog">رمز ZRTP هو %s\nيُفترَض عليك قبوله فقط إذا كان مخاطبك قد أخبرك برؤيته لنفس الرمز الذي تراه</string>
-  <string name="unknown_incoming_call_name">مجهول</string>
-  <string name="call_stats_audio">الصوت</string>
-  <string name="call_stats_video">الفيديو</string>
-  <string name="call_stats_codec">المِرماز :</string>
-  <string name="call_stats_upload">صبيب الرفع :</string>
-  <string name="call_stats_download">صبيب التنزيل :</string>
-  <string name="call_stats_ice">توصيل ICE :</string>
-  <string name="call_stats_video_resolution">مقاس الفيديو :</string>
-  <string name="call">مكالمة</string>
-  <!--About-->
-  <string name="menu_send_log">إرسال السجل</string>
-  <string name="menu_reset_log">إعادة تعيين السجل</string>
-  <!--Service-->
-  <string name="incall_notif_active">المكالمة الصوتية الجارية</string>
-  <string name="incall_notif_paused">المكالمة الموقَّفة مؤقتا الجارية</string>
-  <string name="incall_notif_video">المكالمة المرئية الجارية</string>
-  <string name="notification_started">بدَأ</string>
-  <string name="unread_messages">%i رسائل غير مقروءة</string>
-  <!--Errors-->
-  <string name="skipable_error_service_not_ready">تحذير : الخدمة غير جاهزة</string>
-  <string name="error">خطأ</string>
-  <string name="warning_wrong_destination_address">لا يمكن تركيب عنوان الوجهة انطلاقا من %s</string>
-  <string name="error_unknown">خطأ مجهول</string>
-  <string name="error_call_declined">مكالمة مرفوضة</string>
-  <string name="error_user_not_found">لم يعثر على المستخدم</string>
-  <string name="error_incompatible_media">مُعامِلات الوسائط غير متوافقة</string>
-  <string name="error_low_bandwidth">لمخاطبك سعة قناة ضيقة، لا يمكن إذن بدء الفيديو</string>
-  <string name="error_network_unreachable">تعذر الوصول إلى الشبكة</string>
-  <string name="error_bad_credentials">الاعتمادات غير صحيحة</string>
-  <string name="error_unauthorized">غير مُصرَّح</string>
-  <string name="error_io_error">خطأ في الشبكة</string>
-  <string name="download_image_failed">فشل التنزيل. يُرجى التحقق من اتصالك بالشبكة أو الإعادة لاحقا.</string>
-  <string name="remote_provisioning_failure">فشِل تنزيل أو تطبيق تشكيلة التهيئة عن بعد</string>
-  <string name="remote_provisioning_again_title">التهيئة عن بعد</string>
-  <string name="remote_provisioning_again_message">أتود تغيير عنوان التهئية البعيدة ؟</string>
-  <!--Account Settings-->
-  <string name="pref_sipaccount">حساب SIP</string>
-  <string name="pref_manage_title">الإدارة</string>
-  <string name="pref_disable_account">إيقاف</string>
-  <string name="pref_proxy">الوسيط</string>
-  <string name="pref_domain">النطاق*</string>
-  <string name="pref_passwd">كلمة السر*</string>
-  <string name="pref_username">إسم المستخدم*</string>
-  <string name="pref_enable_outbound_proxy">وسيط التوجُّه</string>
-  <string name="pref_help_proxy">إسم مضيف وسيط SIP أو عنوان IP (اختياري)</string>
-  <string name="pref_help_outbound_proxy">توجيه كل المكالمات عبر وسيط SIP</string>
-  <string name="pref_help_username">مثلا : john إذا كان حسابك john@sip.example.org</string>
-  <string name="pref_help_domain">sip.example.org إذا كان حسابك john@sip.example.org</string>
-  <string name="pref_help_password">يجب عليك إدخال كلمة السر مرة أخرى إذا أردت تحرير إسم المستخدم أو النطاق</string>
-  <string name="pref_expire_title">انتهاء الصلاحية</string>
-  <string name="pref_avpf">AVPF</string>
-  <string name="pref_avpf_rr_interval">نطاق RTCP الاعتيادي لـ AVPF بالثواني (ما بين 1 و 5)</string>
-  <string name="pref_escape_plus">استبدال + بـ 00</string>
-  <string name="pref_auth_userid">مُعرِّف استيثاق المستخدم</string>
-  <string name="pref_help_auth_userid">ادخل مُعرِّف استيثاق المستخدم (اختياري)</string>
-  <string name="pref_display_name">الإسم المعروض</string>
-  <string name="pref_help_display_name">ادخل الاسم المعروض (اختياري)</string>
-  <string name="pref_prefix">البادِئة</string>
-  <string name="pref_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">حذف هذا الحساب</string>
-  <string name="pref_default_account">استخدام كافتراضي</string>
-  <!--Settings-->
-  <string name="pref_sipaccounts">حسابات SIP</string>
-  <string name="default_account_flag">الحساب الافتراضي</string>
-  <string name="pref_add_account">إضافة حساب</string>
-  <string name="pref_tunnel">النفق</string>
-  <string name="pref_tunnel_host">إسم المضيف</string>
-  <string name="pref_tunnel_port">المنفذ</string>
-  <string name="pref_tunnel_mode">الوضع</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string-array name="tunnel_mode_entries">
-    <item>غير مُشغَّل</item>
-    <item>3G فقط</item>
-    <item>دائما</item>
-    <item>تلقائي</item>
-  </string-array>
-  <string name="pref_none">بدون</string>
-  <string name="pref_preferences_title">التفضيلات</string>
-  <string name="pref_video_enable_title">تشغيل الفيديو</string>
-  <!--Audio settings-->
-  <string name="pref_audio_title">الصوت</string>
-  <string name="pref_echo_cancellation">إزالة الصدى</string>
-  <string name="pref_echo_cancellation_summary">إزالة الصدى المسموع من الطرف الآخر</string>
-  <string name="pref_echo_canceller_calibration">معايرة مزيل الصدى</string>
-  <string name="ec_calibrating">يُعايِر...</string>
-  <string name="no_echo">لا وجود لصدى</string>
-  <string name="failed">فشِل</string>
-  <string name="pref_adaptive_rate_control">التحكم في ملائمة الصبيب</string>
-  <string name="pref_codec_bitrate_limit">حد صبيب المِرماز</string>
-  <string name="pref_codecs">المراميز</string>
-  <!--Video settings-->
-  <string name="pref_video_title">الفيديو</string>
-  <string name="pref_video_use_front_camera_title">استخدام الكاميرا الأمامية</string>
-  <string name="pref_video_initiate_call_with_video_title">بدء اتصالات بالصورة</string>
-  <string name="pref_video_initiate_call_with_video">أرسِل دائما طلبات الفيديو</string>
-  <string name="pref_video_automatically_accept_video_title">قبول طلبات الفيديو الواردة</string>
-  <string name="pref_video_automatically_accept_video">قبول طلبات الفيديو دائما</string>
-  <string name="pref_preferred_video_size">حجم الفيديو المفضل</string>
-  <string name="pref_preferred_fps">معدل الإطارات المفضل</string>
-  <string name="pref_bandwidth_limit">حد سعة القناة بـ ك.بِتْ/ثانية</string>
-  <string name="pref_video_codecs_title">المراميز</string>
-  <!--Call settings-->
-  <string name="pref_call_title">مكالمة</string>
-  <string name="pref_rfc2833_dtmf">إرسال RFC2833 DTMFs</string>
-  <string name="pref_sipinfo_dtmf">إرسال SIP INFO DTMFs</string>
-  <string name="pref_voice_mail">عنوان العلبة الصوتية</string>
-  <!--Network settings-->
-  <string name="pref_network_title">الشبكة</string>
-  <string name="pref_wifi_only">استخدم WiFi فقط</string>
-  <string name="pref_stun_server">خادم STUN</string>
-  <string name="pref_ice_enable">تشغيل ICE</string>
-  <string name="pref_upnp_enable">تشغيل UPnP</string>
-  <string name="pref_transport_use_random_ports">استخدم منافذ عشوائية</string>
-  <string name="pref_sip_port_title">منفذ SIP المُراد استخدامه</string>
-  <string name="pref_video_port_title">منفذ الفيديو أو نطاق المنفذ</string>
-  <string name="pref_audio_port_title">منفذ الصوت أو نطاق المنفذ</string>
-  <string name="pref_video_port_description">منفذ الفيديو أو نطاق المنفذ (الأدنى – الأقصى)</string>
-  <string name="pref_audio_port_description">منفذ الصوت أو نطاق المنفذ (الأدنى – الأقصى)</string>
-  <string name="pref_media_encryption">وسيط التعمية</string>
-  <string name="pref_push_notification">تشغيل إشعارات التنبيه</string>
-  <string name="pref_ipv6_title">رخِّصْ IPv6</string>
-  <!--Advanced settings-->
-  <string name="pref_advanced_title">متقدم</string>
-  <string name="pref_debug">التنقيح</string>
-  <string name="pref_background_mode">وضع الخلفية</string>
-  <string name="pref_animation_enable_title">تشغيل التحريكات</string>
-  <string name="pref_autostart">البدء خلال الإقلاع</string>
-  <string name="pref_incoming_call_timeout_title">مهلة الانتظار قبل رفض المكالمة (بالثواني)</string>
-  <string name="pref_image_sharing_server_title">خادم المشاركة</string>
-  <string name="pref_remote_provisioning_title">التهيئة عن بعد</string>
-  <string name="pref_primary_account_title">الحساب اﻷوَّلي</string>
-  <string name="pref_display_name_title">الإسم المعروض</string>
-  <string name="pref_user_name_title">إسم المستخدم</string>
-  <!--Audio hack settings-->
-  <string name="pref_audio_hacks_title">تطويعات الصوت</string>
-  <string name="pref_audio_use_specific_mode_title">استخدم وضع محددا للتطويع</string>
-  <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (افتراضي)، 2=MODE_IN_CALL</string>
-  <string name="pref_audio_hacks_use_routing_api_title">استخدم تطويعات API التوجيه</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">استخدم تطويعات الصوت لـ Galaxy S</string>
-  <!--Content description-->
-  <string name="content_description_back">الرجوع</string>
-  <string name="content_description_dialer">لوحة المفاتيح</string>
-  <string name="content_description_toggle_micro">تبديل الميكروفون</string>
-  <string name="content_description_toggle_speaker">تبديل مكبر الصوت</string>
-  <string name="content_description_decline">رفض</string>
-  <string name="content_description_hang_up">ضع السماعة</string>
-  <string name="content_description_accept">قبول</string>
-  <string name="content_description_edit">تحرير</string>
-  <string name="content_description_add_contact">إضافة إلى جهات الاتصال</string>
-  <string name="content_description_new_contact">جهة اتصال جديدة</string>
-  <string name="content_description_call">مكالمة</string>
-  <string name="content_description_backspace">مسافة</string>
-  <string name="content_description_chat">المحادثة</string>
-  <string name="content_description_dial_back">إعادة الاتصال</string>
-  <string name="content_description_contact_picture">صورة جهة الاتصال</string>
-  <string name="content_description_send_message">إرسال رسالة</string>
-  <string name="content_description_detail">التفاصيل</string>
-  <string name="content_description_delete">حذف</string>
-  <string name="content_description_add">إضافة مكالمة</string>
-  <string name="content_description_new_discussion">محادثة جديدة</string>
-  <string name="content_description_search">بحث</string>
-  <string name="content_description_all_contacts">كل جهات الاتصال</string>
-  <string name="content_description_linphone_contacts">جهات اتصال Linphone</string>
-  <string name="content_description_call_direction">اتجاه الاتصال</string>
-  <string name="content_description_all_calls">كل المكالمات</string>
-  <string name="content_description_missed_calls">المكالمات الفائتة</string>
-  <string name="content_description_switch_video">تبديل الفيديو</string>
-  <string name="content_description_add_call">إضافة مكالمة</string>
-  <string name="content_description_pause">توقيف مؤقت</string>
-  <string name="content_description_numpad">لوحة الأرقام</string>
-  <string name="content_description_history">زر التاريخ</string>
-  <string name="content_description_chat_button">زر المحادثات</string>
-  <string name="content_description_contacts">رز جهات الاتصال</string>
-  <string name="content_description_call_quality">جودة المكالمة</string>
-  <string name="content_description_encryption">التعمية</string>
-  <string name="content_description_switch_camera">تبديل الكاميرا</string>
-  <string name="content_description_cancel_button">زر الإلغاء</string>
-  <string name="content_description_message_status">حالة الرسالة</string>
-  <string name="content_description_conference">اجتماع</string>
-  <string name="content_description_default_account">الحساب الافتراضي</string>
-  <string name="content_description_contact_first_name">اﻹسم</string>
-  <string name="content_description_contact_last_name">اللقب</string>
-  <string name="content_description_transfer">تحويل</string>
-  <string name="content_description_bluetooth">بلوتوث</string>
-</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
deleted file mode 100644
index b9a9e73a3..000000000
--- a/res/values-de/strings.xml
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Custom-->
-  <string name="app_name">Linphone</string>
-  <string name="service_name">Linphone-Dienst</string>
-  <string name="addressbook_label">Linphone</string>
-  <string name="notification_title">Linphone</string>
-  <string name="wait_dialog_text">Startvorgang</string>
-  <string name="tunnel_host"></string>
-  <!--Common-->
-  <string name="username">Benutzername</string>
-  <string name="display_name">Anzeigename</string>
-  <string name="password">Passwort</string>
-  <string name="delete">Löschen</string>
-  <string name="retry">Erneut versuchen</string>
-  <string name="cancel">Abbrechen</string>
-  <string name="accept">Annehmen</string>
-  <string name="continue_text">Fortsetzen</string>
-  <string name="about">Über</string>
-  <string name="deny">Verweigern</string>
-  <string name="search">Suchen</string>
-  <string name="outgoing">Ausgehend</string>
-  <string name="incoming">Eingehend</string>
-  <string name="missed">Verpasst</string>
-  <string name="settings">Einstellungen</string>
-  <string name="decline">Ablehnen</string>
-  <string name="conference">Konferenz</string>
-  <!--Launch screen-->
-  <!--Assistant-->
-  <string name="assistant_welcome_desc">Dieser Assistent wird Ihnen dabei helfen, ein SIP-Konto für Ihre Anrufe zu verwenden.</string>
-  <string name="transport">Transport</string>
-  <string name="assistant_account_not_validated">Ihr Konto wurde noch nicht überprüft.</string>
-  <string name="assistant_account_validated">Ihr Konto wurde überprüft.</string>
-  <string name="wizard_failed">Es ist ein Fehler aufgetreten, versuchen Sie es später nochmal</string>
-  <string name="wizard_username_unavailable">Der Benutzername wird bereits verwendet.</string>
-  <string name="first_launch_no_login_password">Bitte geben Sie Ihren Benutzername und Ihr Passwort ein</string>
-  <!--Dailer-->
-  <!--History-->
-  <string name="today">Heute</string>
-  <string name="yesterday">Gestern</string>
-  <!--Contacts-->
-  <string name="no_contact">Kein Kontakt in Ihrem Adressbuch.</string>
-  <string name="no_sip_contact">Kein SIP-Kontakt in Ihrem Adressbuch.</string>
-  <string name="sip_address">SIP-Adresse</string>
-  <string name="phone_number">Telefonnummer</string>
-  <string name="contact_first_name">Vorname</string>
-  <string name="contact_last_name">Nachname</string>
-  <!--Chat-->
-  <string name="remote_composing">Partner schreibt...</string>
-  <string name="share_picture_size_small">Klein</string>
-  <string name="share_picture_size_medium">Mittel</string>
-  <string name="share_picture_size_large">Groß</string>
-  <string name="share_picture_size_real">Echte Größe</string>
-  <string name="text_copied_to_clipboard">Text in die Zwischenablage kopiert</string>
-  <string name="copy_text">Kopiere Text</string>
-  <string name="image_picker_title">Wähle Quelle</string>
-  <string name="image_saved">Bild gespeichert</string>
-  <string name="image_not_saved">Fehler, Bild nicht gespeichert</string>
-  <string name="wait">Bitte warten...</string>
-  <string name="processing_image">Bild wird verarbeitet. Je nach Größe der Datei kann dies mehrere Sekunden in Anspruch nehmen</string>
-  <!--Status Bar-->
-  <string name="status_connected">Registriert</string>
-  <string name="status_in_progress">Registrierung in Arbeit</string>
-  <string name="status_error">Registierung fehlgeschlagen</string>
-  <string name="voicemail_unread">ungelesene Nachrichten</string>
-  <!--Side Menu-->
-  <string name="menu_settings">Einstellungen</string>
-  <string name="menu_about">Über</string>
-  <!--Call-->
-  <string name="unknown_incoming_call_name">Unbekannt</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-Bandbreite:</string>
-  <string name="call_stats_download">Download-Bandbreite:</string>
-  <string name="call_stats_ice">ICE-Konnektivität:</string>
-  <string name="call_stats_video_resolution">Videogröße:</string>
-  <string name="call">Anruf</string>
-  <!--About-->
-  <string name="menu_send_log">Protokoll senden</string>
-  <string name="menu_reset_log">Protokoll zurücksetzen</string>
-  <!--Service-->
-  <string name="incall_notif_active">Anruf fortsetzen</string>
-  <string name="incall_notif_paused">Pausierten Anruf fortsetzen</string>
-  <string name="incall_notif_video">Video-Anruf fortsetzen</string>
-  <string name="notification_started">begonnen</string>
-  <string name="unread_messages">%i ungelesene Nachrichten</string>
-  <!--Errors-->
-  <string name="skipable_error_service_not_ready">Warnung: Dienst ist nicht bereit</string>
-  <string name="error">Fehler</string>
-  <string name="error_unknown">Unbekannter Fehler</string>
-  <string name="error_call_declined">Anruf abgelehnt</string>
-  <string name="error_user_not_found">Benutzer nicht gefunden</string>
-  <string name="error_incompatible_media">Inkompatible Medienparameter</string>
-  <string name="error_network_unreachable">Netzwerk ist nicht erreichbar</string>
-  <string name="error_bad_credentials">Falsche Anmeldedaten</string>
-  <string name="error_unauthorized">Unzulässig</string>
-  <string name="error_io_error">Netzwerkfehler</string>
-  <string name="remote_provisioning_failure">Fehler beim Herunterladen oder Anwenden des Fernbereitstellungsprofils...</string>
-  <string name="remote_provisioning_again_title">Fernbereitstellung</string>
-  <!--Account Settings-->
-  <string name="pref_sipaccount">SIP-Konto</string>
-  <string name="pref_manage_title">Verwalten</string>
-  <string name="pref_disable_account">Deaktivieren</string>
-  <string name="pref_proxy">Proxy</string>
-  <string name="pref_domain">Domain*</string>
-  <string name="pref_passwd">Passwort*</string>
-  <string name="pref_username">Benutzername*</string>
-  <string name="pref_enable_outbound_proxy">Ausgehender Proxy</string>
-  <string name="pref_help_proxy">SIP-Proxy-Hostname oder IP-Adresse (optional)</string>
-  <string name="pref_help_outbound_proxy">Alle Anrufe üder einen SIP Proxy leiten</string>
-  <string name="pref_help_username">Beispiel: John, wenn ihr Konto john@sip.example.org ist</string>
-  <string name="pref_help_domain">sip.example.org, wenn Ihr Konto john@sip.example.org ist</string>
-  <string name="pref_help_password">Sie müssen Ihr Passwort erneut eingeben, wenn Sie Ihren Benutzernamen und/oder Domain ändern</string>
-  <string name="pref_expire_title">Ablaufen</string>
-  <string name="pref_avpf">AVPF</string>
-  <string name="pref_avpf_rr_interval"> AVPF Standard RTCP Interval in Sekunden (zwischen 1 und 5)</string>
-  <string name="pref_escape_plus">Ersetzen + durch 00</string>
-  <string name="pref_auth_userid">Authentifizierungs-Benutzerkennung</string>
-  <string name="pref_display_name">Anzeigename</string>
-  <string name="pref_prefix">Präfix</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">Konto löschen</string>
-  <string name="pref_default_account">Als Standard benutzen</string>
-  <!--Settings-->
-  <string name="pref_sipaccounts">SIP-Konten</string>
-  <string name="default_account_flag">Standardkonto</string>
-  <string name="pref_add_account">Konto hinzufügen</string>
-  <string name="pref_tunnel">Tunnel</string>
-  <string name="pref_tunnel_host">Hostname</string>
-  <string name="pref_tunnel_port">Port</string>
-  <string name="pref_tunnel_mode">Modus</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string-array name="tunnel_mode_entries">
-    <item>deaktiviert</item>
-    <item>nur 3G</item>
-    <item>immer</item>
-    <item>auto</item>
-  </string-array>
-  <string name="pref_none">Keine</string>
-  <string name="pref_preferences_title">Einstellungen</string>
-  <string name="pref_video_enable_title">Video aktivieren</string>
-  <!--Audio settings-->
-  <string name="pref_audio_title">Audio</string>
-  <string name="pref_echo_cancellation">Echounterdrückung</string>
-  <string name="pref_echo_cancellation_summary">Entfernt das Echo, das am anderen Ende gehört wird</string>
-  <string name="ec_calibrating">Kalibrierung...</string>
-  <string name="no_echo">Kein Echo</string>
-  <string name="failed">fehlgeschlagen</string>
-  <string name="pref_adaptive_rate_control">Adaptive Ratenregelung</string>
-  <string name="pref_codec_bitrate_limit">Codec-Bitratenbegrenzung</string>
-  <string name="pref_codecs">Codecs</string>
-  <!--Video settings-->
-  <string name="pref_video_title">Video</string>
-  <string name="pref_video_use_front_camera_title">Frontkamera benutzen</string>
-  <string name="pref_video_initiate_call_with_video_title">Videoanrufe starten</string>
-  <string name="pref_video_initiate_call_with_video">Immer Videoanfragen senden</string>
-  <string name="pref_video_automatically_accept_video_title">Eingehende Videoanfragen annehmen</string>
-  <string name="pref_video_automatically_accept_video">Videoanfragen immer annehmen</string>
-  <string name="pref_preferred_video_size">Bevorzugte Videogröße</string>
-  <string name="pref_bandwidth_limit">Bandbreitenbegrenzung in kbits/s</string>
-  <string name="pref_video_codecs_title">Codecs</string>
-  <!--Call settings-->
-  <string name="pref_call_title">Anruf</string>
-  <string name="pref_rfc2833_dtmf">RFC2833 DTMFs senden</string>
-  <string name="pref_sipinfo_dtmf">SIP INFO DTMFs senden</string>
-  <!--Network settings-->
-  <string name="pref_network_title">Netzwerk</string>
-  <string name="pref_stun_server">Stun-Server</string>
-  <string name="pref_ice_enable">ICE aktivieren</string>
-  <string name="pref_upnp_enable">UPNP aktivieren</string>
-  <string name="pref_transport_use_random_ports">Zufällige Ports verwenden</string>
-  <string name="pref_sip_port_title">Zu benutzender SIP-Port</string>
-  <string name="pref_video_port_title">Videoport oder Portbereich</string>
-  <string name="pref_audio_port_title">Audioport oder Portbereich</string>
-  <string name="pref_video_port_description">Videoport oder Portbereich (Min.Port-Max.Port)</string>
-  <string name="pref_audio_port_description">Audioport oder Portbereich (Min.Port-Max.Port)</string>
-  <string name="pref_media_encryption">Medienverschlüsselung</string>
-  <string name="pref_push_notification">Push-Benachrichtigungen aktivieren</string>
-  <!--Advanced settings-->
-  <string name="pref_advanced_title">Erweitert</string>
-  <string name="pref_debug">Debug</string>
-  <string name="pref_background_mode">Hintergrundmodus</string>
-  <string name="pref_animation_enable_title">Animationen aktivieren</string>
-  <string name="pref_autostart">Beim Einschalten starten</string>
-  <string name="pref_remote_provisioning_title">Fernbereitstellung</string>
-  <string name="pref_primary_account_title">Primäres Konto</string>
-  <string name="pref_display_name_title">Anzeigename</string>
-  <string name="pref_user_name_title">Benutzername</string>
-  <!--Audio hack settings-->
-  <string name="pref_audio_hacks_title">Audio Hacks</string>
-  <string name="pref_audio_use_specific_mode_title">Speziellen Modus Hack verwenden</string>
-  <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (Standard), 2=MODE_IN_CALL</string>
-  <string name="pref_audio_hacks_use_routing_api_title">Routing-API-Hack verwenden</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">Galaxy-S-Audio-Hack verwenden</string>
-  <!--Content description-->
-  <string name="content_description_back">Zurück</string>
-  <string name="content_description_dialer">Wählgerät</string>
-  <string name="content_description_toggle_micro">Mikrofon umschalten</string>
-  <string name="content_description_toggle_speaker">Lautsprecher umschalten</string>
-  <string name="content_description_decline">Ablehnen</string>
-  <string name="content_description_hang_up">Auflegen</string>
-  <string name="content_description_accept">Annehmen</string>
-  <string name="content_description_edit">Ändern</string>
-  <string name="content_description_add_contact">Zu Kontakten hinzufügen</string>
-  <string name="content_description_new_contact">Neuer Kontakt</string>
-  <string name="content_description_call">Call</string>
-  <string name="content_description_backspace">Zurückschalten</string>
-  <string name="content_description_chat">Nachrichten</string>
-  <string name="content_description_dial_back">Zurückrufen</string>
-  <string name="content_description_contact_picture">Kontaktbild</string>
-  <string name="content_description_send_message">Nachricht senden</string>
-  <string name="content_description_delete">Löschen</string>
-  <string name="content_description_add">Anruf hinzufügen</string>
-  <string name="content_description_new_discussion">Neue Diskussion</string>
-  <string name="content_description_search">Suchen</string>
-  <string name="content_description_all_contacts">Alle Kontakte</string>
-  <string name="content_description_linphone_contacts">Linphone-Kontakte</string>
-  <string name="content_description_call_direction">Anrufrichtung</string>
-  <string name="content_description_all_calls">Alle Anrufe</string>
-  <string name="content_description_missed_calls">Verpasste Anrufe</string>
-  <string name="content_description_switch_video">Video umschalten</string>
-  <string name="content_description_add_call">Anruf hinzufügen</string>
-  <string name="content_description_pause">Pause</string>
-  <string name="content_description_numpad">Nummernblock</string>
-  <string name="content_description_history">Schaltfläche Verlauf</string>
-  <string name="content_description_chat_button">Schaltfläche Chat</string>
-  <string name="content_description_contacts">Schaltfläche Kontakte</string>
-  <string name="content_description_call_quality">Anrufqualität</string>
-  <string name="content_description_encryption">Verschlüsselung</string>
-  <string name="content_description_switch_camera">Kamera umschalten</string>
-  <string name="content_description_cancel_button">Schaltfläche Abbrechen</string>
-  <string name="content_description_message_status">Nachrichtenstatus</string>
-  <string name="content_description_conference">Konferenz</string>
-  <string name="content_description_default_account">Standardkonto</string>
-  <string name="content_description_contact_first_name">Vorname</string>
-  <string name="content_description_contact_last_name">Nachname</string>
-  <string name="content_description_transfer">Weiterleiten</string>
-  <string name="content_description_bluetooth">Bluetooth</string>
-</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
deleted file mode 100644
index bff343ed5..000000000
--- a/res/values-es/strings.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--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">Iniciando</string>
-  <string name="tunnel_host"></string>
-  <!--Common-->
-  <string name="username">Nombre de usuario</string>
-  <string name="display_name">Nombre a mostrar</string>
-  <string name="password">Contraseña</string>
-  <string name="delete">Borrar</string>
-  <string name="retry">Reintentar</string>
-  <string name="cancel">Cancelar</string>
-  <string name="accept">Aceptar</string>
-  <string name="continue_text">Continuar</string>
-  <string name="deny">Rechazar</string>
-  <string name="search">Buscar</string>
-  <string name="outgoing">Saliente</string>
-  <string name="incoming">Entrante</string>
-  <string name="settings">Configuración</string>
-  <string name="decline">Declinar</string>
-  <string name="conference">Conferencia</string>
-  <!--Launch screen-->
-  <!--Assistant-->
-  <string name="assistant_welcome_desc">Este asistente te ayudará a usar una cuanta SIP para tus llamadas.</string>
-  <string name="transport">Transporte</string>
-  <string name="assistant_account_not_validated">Su cuenta aún no ha sido verificada.</string>
-  <string name="assistant_account_validated">Su cuenta ha sido verificada.</string>
-  <string name="wizard_failed">Ha ocurrido un error, pruebe más tarde.</string>
-  <string name="wizard_username_unavailable">Este nombre de usuario está en uso.</string>
-  <string name="first_launch_no_login_password">Por favor, introduzca su usuario y contraseña</string>
-  <!--Dailer-->
-  <!--History-->
-  <string name="today">Hoy</string>
-  <string name="yesterday">Ayer</string>
-  <!--Contacts-->
-  <string name="no_contact">No hay contactos en su agenda de contactos.</string>
-  <string name="no_sip_contact">No hay contactos SIP en su agenda de contactos.</string>
-  <string name="sip_address">Dirección SIP</string>
-  <string name="phone_number">Número de teléfono</string>
-  <string name="contact_first_name">Nombre</string>
-  <string name="contact_last_name">Apellido</string>
-  <!--Chat-->
-  <string name="share_picture_size_small">Pequeño</string>
-  <string name="share_picture_size_medium">Mediano</string>
-  <string name="share_picture_size_large">Grande</string>
-  <string name="share_picture_size_real">Tamaño real</string>
-  <string name="text_copied_to_clipboard">Texto copiado al portapapeles</string>
-  <string name="copy_text">Copiar texto</string>
-  <string name="image_picker_title">Seleccionar fuente</string>
-  <string name="image_saved">Imagen guardada</string>
-  <string name="image_not_saved">Error, imagen no guardada</string>
-  <string name="wait">Por favor, espere...</string>
-  <!--Status Bar-->
-  <string name="status_connected">Registrado</string>
-  <string name="status_in_progress">Registrando</string>
-  <string name="status_error">Fallo al registrar</string>
-  <string name="voicemail_unread">mensajes sin leer</string>
-  <!--Side Menu-->
-  <string name="menu_settings">Configuración</string>
-  <!--Call-->
-  <string name="unknown_incoming_call_name">Desconocido</string>
-  <string name="call_stats_audio">Audio</string>
-  <string name="call_stats_video">Vídeo</string>
-  <string name="call_stats_codec">Codec:</string>
-  <string name="call_stats_upload">Ancho de banda de subida:</string>
-  <string name="call_stats_download">Ancho de banda de bajada:</string>
-  <string name="call_stats_ice">Conectividad ICE</string>
-  <string name="call_stats_video_resolution">Tamaño de vídeo:</string>
-  <string name="call">Llamar</string>
-  <!--About-->
-  <string name="menu_send_log">Enviar registro</string>
-  <string name="menu_reset_log">Reiniciar registro</string>
-  <!--Service-->
-  <string name="incall_notif_active">Llamada saliente</string>
-  <string name="incall_notif_paused">Llamada saliente pausada</string>
-  <string name="incall_notif_video">Captura de vídeo saliente</string>
-  <string name="notification_started">iniciado</string>
-  <!--Errors-->
-  <string name="skipable_error_service_not_ready">Aviso: el servicio no está preparado</string>
-  <string name="error">Error</string>
-  <string name="error_unknown">Error desconocido</string>
-  <string name="error_call_declined">Llamada rechazada</string>
-  <string name="error_user_not_found">Usuario no encontrado</string>
-  <string name="error_network_unreachable">Red inalcanzable</string>
-  <string name="error_unauthorized">No autorizado</string>
-  <string name="error_io_error">Error de red</string>
-  <!--Account Settings-->
-  <string name="pref_sipaccount">Cuenta SIP</string>
-  <string name="pref_disable_account">Deshabilitar</string>
-  <string name="pref_proxy">Proxy</string>
-  <string name="pref_domain">Dominio*</string>
-  <string name="pref_passwd">Contraseña*</string>
-  <string name="pref_username">Nombre de usuario*</string>
-  <string name="pref_enable_outbound_proxy">Proxy saliente</string>
-  <string name="pref_help_username">Ejemplo: john si tu cuenta es john@sip.example.org</string>
-  <string name="pref_help_domain">sip.example.org si su cuenta es john@sip.example.org</string>
-  <string name="pref_avpf">AVPF</string>
-  <string name="pref_escape_plus">Sustituir + por 00</string>
-  <string name="pref_display_name">Nombre a mostrar</string>
-  <string name="pref_prefix">Prefijo</string>
-  <string name="pref_transport">Transporte</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">Borrar ésta cuenta</string>
-  <string name="pref_default_account">Usar como predeterminada</string>
-  <!--Settings-->
-  <string name="pref_sipaccounts">Cuentas SIP</string>
-  <string name="default_account_flag">Cuenta por defecto</string>
-  <string name="pref_add_account">Añadir cuenta</string>
-  <string name="pref_tunnel">Túnel</string>
-  <string name="pref_tunnel_port">Puerto</string>
-  <string name="pref_tunnel_mode">Modo</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string-array name="tunnel_mode_entries">
-    <item>deshabilitado</item>
-    <item>sólo 3G</item>
-    <item>siempre</item>
-    <item>auto</item>
-  </string-array>
-  <string name="pref_none">Ninguno.</string>
-  <string name="pref_preferences_title">Preferencias</string>
-  <string name="pref_video_enable_title">Habilitar Vídeo</string>
-  <!--Audio settings-->
-  <string name="pref_audio_title">Audio</string>
-  <string name="pref_echo_cancellation">Cancelación de eco</string>
-  <string name="ec_calibrating">Calibrando...</string>
-  <string name="failed">fallo</string>
-  <string name="pref_codecs">Codecs</string>
-  <!--Video settings-->
-  <string name="pref_video_title">Vídeo</string>
-  <string name="pref_video_use_front_camera_title">Usar cámara frontal</string>
-  <string name="pref_video_initiate_call_with_video_title">Iniciar videollamadas</string>
-  <string name="pref_video_initiate_call_with_video">Siempre enviar peticiones de vídeo</string>
-  <string name="pref_video_automatically_accept_video_title">Aceptar peticiones de vídeo entrantes</string>
-  <string name="pref_video_automatically_accept_video">Aceptar peticiones de vídeo siempre</string>
-  <string name="pref_preferred_video_size">Tamaño de vídeo preferido</string>
-  <string name="pref_bandwidth_limit">Limite de ancho de banda en kbits/s</string>
-  <string name="pref_video_codecs_title">Codecs</string>
-  <!--Call settings-->
-  <string name="pref_call_title">Llamar</string>
-  <string name="pref_rfc2833_dtmf">Enviar DTMS RFC2833</string>
-  <!--Network settings-->
-  <string name="pref_network_title">Red</string>
-  <string name="pref_stun_server">Servidor STUN</string>
-  <string name="pref_ice_enable">Activar ICE</string>
-  <string name="pref_transport_use_random_ports">Usar puertos aleatorios</string>
-  <string name="pref_sip_port_title">Puerto SIP a usar</string>
-  <string name="pref_video_port_title">Puerto (o rango) para vídeo</string>
-  <string name="pref_audio_port_title">Puerto (o rango) para audio</string>
-  <string name="pref_push_notification">Activar notificaciones push</string>
-  <!--Advanced settings-->
-  <string name="pref_advanced_title">Avanzado</string>
-  <string name="pref_debug">Desarrollo</string>
-  <string name="pref_animation_enable_title">Habilitar animaciones</string>
-  <string name="pref_autostart">Arrancar al inicio</string>
-  <string name="pref_primary_account_title">Cuenta principal</string>
-  <string name="pref_display_name_title">Nombre a mostrar</string>
-  <string name="pref_user_name_title">Nombre de usuario</string>
-  <!--Audio hack settings-->
-  <string name="pref_audio_hacks_title">Trucos de audio</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">Usar truco para Galaxy S </string>
-  <!--Content description-->
-  <string name="content_description_back">Atras</string>
-  <string name="content_description_dialer">Marcador</string>
-  <string name="content_description_toggle_micro">Conmutar micrófono</string>
-  <string name="content_description_toggle_speaker">Conmutar altavoz</string>
-  <string name="content_description_decline">Declinar</string>
-  <string name="content_description_hang_up">Colgar</string>
-  <string name="content_description_accept">Aceptar</string>
-  <string name="content_description_edit">Editar</string>
-  <string name="content_description_add_contact">Añadir a contactos</string>
-  <string name="content_description_new_contact">Contacto nuevo</string>
-  <string name="content_description_call">Llamar</string>
-  <string name="content_description_chat">Chat</string>
-  <string name="content_description_dial_back">Devolver llamada</string>
-  <string name="content_description_contact_picture">Imagen de contacto</string>
-  <string name="content_description_send_message">Enviar mensaje</string>
-  <string name="content_description_delete">Borrar</string>
-  <string name="content_description_add">Añadir llamada</string>
-  <string name="content_description_search">Buscar</string>
-  <string name="content_description_all_contacts">Todos los contactos</string>
-  <string name="content_description_linphone_contacts">Contactos de Linphone</string>
-  <string name="content_description_all_calls">Todas las llamadas</string>
-  <string name="content_description_missed_calls">Llamadas perdidas</string>
-  <string name="content_description_switch_video">Conmutar vídeo</string>
-  <string name="content_description_add_call">Añadir llamada</string>
-  <string name="content_description_pause">Pausar</string>
-  <string name="content_description_numpad">Teclado numerico</string>
-  <string name="content_description_call_quality">Calidad de la llamada</string>
-  <string name="content_description_conference">Conferencia</string>
-  <string name="content_description_default_account">Cuenta por defecto</string>
-  <string name="content_description_contact_first_name">Nombre</string>
-  <string name="content_description_contact_last_name">Apellido</string>
-  <string name="content_description_transfer">Transferir</string>
-  <string name="content_description_bluetooth">Bluetooth</string>
-</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
deleted file mode 100644
index 0462a2b48..000000000
--- a/res/values-fi/strings.xml
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Custom-->
-  <string name="app_name">Linphone</string>
-  <string name="service_name">Linphone Palvelin</string>
-  <string name="addressbook_label">Linphone</string>
-  <string name="notification_title">Linphone</string>
-  <string name="wait_dialog_text">Käynnistetään</string>
-  <string name="notification_registered">Rekisteröity kohteeseen %s</string>
-  <string name="notification_register_failure">Epäonnistui rekisteröidä kohteeseen %s</string>
-  <string name="tunnel_host"></string>
-  <!--Common-->
-  <string name="username">Käyttäjätunnus</string>
-  <string name="display_name">Näytä nimi</string>
-  <string name="password">Salasana</string>
-  <string name="confirm_password">Salasanan vahvistus</string>
-  <string name="domain">Domain eli verkkotunnus</string>
-  <string name="remote_provisioning_url">Url eli verkko-osoite</string>
-  <string name="email">Sähköposti</string>
-  <string name="delete_text">Haluatko varmasti poistaa sinun valintasi?</string>
-  <string name="delete">Poista</string>
-  <string name="retry">Uudelleen yritä</string>
-  <string name="cancel">Peruuta</string>
-  <string name="accept">Hyväksy</string>
-  <string name="continue_text">Jatka</string>
-  <string name="about">Tietoja</string>
-  <string name="deny">Hylkää</string>
-  <string name="no_account">Tiliä ei ole muokattu</string>
-  <string name="search">Hae</string>
-  <string name="outgoing">Lähtevä</string>
-  <string name="incoming">Saapuva</string>
-  <string name="missed">Vastaamaton</string>
-  <string name="settings">Asetukset</string>
-  <string name="connect">Yhteys</string>
-  <string name="decline">Hylkää</string>
-  <string name="conference">Kokous</string>
-  <!--Launch screen-->
-  <!--Assistant-->
-  <string name="welcome">Tervetuloa</string>
-  <string name="assistant">Avustaja</string>
-  <string name="assistant_create_account">Luo tili</string>
-  <string name="assistant_validate_account">Antamaasi osoitteeseen on lähetetty sähköposti. Avaa viestiss oleva linkki aktivoidaksesi tilin. Kun olet valmis, palaa ja paina painiketta.</string>
-  <string name="assistant_welcome_desc">Tämä avustaja auttaa sinua käyttämään SIP tiliä puheluissasi.</string>
-  <string name="assistant_linphone_login_desc">Anna linphone.org tilisi käyttäjätunnus ja salasana</string>
-  <string name="assistant_login_desc">Anna sinun käyttäjätunnus ja salasana ja SIP verkkotunnus eli domain</string>
-  <string name="assistant_remote_provisioning_desc">Anna puhelun yhteyden luomistietojen url-osoite</string>
-  <string name="transport">Siirrä</string>
-  <string name="assistant_login_linphone">Käytä Linphone tiliä</string>
-  <string name="assistant_login_generic">Käytä SIP tiliä</string>
-  <string name="assistant_remote_provisioning">Hae etäsäädöt</string>
-  <string name="assistant_create_account_part_1">1/2</string>
-  <string name="assistant_create_account_part_2">2/2</string>
-  <string name="assistant_display_name_optional">Näyttö nimi (vainnainen)</string>
-  <string name="assistant_linphone_account">Muokkaa Linphone tiliä</string>
-  <string name="assistant_generic_account">Muokkaa SIP tiliä</string>
-  <string name="assistant_remote_provisioning_title">Hae etäsäädöt</string>
-  <string name="assistant_fetch_apply">Hae ja käytä</string>
-  <string name="assistant_login">Kirjaudu sisään</string>
-  <string name="assistant_ec_calibration">Kaiun estoa kalibroidaan</string>
-  <string name="assistant_remote_provisioning_login">Anna käyttäjätunnus ja salasana</string>
-  <string name="assistant_account_not_validated">Tiliäsi ei ole vielä vahvistettu.</string>
-  <string name="assistant_account_validated">Tilisi on vahvistettu.</string>
-  <string name="assistant_error_bad_credentials">Väärä käyttäjätunnus tai salasana</string>
-  <string name="wizard_failed">Tapahtui virhe, yritä uudelleen myöhemmin.</string>
-  <string name="wizard_server_unavailable">Palvelin tavoittamattomissa, tarkista internet yhteytesi.</string>
-  <string name="wizard_username_unavailable">Tämä käyttäjätunnus on jo käytössä.</string>
-  <string name="wizard_username_incorrect">Sinun käyttäjätunnus ei ole kelvollinen.</string>
-  <string name="wizard_email_incorrect">Sähkpostisi ei ole kelvollinen.</string>
-  <string name="wizard_passwords_unmatched">Antamasi salasanat ovat erillaiset.</string>
-  <string name="setup_confirm_username">Sinun käyttäjätunnus tulee olemaan %s.\r\n\r\nIt voiden muuttua, jotta vaatiukset täyttyisivät .\r\nHyväksytkö?</string>
-  <string name="first_launch_no_login_password">Anna käyttäjätunnus ja salasana</string>
-  <!--Dailer-->
-  <string name="address_bar_hint">Anna numero tai osoite</string>
-  <!--History-->
-  <string name="no_call_history">Puheluita ei ole ollut</string>
-  <string name="no_missed_call_history">Ei vastaamattomia puheluita</string>
-  <string name="delete_history_log">Haluatko poistaa valitun historian?</string>
-  <string name="today">Tänään</string>
-  <string name="yesterday">Eilen</string>
-  <!--Contacts-->
-  <string name="no_contact">Osoitekirjassasi ei ole yhteystietoja.</string>
-  <string name="no_sip_contact">Osoitekirjassasi ei ole SIP yhteystietoja.</string>
-  <string name="delete_contacts">Haluatko poistaa valitun yhteystiedon?</string>
-  <string name="delete_contact">Haluatko poistaa valitun yhteystiedon?</string>
-  <string name="sip_address">SIP osoite</string>
-  <string name="phone_number">Puhelin numero</string>
-  <string name="contact_first_name">Etunimi</string>
-  <string name="contact_last_name">Sukunimi</string>
-  <!--Chat-->
-  <string name="no_chat_history">Ei keskusteluja</string>
-  <string name="delete_conversation">Haluatko poistaa valitut keskustelut?</string>
-  <string name="delete_message">Haluatko oistaa valitut viestit?</string>
-  <string name="remote_composing">Vastapuoli kirjoittaa...</string>
-  <string name="share_picture_size_small">Pieni</string>
-  <string name="share_picture_size_medium">Keskikokoinen</string>
-  <string name="share_picture_size_large">Iso</string>
-  <string name="share_picture_size_real">Todellisen kokoinen</string>
-  <string name="text_copied_to_clipboard">Teksti kopiotu leikepydälle</string>
-  <string name="copy_text">Kopio teksti</string>
-  <string name="image_picker_title">Valitse lähde</string>
-  <string name="image_saved">Kuva tallennettu</string>
-  <string name="image_not_saved">Virhe, kuvaa ei tallennettu</string>
-  <string name="wait">Odota...</string>
-  <string name="processing_image">Käsittelee kuvaa, voi kestää muutamia sekuntteja tiedoston koosta riippuen</string>
-  <!--Status Bar-->
-  <string name="status_connected">Rekisteröity</string>
-  <string name="status_not_connected">Ei ole Rekisteröity</string>
-  <string name="status_in_progress">Rekisterityminen käynnissä</string>
-  <string name="status_error">Rekisterityminen epäonnistui</string>
-  <string name="voicemail_unread">lukemattomia viestejä</string>
-  <!--Side Menu-->
-  <string name="menu_assistant">Avustaja</string>
-  <string name="menu_settings">Asetukset</string>
-  <string name="menu_about">Tietoja</string>
-  <string name="quit">Lopeta</string>
-  <!--Call-->
-  <string name="incoming_call">tuleva puhelu</string>
-  <string name="outgoing_call">lähtevä puhelu</string>
-  <string name="add_video_dialog">Vastapuoli haluaisi että otat video kuvan käyttöön</string>
-  <string name="no_current_call">Ei aktiivisia puheluita</string>
-  <string name="call_paused_by_remote">Vastapuoli laittoi puhelun tauolle</string>
-  <string name="couldnt_accept_call">Virhe puhelua ottaessa</string>
-  <string name="zrtp_dialog">ZRTP avain on %s\nSinun pitää vain hyväksyä jos haluat saman avaimen kuin vastapuoli</string>
-  <string name="unknown_incoming_call_name">Tuntematon</string>
-  <string name="call_stats_audio">Ääni</string>
-  <string name="call_stats_video">Video</string>
-  <string name="call_stats_codec">Koodekki:</string>
-  <string name="call_stats_upload">Lähetyskaistanleveys:</string>
-  <string name="call_stats_download">Latauskaistanleveys:</string>
-  <string name="call_stats_ice">ICE yhdistettävyys:</string>
-  <string name="call_stats_video_resolution">Videon koko:</string>
-  <string name="call">Puhelu</string>
-  <!--About-->
-  <string name="menu_send_log">Lähetä loki</string>
-  <string name="menu_reset_log">Tyhjennä loki</string>
-  <!--Service-->
-  <string name="incall_notif_active">Äänellinen puhelu meneillään</string>
-  <string name="incall_notif_paused">Puhelu laitettu tauolle</string>
-  <string name="incall_notif_video">Video puhelu meneillään</string>
-  <string name="notification_started">aloitettu</string>
-  <string name="unread_messages">%i lukematonta viestiä</string>
-  <!--Errors-->
-  <string name="skipable_error_service_not_ready">Varoitus: palvelu ei ole vielä valmis</string>
-  <string name="error">Virhe</string>
-  <string name="warning_wrong_destination_address">%s osoitteeseen ei voi tehdä määränpäätä</string>
-  <string name="error_unknown">tuntematon virhe</string>
-  <string name="error_call_declined">Puhelu evätty</string>
-  <string name="error_user_not_found">Käyttäjää ei löydy</string>
-  <string name="error_incompatible_media">Epäsopivat media raja-arvot</string>
-  <string name="error_low_bandwidth">Vastapuolella on hidas internet yhteys, videota ei voi aloittaa</string>
-  <string name="error_network_unreachable">Verkko on tavoittamattomissa</string>
-  <string name="error_bad_credentials">Huonot kirjautumistiedot</string>
-  <string name="error_unauthorized">Luvaton</string>
-  <string name="error_io_error">Verkko virhe</string>
-  <string name="download_image_failed">Lataus epäonnistui. Pyydän tarkista internet yhteys tai yritä uudelleen.</string>
-  <string name="remote_provisioning_failure">Epäonnistui lataamaan tai hyvksymään vastapuolen tukiaseman tietoja...</string>
-  <string name="remote_provisioning_again_title">Vastapuoli hakee asetuksia</string>
-  <string name="remote_provisioning_again_message">Haluatko vaihtaa tukiaseman URI-osoitetta?</string>
-  <!--Account Settings-->
-  <string name="pref_sipaccount">SIP Tili</string>
-  <string name="pref_manage_title">Käsitellä</string>
-  <string name="pref_disable_account">Poissa käytöstä</string>
-  <string name="pref_proxy">Välitys palvelin</string>
-  <string name="pref_domain">Domain/verkkotunnus*</string>
-  <string name="pref_passwd">Salasana*</string>
-  <string name="pref_username">Käyttäjätunnus*</string>
-  <string name="pref_enable_outbound_proxy">Lähtevä välityspalvelin</string>
-  <string name="pref_help_proxy">SIP välityspalvelimen solmuntunnus tai ip osoite (valinnainen)</string>
-  <string name="pref_help_outbound_proxy">Lähetä kaikki puhelut SIP välityspalvelimen kautta</string>
-  <string name="pref_help_username">Esimerkki: jaakko jos tilisi on jaakko@sip.esimerkki.org</string>
-  <string name="pref_help_domain">sip.esimerkki.org jos tilisi on jaakko@sip.esimerkki.org</string>
-  <string name="pref_help_password">Sinun täytyy antaa uudelleen salasana jos muokkaat käyttäjätunnusta tai domainia eli verkkotunnusta</string>
-  <string name="pref_expire_title">Vanhentunut</string>
-  <string name="pref_avpf">AVPF</string>
-  <string name="pref_avpf_rr_interval">AVPF-\'media siirto\' tahdistuu RTCP-\'realiaikaisen tiedonsiirron\' (1-5) sekunnin välein</string>
-  <string name="pref_escape_plus">Korvaa + 00n toimesta</string>
-  <string name="pref_auth_userid">Todennuksen käyttäjätunnus</string>
-  <string name="pref_help_auth_userid">Anna tedennuksen käyttäjätunnus (valinnainen)</string>
-  <string name="pref_display_name">Näytä nimi</string>
-  <string name="pref_help_display_name">Anna näyttönimi (valinnainen)</string>
-  <string name="pref_prefix">Etuliite</string>
-  <string name="pref_transport">Siirrä</string>
-  <string name="pref_transport_udp">UDP \'siirto ilman yhteyttä\'</string>
-  <string name="pref_transport_tcp">TCP \'luotettu siirto tavuttain\'</string>
-  <string name="pref_transport_tls">TLS \'siirto SSL varmentimilla\'</string>
-  <string name="pref_delete_account">Poista tämä tili</string>
-  <string name="pref_default_account">Käytä vakiota</string>
-  <!--Settings-->
-  <string name="pref_sipaccounts">SIP Tilit</string>
-  <string name="default_account_flag">Vakio tili</string>
-  <string name="pref_add_account">Lisää tili</string>
-  <string name="pref_tunnel">Tunneli</string>
-  <string name="pref_tunnel_host">Hostname \'eli verkkotunnuksen etunimi\'</string>
-  <string name="pref_tunnel_port">Portti</string>
-  <string name="pref_tunnel_mode">Tila</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string-array name="tunnel_mode_entries">
-    <item>poissa käytöstä</item>
-    <item>vain 3G</item>
-    <item>aina</item>
-    <item>automaattinen</item>
-  </string-array>
-  <string name="pref_none">Ei mitään</string>
-  <string name="pref_preferences_title">Toivotut säädöt</string>
-  <string name="pref_video_enable_title">Salli video</string>
-  <!--Audio settings-->
-  <string name="pref_audio_title">Ääni</string>
-  <string name="pref_echo_cancellation">Kaiun poisto</string>
-  <string name="pref_echo_cancellation_summary">Poista kaiku joka kuullaan toisessa päässä</string>
-  <string name="pref_echo_canceller_calibration">Kaiun poistajan kalibrointi</string>
-  <string name="ec_calibrating">Kalibroi...</string>
-  <string name="ec_calibrated">Kalibroitu [%s ms]</string>
-  <string name="no_echo">Ei kaikua</string>
-  <string name="failed">epäonnistui</string>
-  <string name="pref_adaptive_rate_control">Mukautuva tason säätö</string>
-  <string name="pref_codec_bitrate_limit">Koodekin kaistaleveys rajoitus</string>
-  <string name="pref_codecs">Kodekit</string>
-  <!--Video settings-->
-  <string name="pref_video_title">Video</string>
-  <string name="pref_video_use_front_camera_title">Käytä etukameraa</string>
-  <string name="pref_video_initiate_call_with_video_title">Aloita puhelut videokuvapuheluina</string>
-  <string name="pref_video_initiate_call_with_video">Lähetä aina pyyntö videoon</string>
-  <string name="pref_video_automatically_accept_video_title">Hyväksy saapuvat video kuvan pyynnöt</string>
-  <string name="pref_video_automatically_accept_video">Hyväksy aina video kuvan pyynnöt</string>
-  <string name="pref_video_preset">Videon esiasetus</string>
-  <string name="pref_preferred_video_size">Toivottu videon koko</string>
-  <string name="pref_preferred_fps">Toivottu FPS \'kuvaa per sekuntti\'</string>
-  <string name="pref_bandwidth_limit">Kaistaleveys raja kbits/s</string>
-  <string name="pref_video_codecs_title">Kodekit</string>
-  <!--Call settings-->
-  <string name="pref_call_title">Puhelu</string>
-  <string name="pref_rfc2833_dtmf">Lähetä RFC2833 DTMFs</string>
-  <string name="pref_sipinfo_dtmf">Lähetä SIP INFO DTMFs</string>
-  <string name="pref_voice_mail">Ääni postin URI-osoite</string>
-  <!--Network settings-->
-  <string name="pref_network_title">Verkko</string>
-  <string name="pref_wifi_only">Käytä vain wifiä</string>
-  <string name="pref_stun_server">Stun-palvelin eli \'osoitteenmuunoksen takaisin haku\'-palvelin</string>
-  <string name="pref_ice_enable">Salli ICE</string>
-  <string name="pref_upnp_enable">Salli UPNP</string>
-  <string name="pref_transport_use_random_ports">Käytä satunnaista porttia</string>
-  <string name="pref_sip_port_title">SIP portti käytössä</string>
-  <string name="pref_video_port_title">Video portti tai portin alue</string>
-  <string name="pref_audio_port_title">Ääni portti tai portin alue</string>
-  <string name="pref_video_port_description">Video portti tai portin alue (pienin portti - suurin portti)</string>
-  <string name="pref_audio_port_description">Ääni portti tai portin alue (pienin portti - suurin portti)</string>
-  <string name="pref_media_encryption">Median salaus</string>
-  <string name="pref_push_notification">Salli painettavat ilmoitukset</string>
-  <string name="pref_ipv6_title">Salli IPv6</string>
-  <!--Advanced settings-->
-  <string name="pref_advanced_title">Kehittyneet</string>
-  <string name="pref_debug">Virheen korjaus</string>
-  <string name="pref_background_mode">Toimi taustalla</string>
-  <string name="pref_animation_enable_title">Salli animaatiot</string>
-  <string name="pref_autostart">Käynnistä laitteen käynnistyessä</string>
-  <string name="pref_incoming_call_timeout_title">Saapuva puhelu aikakatkaisu (sekunneissa)</string>
-  <string name="pref_image_sharing_server_title">Jaa palvelin</string>
-  <string name="pref_remote_provisioning_title">Vastapuoli hakee asetuksia</string>
-  <string name="pref_primary_account_title">Pääasiallinen tili</string>
-  <string name="pref_display_name_title">Näytä nimi</string>
-  <string name="pref_user_name_title">Käyttäjätunnus</string>
-  <!--Audio hack settings-->
-  <string name="pref_audio_hacks_title">Äänen miksaus</string>
-  <string name="pref_audio_use_specific_mode_title">Käytä tiettyä ääni tilaa</string>
-  <string name="pref_audio_use_specific_mode_summary">0=NORMAALI_TILA (vakio), 2=SOITTO_TILA</string>
-  <string name="pref_audio_hacks_use_routing_api_title">Käytä ohjaavaa API/\'ohjelmointi käskypohjan\' muunelmaa</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">Käytä Galaxy S ääni miksausta</string>
-  <!--Content description-->
-  <string name="content_description_back">Takaisin</string>
-  <string name="content_description_dialer">Soittaja</string>
-  <string name="content_description_toggle_micro">Kytke mikrofooni</string>
-  <string name="content_description_toggle_speaker">Kytke kaiutin</string>
-  <string name="content_description_decline">Hylkää</string>
-  <string name="content_description_hang_up">Katkaise puhelu</string>
-  <string name="content_description_accept">Hyväksy</string>
-  <string name="content_description_edit">Muokkaa</string>
-  <string name="content_description_add_contact">Lisää kontrastia</string>
-  <string name="content_description_new_contact">Uusi yhteystieto</string>
-  <string name="content_description_call">Puhelu</string>
-  <string name="content_description_backspace">Askelpalautin</string>
-  <string name="content_description_chat">Keskustelu</string>
-  <string name="content_description_dial_back">Soita takaisin</string>
-  <string name="content_description_contact_picture">Yhteys kuva</string>
-  <string name="content_description_send_message">Lähetä viesti</string>
-  <string name="content_description_detail">Yksityiskohdat</string>
-  <string name="content_description_delete">Poista</string>
-  <string name="content_description_add">Lisää puhelu</string>
-  <string name="content_description_new_discussion">Uusi keskustelu</string>
-  <string name="content_description_search">Hae</string>
-  <string name="content_description_all_contacts">Kaikki yhteystiedot</string>
-  <string name="content_description_linphone_contacts">Linphone yhteystiedot</string>
-  <string name="content_description_call_direction">Saapuva vai lähtevä puhelu</string>
-  <string name="content_description_all_calls">Kaikki puhelut</string>
-  <string name="content_description_missed_calls">Vastaamattomat puhelut</string>
-  <string name="content_description_switch_video">Kytke video</string>
-  <string name="content_description_add_call">Lisää puhelu</string>
-  <string name="content_description_pause">Laita tauolle</string>
-  <string name="content_description_numpad">Numeronäppäimet</string>
-  <string name="content_description_history">Historia painike</string>
-  <string name="content_description_chat_button">Keskustelu painike</string>
-  <string name="content_description_contacts">Yhteystiedot painike</string>
-  <string name="content_description_call_quality">Puhelun laatu</string>
-  <string name="content_description_encryption">Salaus</string>
-  <string name="content_description_switch_camera">Vaihda kameraa</string>
-  <string name="content_description_cancel_button">Peruuta painike</string>
-  <string name="content_description_message_status">Viestin tila</string>
-  <string name="content_description_conference">Kokous</string>
-  <string name="content_description_default_account">Vakio tili</string>
-  <string name="content_description_contact_first_name">Etunimi</string>
-  <string name="content_description_contact_last_name">Sukunimi</string>
-  <string name="content_description_transfer">Siirrä</string>
-  <string name="content_description_bluetooth">Bluetooth</string>
-</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7149f33a0..b64e5e6b1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -53,11 +53,11 @@
   <string name="decline">Refuser</string>
   <string name="conference">Conférence</string>
   <!--Launch screen-->
+  <string name="app_description">le client SIP libre</string>
   <!--Assistant-->
   <string name="welcome">Bienvenue</string>
   <string name="assistant">Assistant</string>
   <string name="assistant_create_account">Créer un compte</string>
-  <string name="assistant_finish">Terminer la configuration</string>
   <string name="assistant_validate_account">Votre compte a été créé. Vérifiez vos emails pour valider votre compte.
     Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
   <string name="assistant_welcome_desc">Cet assistant va vous guider pour réaliser des appels à l\'aide d\'un compte SIP.</string>
@@ -86,7 +86,7 @@
   <string name="wizard_username_unavailable">Ce nom d\'utilisateur est déjà pris.</string>
   <string name="wizard_username_incorrect">Votre nom d\'utilisateur est invalide.</string>
   <string name="wizard_email_incorrect">Votre email est invalide.</string>
-  <string name="wizard_password_incorrect">Votre mot de passe n\'est pas valide.</string>
+  <string name="wizard_password_incorrect">Votre mot de passe est invalide (6 caractères minimum).</string>
   <string name="wizard_passwords_unmatched">Les mots de passes ne correspondent pas.</string>
   <string name="setup_confirm_username">Votre nom d\'utilisateur sera %s.\r\n\r\nIl peut différer de votre saisie.\r\nContinuer ?</string>
   <string name="first_launch_no_login_password">Entrez votre nom d\'utilisateur et votre mot de passe</string>
@@ -294,24 +294,21 @@
   <string name="content_description_decline">Refuser</string>
   <string name="content_description_hang_up">Raccrocher</string>
   <string name="content_description_accept">Accepter</string>
-  <string name="content_description_edit">Modifier</string>
-  <string name="content_description_edit_list">Edition de list</string>
-  <string name="content_description_valid">Valider</string>
+  <string name="content_description_edit">Bouton éditer</string>
+  <string name="content_description_valid">Bouton valider</string>
   <string name="content_description_add_contact">Button Ajouter aux contacts</string>
   <string name="content_description_new_contact">Nouveau contact</string>
   <string name="content_description_call">Appel</string>
   <string name="content_description_backspace">Retour</string>
   <string name="content_description_chat">Chat</string>
   <string name="content_description_dial_back">Rappeler</string>
-  <string name="content_description_dialer_back">Retour au dialer</string>
   <string name="content_description_contact_picture">Photo contact</string>
   <string name="content_description_send_message">Envoyer message</string>
   <string name="content_description_detail">Détails</string>
-  <string name="content_description_delete">Supprimer</string>
-  <string name="content_description_add">Ajouter un appel</string>
+  <string name="content_description_delete">Boutton supprimer</string>
+  <string name="content_description_add">Boutton ajouter</string>
   <string name="content_description_new_discussion">Nouvelle discussion</string>
   <string name="content_description_search">Rechercher</string>
-  <string name="content_description_search_contact">Recherche d\'un contact</string>
   <string name="content_description_all_contacts">Tous les contacts</string>
   <string name="content_description_linphone_contacts">Contacts Linphone</string>
   <string name="content_description_call_direction">Direction d\'appel</string>
@@ -330,25 +327,4 @@
   <string name="content_description_cancel_button">Bouton annuler</string>
   <string name="content_description_message_status">Status de message</string>
   <string name="content_description_conference">Conférence</string>
-
-  <string name="content_description_username_field">Champ nom d\'utilisateur</string>
-  <string name="content_description_display_field">Champ nom d\'affichage</string>
-  <string name="content_description_domain_field">Champ domaine</string>
-  <string name="content_description_confirm_password_field">Champ confirmation du mot de passe</string>
-  <string name="content_description_email_field">Champ email</string>
-  <string name="content_description_default_account">Compte par défaut</string>
-  <string name="content_description_deselect_all">Tout déselectionner</string>
-  <string name="content_description_select_all">Tout sélectionner</string>
-  <string name="content_description_contact_first_name">Prénom</string>
-  <string name="content_description_contact_last_name">Nom</string>
-  <string name="content_description_back_call">Retour à l\'appel</string>
-  <string name="content_description_send_file">Envoi d\'un fichier</string>
-  <string name="content_description_message">Message</string>
-  <string name="content_description_unread_chat_message">Message non lu</string>
-  <string name="content_description_transfer">Transfert</string>
-  <string name="content_description_earpiece">Ecouteur</string>
-  <string name="content_description_bluetooth">Bluetooth</string>
-  <string name="content_description_call_options">Options d\'appel</string>
-  <string name="content_description_audio_route">Route audio</string>
-  <string name="content_description_exit_conference">Quitter la conférence</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
deleted file mode 100644
index 76345d7ff..000000000
--- a/res/values-he/strings.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Custom-->
-  <string name="tunnel_host"></string>
-  <!--Common-->
-  <string name="username">שם משתמש</string>
-  <string name="password">סיסמה</string>
-  <string name="delete">מחק</string>
-  <string name="retry">נסה שוב</string>
-  <string name="cancel">ביטול</string>
-  <string name="accept">קבל</string>
-  <string name="continue_text">המשך</string>
-  <string name="about">אודות</string>
-  <string name="settings">הגדרות</string>
-  <string name="decline">דחה</string>
-  <string name="conference">ועידה</string>
-  <!--Launch screen-->
-  <!--Assistant-->
-  <string name="transport">טרנספורט</string>
-  <!--Dailer-->
-  <!--History-->
-  <string name="today">היום</string>
-  <string name="yesterday">אתמול</string>
-  <!--Contacts-->
-  <!--Chat-->
-  <string name="wait">אנא המתן...</string>
-  <!--Status Bar-->
-  <!--Side Menu-->
-  <string name="menu_settings">הגדרות</string>
-  <string name="menu_about">אודות</string>
-  <!--Call-->
-  <string name="unknown_incoming_call_name">לא מוכר</string>
-  <string name="call_stats_audio">שמע</string>
-  <string name="call_stats_video">וידאו</string>
-  <string name="call_stats_codec">קודק:</string>
-  <string name="call">קריאה</string>
-  <!--About-->
-  <!--Service-->
-  <!--Errors-->
-  <string name="error">שגיאה</string>
-  <!--Account Settings-->
-  <string name="pref_sipaccount">חשבון SIP</string>
-  <string name="pref_disable_account">נטרל</string>
-  <string name="pref_proxy">פרוקסי</string>
-  <string name="pref_domain">מתחם*</string>
-  <string name="pref_passwd">סיסמה*</string>
-  <string name="pref_username">שם משתמש*</string>
-  <string name="pref_escape_plus">החלף + עם 00</string>
-  <string name="pref_prefix">קידומת</string>
-  <string name="pref_transport">טרנספורט</string>
-  <string name="pref_default_account">השתמש בתור ברירת מחדל</string>
-  <!--Settings-->
-  <string name="pref_sipaccounts">חשבונות SIP</string>
-  <string name="default_account_flag">חשבון שגרתי</string>
-  <string name="pref_add_account">הוסף חשבון</string>
-  <string name="pref_tunnel_host">שם מארח</string>
-  <string name="pref_tunnel_port">פורט</string>
-  <string name="pref_tunnel_mode">מצב</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string name="pref_none">בלי</string>
-  <string name="pref_preferences_title">העדפות</string>
-  <string name="pref_video_enable_title">אפשר וידאו</string>
-  <!--Audio settings-->
-  <string name="pref_audio_title">שמע</string>
-  <string name="failed">נכשל</string>
-  <!--Video settings-->
-  <string name="pref_video_title">וידאו</string>
-  <!--Call settings-->
-  <string name="pref_call_title">קריאה</string>
-  <!--Network settings-->
-  <string name="pref_network_title">רשת</string>
-  <string name="pref_stun_server">שרת Stun</string>
-  <string name="pref_ice_enable">אפשר ICE</string>
-  <string name="pref_upnp_enable">אפשר UPNP</string>
-  <string name="pref_media_encryption">הצפנת מדיה</string>
-  <!--Advanced settings-->
-  <string name="pref_advanced_title">מתקדם</string>
-  <string name="pref_animation_enable_title">אפשר הנפשות</string>
-  <string name="pref_user_name_title">שם משתמש</string>
-  <!--Audio hack settings-->
-  <!--Content description-->
-  <string name="content_description_back">חזור</string>
-  <string name="content_description_decline">דחה</string>
-  <string name="content_description_hang_up">סיים</string>
-  <string name="content_description_accept">קבל</string>
-  <string name="content_description_edit">ערוך</string>
-  <string name="content_description_new_contact">איש קשר חדש</string>
-  <string name="content_description_call">קריאה</string>
-  <string name="content_description_chat">שיחה</string>
-  <string name="content_description_delete">מחק</string>
-  <string name="content_description_add">הוסף שיחה</string>
-  <string name="content_description_add_call">הוסף שיחה</string>
-  <string name="content_description_conference">ועידה</string>
-  <string name="content_description_default_account">חשבון שגרתי</string>
-  <string name="content_description_transfer">העבר</string>
-</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
deleted file mode 100644
index c9226fa3e..000000000
--- a/res/values-ja/strings.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Custom-->
-  <string name="app_name">Linphone</string>
-  <string name="service_name">Linphone サービス</string>
-  <string name="addressbook_label">Linphone</string>
-  <string name="notification_title">Linphone</string>
-  <string name="wait_dialog_text">はじめます</string>
-  <string name="notification_registered">%sを登録しました</string>
-  <string name="notification_register_failure">%sの登録に失敗しました</string>
-  <string name="tunnel_host"></string>
-  <!--Common-->
-  <string name="username">ユーザー名</string>
-  <string name="display_name">表示する名前</string>
-  <string name="password">パスワード</string>
-  <string name="confirm_password">パスワードを再入力</string>
-  <string name="domain">ドメイン</string>
-  <string name="remote_provisioning_url">URL</string>
-  <string name="email">メールアドレス</string>
-  <string name="delete_text">選択した内容を本当に削除しますか？</string>
-  <string name="delete">削除する</string>
-  <string name="retry">再送する</string>
-  <string name="cancel">キャンセル</string>
-  <string name="accept">受理</string>
-  <string name="continue_text">続行</string>
-  <string name="about">概要</string>
-  <string name="deny">拒否する</string>
-  <string name="no_account">アカウントがありません</string>
-  <string name="search">検索</string>
-  <string name="outgoing">発信</string>
-  <string name="incoming">着信</string>
-  <string name="missed">ミス</string>
-  <string name="settings">設定</string>
-  <string name="connect">接続する</string>
-  <string name="decline">接続しない</string>
-  <string name="conference">会談</string>
-  <!--Launch screen-->
-  <string name="app_description">the <i>libre</i> SIP client</string>
-  <!--Assistant-->
-  <string name="welcome">ようこそ</string>
-  <string name="assistant">アシスタント</string>
-  <string name="assistant_create_account">アカウントを作成する</string>
-  <string name="assistant_finish">完了しました</string>
-  <string name="assistant_validate_account">アカウントを作成しました。あなたのメールを確認し、アカウントを認証してください。その後このボタンを押して再開してください。</string>
-  <string name="assistant_welcome_desc">SIPアカウントの設定を行います。</string>
-  <string name="assistant_linphone_login_desc">Linphoneのユーザー名とパスワードを入力してください</string>
-  <string name="assistant_login_desc">SIPドメインのユーザー名とパスワードを入力してください</string>
-  <string name="assistant_remote_provisioning_desc">プロビショニングURLを入力してください</string>
-  <string name="transport">トランスポート</string>
-  <string name="assistant_login_linphone">Linphoneのアカウントで使う</string>
-  <string name="assistant_login_generic">SIPアカウントで使う</string>
-  <string name="assistant_remote_provisioning">リモート設定</string>
-  <string name="assistant_create_account_part_1">1/2</string>
-  <string name="assistant_create_account_part_2">2/2</string>
-  <string name="assistant_display_name_optional">表示する名前(任意)</string>
-  <string name="assistant_linphone_account">Linphoneアカウントを登録する</string>
-  <string name="assistant_generic_account">SIPアカウントを登録する</string>
-  <string name="assistant_remote_provisioning_title">リモート設定</string>
-  <string name="assistant_login">ログイン</string>
-  <string name="assistant_ec_calibration">エコーキャンセルを設定しています</string>
-  <string name="assistant_remote_provisioning_login">ログインしてください</string>
-  <string name="assistant_account_not_validated">未確認のアカウントです。</string>
-  <string name="assistant_account_validated">確認済みのアカウントです。</string>
-  <string name="assistant_error_bad_credentials">ユーザー名かパスワードが異なります</string>
-  <string name="wizard_failed">エラーが発生しました。のちほど再試行してください。</string>
-  <string name="wizard_username_unavailable">このユーザー名はすでに使われています。</string>
-  <string name="first_launch_no_login_password">ユーザー名とパスワードを入力してください</string>
-  <!--Dailer-->
-  <!--History-->
-  <string name="today">今日</string>
-  <string name="yesterday">昨日</string>
-  <!--Contacts-->
-  <string name="no_contact">電話帳に連絡先がありません</string>
-  <string name="no_sip_contact">電話帳にSIPの連絡先がありません</string>
-  <string name="sip_address">SIPアドレス</string>
-  <string name="phone_number">電話番号</string>
-  <string name="contact_first_name">名前</string>
-  <string name="contact_last_name">名字</string>
-  <!--Chat-->
-  <string name="remote_composing">リモート先が入力中...</string>
-  <string name="share_picture_size_small">小さい</string>
-  <string name="share_picture_size_medium">中くらい</string>
-  <string name="share_picture_size_large">大きい</string>
-  <string name="share_picture_size_real">原寸大</string>
-  <string name="text_copied_to_clipboard">テキストをクリップボードにコピーする</string>
-  <string name="copy_text">コピーしたテキスト</string>
-  <string name="image_picker_title">選択したソース</string>
-  <string name="image_saved">保存した画像</string>
-  <string name="image_not_saved">エラー、画像が保存できません。</string>
-  <string name="wait">お待ちください...</string>
-  <string name="processing_image">画像の処理は、ファイルサイズによっては数秒かかることがあります</string>
-  <!--Status Bar-->
-  <string name="status_connected">登録済</string>
-  <string name="status_not_connected">登録なし</string>
-  <string name="status_in_progress">登録に問題があります</string>
-  <string name="status_error">登録できませんでした</string>
-  <string name="voicemail_unread">未読メッセージ</string>
-  <!--Side Menu-->
-  <string name="menu_assistant">アシスタント</string>
-  <string name="menu_settings">設定</string>
-  <string name="menu_about">概要</string>
-  <string name="quit">退出</string>
-  <!--Call-->
-  <string name="incoming_call">着信</string>
-  <string name="outgoing_call">発信</string>
-  <string name="unknown_incoming_call_name">不明</string>
-  <string name="call_stats_audio">オーディオ</string>
-  <string name="call_stats_video">ビデオ</string>
-  <string name="call_stats_codec">コーデック:</string>
-  <string name="call_stats_upload">アップロード幅:</string>
-  <string name="call_stats_download">ダウンロード幅:</string>
-  <string name="call_stats_ice">ICE 接続:</string>
-  <string name="call_stats_video_resolution">ビデオ解像度:</string>
-  <string name="call">発信</string>
-  <!--About-->
-  <string name="menu_send_log">ログを送信する</string>
-  <string name="menu_reset_log">ログをリセットする</string>
-  <!--Service-->
-  <string name="incall_notif_active">オーディオを呼び出し中</string>
-  <string name="incall_notif_paused">コールの一時停止中</string>
-  <string name="incall_notif_video">ビデオキャプチャーコール進行中</string>
-  <string name="notification_started">はじめます</string>
-  <string name="unread_messages">%i 未読メッセージ</string>
-  <!--Errors-->
-  <string name="skipable_error_service_not_ready">警告：未提供のサービスです</string>
-  <string name="error">エラー</string>
-  <string name="error_unknown">不明なエラー</string>
-  <string name="error_call_declined">呼び出しが拒否されました</string>
-  <string name="error_user_not_found">ユーザーがおりません</string>
-  <string name="error_incompatible_media">互換性のないメディアパラメーター</string>
-  <string name="error_network_unreachable">ネットワークに到達できません</string>
-  <string name="error_bad_credentials">不正な証明書です</string>
-  <string name="error_unauthorized">無断</string>
-  <string name="error_io_error">ネットワークエラー</string>
-  <string name="remote_provisioning_failure">ダウンロードした、リモートプロビジョニング設定を適用できませんでした...</string>
-  <string name="remote_provisioning_again_title">遠隔準備</string>
-  <!--Account Settings-->
-  <string name="pref_sipaccount">SIPアカウント</string>
-  <string name="pref_manage_title">管理</string>
-  <string name="pref_disable_account">無効にする</string>
-  <string name="pref_proxy">プロキシ</string>
-  <string name="pref_domain">ドメイン*</string>
-  <string name="pref_passwd">パスワード*</string>
-  <string name="pref_username">ユーザー名*</string>
-  <string name="pref_enable_outbound_proxy">Outbound proxy</string>
-  <string name="pref_help_proxy">SIP のプロキシ名 もしくは IPアドレス (任意)</string>
-  <string name="pref_help_outbound_proxy">SIP プロキシ経由で呼び出しを実行する</string>
-  <string name="pref_help_username">一例: john であればあなたのアカウント は john@sip.example.org</string>
-  <string name="pref_help_domain">sip.example.org であればあなたのアカウント は john@sip.example.org</string>
-  <string name="pref_help_password">あなたのユーザ名/またはドメインを編集した場合はパスワードを再入力する必要があります。</string>
-  <string name="pref_expire_title">Expire</string>
-  <string name="pref_avpf">AVPF</string>
-  <string name="pref_avpf_rr_interval">AVPFによる正規のRTCP間隔 (1秒 から 5秒)</string>
-  <string name="pref_escape_plus">00 で置き換える</string>
-  <string name="pref_auth_userid">ユーザーIDを認証</string>
-  <string name="pref_display_name">表示名</string>
-  <string name="pref_prefix">プレフィックス</string>
-  <string name="pref_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">このアカウントを削除する</string>
-  <string name="pref_default_account">デフォルトで使用する</string>
-  <!--Settings-->
-  <string name="pref_sipaccounts">SIPアカウント</string>
-  <string name="default_account_flag">デフォルトのアカウント</string>
-  <string name="pref_add_account">アカウントを追加する</string>
-  <string name="pref_tunnel">トンネル</string>
-  <string name="pref_tunnel_host">ホスト名</string>
-  <string name="pref_tunnel_port">ポート</string>
-  <string name="pref_tunnel_mode">モード</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string-array name="tunnel_mode_entries">
-    <item>無効</item>
-    <item>3Gのみ</item>
-    <item>常に</item>
-    <item>自動</item>
-  </string-array>
-  <string name="pref_none">なし</string>
-  <string name="pref_preferences_title">設定</string>
-  <string name="pref_video_enable_title">ビデオを有効にする</string>
-  <!--Audio settings-->
-  <string name="pref_audio_title">オーディオ</string>
-  <string name="pref_echo_cancellation">エコーキャンセル</string>
-  <string name="pref_echo_cancellation_summary">相手が聞こえるエコーを削除する</string>
-  <string name="ec_calibrating">調整中...</string>
-  <string name="ec_calibrated">%s msで調整しました</string>
-  <string name="no_echo">エコーなし</string>
-  <string name="failed">失敗</string>
-  <string name="pref_adaptive_rate_control">適応レート制御</string>
-  <string name="pref_codec_bitrate_limit">コーデックのビットレート制限</string>
-  <string name="pref_codecs">Codecs</string>
-  <!--Video settings-->
-  <string name="pref_video_title">ビデオ</string>
-  <string name="pref_video_use_front_camera_title">フロントカメラを使用する</string>
-  <string name="pref_video_initiate_call_with_video_title">ビデオ通話を開始する</string>
-  <string name="pref_video_initiate_call_with_video">ビデオ表示の要請を常に送信</string>
-  <string name="pref_video_automatically_accept_video_title">ビデオ表示の要求を受け入れる</string>
-  <string name="pref_video_automatically_accept_video">ビデオ表示の要求を常に受け入れる</string>
-  <string name="pref_video_preset">動画の設定</string>
-  <string name="pref_preferred_video_size">動画の大きさ</string>
-  <string name="pref_preferred_fps">FPSの値</string>
-  <string name="pref_bandwidth_limit">帯域限度 in kbits/s</string>
-  <string name="pref_video_codecs_title">コーデック</string>
-  <!--Call settings-->
-  <string name="pref_call_title">発信</string>
-  <string name="pref_rfc2833_dtmf">DTMFをRFC2833で送信する</string>
-  <string name="pref_sipinfo_dtmf">DTMFをSIP情報で送信する</string>
-  <string name="pref_voice_mail">音声メールのURI</string>
-  <!--Network settings-->
-  <string name="pref_network_title">ネットワーク</string>
-  <string name="pref_wifi_only">WiFiのみ</string>
-  <string name="pref_stun_server">Stunサーバー</string>
-  <string name="pref_ice_enable">ICEを有効にする</string>
-  <string name="pref_upnp_enable">UPNPを使う</string>
-  <string name="pref_transport_use_random_ports">ランダムポートを使用する</string>
-  <string name="pref_sip_port_title">SIPポートを使用する</string>
-  <string name="pref_video_port_title">ビデオのポートまたはポート範囲</string>
-  <string name="pref_audio_port_title">オーディオのポートまたはポート範囲</string>
-  <string name="pref_video_port_description">ビデオのポートまたはポート範囲 (最小-最大)</string>
-  <string name="pref_audio_port_description">オーディオのポートまたはポート範囲 (最小-最大)</string>
-  <string name="pref_media_encryption">メディアの暗号化</string>
-  <string name="pref_push_notification">プッシュ通知を有効にする</string>
-  <string name="pref_ipv6_title">IPv6を使用する</string>
-  <!--Advanced settings-->
-  <string name="pref_advanced_title">拡張</string>
-  <string name="pref_debug">デバッグ</string>
-  <string name="pref_background_mode">バックグラウンド動作</string>
-  <string name="pref_animation_enable_title">アニメーションを有効にする</string>
-  <string name="pref_autostart">起動時に開始する</string>
-  <string name="pref_image_sharing_server_title">共有サーバー</string>
-  <string name="pref_remote_provisioning_title">遠隔準備</string>
-  <string name="pref_primary_account_title">優先アカウント</string>
-  <string name="pref_display_name_title">表示名</string>
-  <string name="pref_user_name_title">ユーザー名</string>
-  <!--Audio hack settings-->
-  <string name="pref_audio_hacks_title">オーディオ設定</string>
-  <string name="pref_audio_use_specific_mode_title">特定のハックを使用する</string>
-  <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (デフォルト), 2=MODE_IN_CALL</string>
-  <string name="pref_audio_hacks_use_routing_api_title">ルーティングAPIを使用する</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">Galaxy Sハックを使用する</string>
-  <!--Content description-->
-  <string name="content_description_back">戻る</string>
-  <string name="content_description_dialer">ダイヤラー</string>
-  <string name="content_description_toggle_micro">マイク切り替えトグル</string>
-  <string name="content_description_toggle_speaker">スピーカー切り替えトグル</string>
-  <string name="content_description_decline">拒否</string>
-  <string name="content_description_hang_up">ハングアップ</string>
-  <string name="content_description_accept">受理する</string>
-  <string name="content_description_edit">編集</string>
-  <string name="content_description_add_contact">連絡先に追加</string>
-  <string name="content_description_new_contact">新しい連絡先</string>
-  <string name="content_description_call">発信</string>
-  <string name="content_description_backspace">バックスペース</string>
-  <string name="content_description_chat">チャット</string>
-  <string name="content_description_dial_back">コールバック</string>
-  <string name="content_description_contact_picture">連絡相手の画像</string>
-  <string name="content_description_send_message">送信メッセージ</string>
-  <string name="content_description_detail">詳細</string>
-  <string name="content_description_delete">削除する</string>
-  <string name="content_description_add">追加発信</string>
-  <string name="content_description_new_discussion">新しいやりとりを行う</string>
-  <string name="content_description_search">検索</string>
-  <string name="content_description_all_contacts">すべての連絡先</string>
-  <string name="content_description_linphone_contacts">Linphoneでの連絡先</string>
-  <string name="content_description_call_direction">宛先を指定</string>
-  <string name="content_description_all_calls">すべての呼出</string>
-  <string name="content_description_missed_calls">失敗した呼出</string>
-  <string name="content_description_switch_video">ビデオの切り替え</string>
-  <string name="content_description_add_call">追加発信</string>
-  <string name="content_description_pause">一時停止</string>
-  <string name="content_description_numpad">キーパッド</string>
-  <string name="content_description_history">履歴ボタン</string>
-  <string name="content_description_chat_button">チャットボタン</string>
-  <string name="content_description_contacts">連絡ボタン</string>
-  <string name="content_description_call_quality">通話品質</string>
-  <string name="content_description_encryption">暗号化</string>
-  <string name="content_description_switch_camera">カメラをスイッチする</string>
-  <string name="content_description_cancel_button">キャンセルボタン</string>
-  <string name="content_description_message_status">メッセージ状態</string>
-  <string name="content_description_conference">会談</string>
-  <string name="content_description_default_account">デフォルトのアカウント</string>
-  <string name="content_description_contact_first_name">名前</string>
-  <string name="content_description_contact_last_name">名字</string>
-  <string name="content_description_transfer">転送</string>
-  <string name="content_description_bluetooth">Bluetooth</string>
-</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
deleted file mode 100644
index b900a4041..000000000
--- a/res/values-nl/strings.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Custom-->
-  <string name="app_name">Linphone</string>
-  <string name="service_name">Linphone-dienst</string>
-  <string name="addressbook_label">Linphone</string>
-  <string name="notification_title">Linphone</string>
-  <string name="wait_dialog_text">Bezig met opstarten</string>
-  <string name="tunnel_host"></string>
-  <!--Common-->
-  <string name="username">Gebruikersnaam</string>
-  <string name="display_name">Weergavenaam</string>
-  <string name="password">Wachtwoord</string>
-  <string name="delete">Verwijderen</string>
-  <string name="cancel">Annuleren</string>
-  <string name="accept">Accepteren</string>
-  <string name="about">Over</string>
-  <string name="deny">Weigeren</string>
-  <string name="outgoing">Uitgaande</string>
-  <string name="incoming">Inkomende</string>
-  <string name="missed">Gemist</string>
-  <string name="settings">Instellingen</string>
-  <string name="decline">Weigeren</string>
-  <!--Launch screen-->
-  <!--Assistant-->
-  <string name="assistant_welcome_desc">Deze wizard zal u helpen bij het gebruiken van een SIP-account voor uw oproepen.</string>
-  <string name="transport">Transport</string>
-  <!--Dailer-->
-  <!--History-->
-  <string name="today">Vandaag</string>
-  <string name="yesterday">Gisteren</string>
-  <!--Contacts-->
-  <string name="sip_address">SIP-adres</string>
-  <string name="phone_number">Telefoonnummer</string>
-  <string name="contact_first_name">Voornaam</string>
-  <string name="contact_last_name">Achternaam</string>
-  <!--Chat-->
-  <string name="share_picture_size_small">Klein</string>
-  <string name="share_picture_size_medium">Middel</string>
-  <string name="share_picture_size_large">Groot</string>
-  <!--Status Bar-->
-  <string name="status_connected">Geregistreerd</string>
-  <!--Side Menu-->
-  <string name="menu_settings">Instellingen</string>
-  <string name="menu_about">Over</string>
-  <!--Call-->
-  <string name="unknown_incoming_call_name">Onbekend</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">Uploadbandbreedte:</string>
-  <string name="call_stats_download">Downloadbandbreedte:</string>
-  <string name="call_stats_video_resolution">Videogrootte:</string>
-  <string name="call">Oproep</string>
-  <!--About-->
-  <string name="menu_send_log">Log versturen</string>
-  <!--Service-->
-  <!--Errors-->
-  <string name="error">Fout</string>
-  <!--Account Settings-->
-  <string name="pref_sipaccount">SIP-account</string>
-  <string name="pref_manage_title">Beheren</string>
-  <string name="pref_disable_account">Uitschakelen</string>
-  <string name="pref_proxy">Proxy</string>
-  <string name="pref_domain">Domein*</string>
-  <string name="pref_passwd">Wachtwoord*</string>
-  <string name="pref_username">Gebruikersnaam*</string>
-  <string name="pref_avpf">AVPF</string>
-  <string name="pref_escape_plus">+ door 00 vervangen</string>
-  <string name="pref_display_name">Weergavenaam</string>
-  <string name="pref_prefix">Voorvoegsel</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>
-  <!--Settings-->
-  <string name="pref_sipaccounts">SIP-accounts</string>
-  <string name="default_account_flag">Standaard account</string>
-  <string name="pref_add_account">Account toevoegen</string>
-  <string name="pref_tunnel">Tunnel</string>
-  <string name="pref_tunnel_host">Hostnaam</string>
-  <string name="pref_tunnel_port">Poort</string>
-  <string name="pref_tunnel_mode">Modus</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string name="pref_none">Geen</string>
-  <string name="pref_preferences_title">Voorkeuren</string>
-  <string name="pref_video_enable_title">Video inschakelen</string>
-  <!--Audio settings-->
-  <string name="pref_audio_title">Audio</string>
-  <string name="failed">gefaald</string>
-  <string name="pref_codecs">Codecs</string>
-  <!--Video settings-->
-  <string name="pref_video_title">Video</string>
-  <string name="pref_video_codecs_title">Codecs</string>
-  <!--Call settings-->
-  <string name="pref_call_title">Oproep</string>
-  <!--Network settings-->
-  <string name="pref_network_title">Netwerk</string>
-  <string name="pref_stun_server">Stun-server</string>
-  <string name="pref_ice_enable">ICE inschakelen</string>
-  <string name="pref_upnp_enable">UPNP inschakelen</string>
-  <string name="pref_transport_use_random_ports">Willekeurige poorten gebruiken</string>
-  <string name="pref_media_encryption">Mediaversleuteling</string>
-  <!--Advanced settings-->
-  <string name="pref_advanced_title">Geavanceerd</string>
-  <string name="pref_debug">Foutopsporing</string>
-  <string name="pref_background_mode">Achtergrondsmodus</string>
-  <string name="pref_animation_enable_title">Animaties inschakelen</string>
-  <string name="pref_primary_account_title">Primaire account</string>
-  <string name="pref_display_name_title">Weergavenaam</string>
-  <string name="pref_user_name_title">Gebruikersnaam</string>
-  <!--Audio hack settings-->
-  <string name="pref_audio_hacks_title">Audiohacks</string>
-  <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (standaard), 2=MODE_IN_CALL</string>
-  <string name="pref_audio_hacks_use_routing_api_title">Routing API-hack gebruiken</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">Galaxy S-audiohack gebruiken</string>
-  <!--Content description-->
-  <string name="content_description_decline">Weigeren</string>
-  <string name="content_description_hang_up">Ophangen</string>
-  <string name="content_description_accept">Accepteren</string>
-  <string name="content_description_new_contact">Nieuw contact</string>
-  <string name="content_description_call">Oproep</string>
-  <string name="content_description_chat">Chat</string>
-  <string name="content_description_delete">Verwijderen</string>
-  <string name="content_description_add">Oproep toevoegen</string>
-  <string name="content_description_add_call">Oproep toevoegen</string>
-  <string name="content_description_default_account">Standaard account</string>
-  <string name="content_description_contact_first_name">Voornaam</string>
-  <string name="content_description_contact_last_name">Achternaam</string>
-  <string name="content_description_bluetooth">Bluetooth</string>
-</resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
deleted file mode 100644
index cf0359110..000000000
--- a/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Custom-->
-  <string name="tunnel_host"></string>
-  <!--Common-->
-  <string name="username">Usuário</string>
-  <string name="display_name">Exibir nome</string>
-  <string name="password">Senha</string>
-  <string name="delete">Apagar</string>
-  <string name="retry">Repetir</string>
-  <string name="cancel">Annuler</string>
-  <string name="accept">Aceitar</string>
-  <string name="continue_text">Continuar</string>
-  <string name="about">Sobre</string>
-  <string name="deny">Recusar</string>
-  <string name="search">Pesquisar</string>
-  <string name="outgoing">Efetuadas</string>
-  <string name="incoming">Recebidas</string>
-  <string name="missed">Perdidas</string>
-  <string name="settings">Configurações</string>
-  <string name="decline">Rejeitar</string>
-  <string name="conference">Conferência</string>
-  <!--Launch screen-->
-  <!--Assistant-->
-  <string name="transport">Protocolo</string>
-  <string name="assistant_account_not_validated">Sua conta ainda não foi validada.</string>
-  <string name="assistant_account_validated">Sua conta foi validada.</string>
-  <string name="wizard_failed">Ocorreu um erro, tente novamente mais tarde.</string>
-  <string name="wizard_username_unavailable">Este nome de usuário já está em uso.</string>
-  <string name="first_launch_no_login_password">Por favor, digite seu usuário e senha</string>
-  <!--Dailer-->
-  <!--History-->
-  <string name="today">Hoje</string>
-  <string name="yesterday">Ontem</string>
-  <!--Contacts-->
-  <string name="no_contact">Nenhum contato em seus contatos.</string>
-  <string name="no_sip_contact">Nenhum contato SIP em seus contatos.</string>
-  <string name="sip_address">Endereço SIP</string>
-  <string name="phone_number">Número do telefone</string>
-  <string name="contact_first_name">Nome</string>
-  <string name="contact_last_name">Sobrenome</string>
-  <!--Chat-->
-  <string name="remote_composing">Seu contato está digitando...</string>
-  <string name="share_picture_size_small">Pequeno</string>
-  <string name="share_picture_size_medium">Médio</string>
-  <string name="share_picture_size_large">Largo</string>
-  <string name="share_picture_size_real">Tamanho real</string>
-  <string name="text_copied_to_clipboard">Texto copiado para área de transferência</string>
-  <string name="copy_text">Copiar texto</string>
-  <string name="image_picker_title">Selecionar fonte</string>
-  <string name="image_saved">Imagem salva</string>
-  <string name="image_not_saved">Erro, imagem não salva</string>
-  <string name="wait">Por favor, aguarde...</string>
-  <string name="processing_image">Processando imagem, pode levar alguns segundos, dependendo do tamanho do arquivo</string>
-  <!--Status Bar-->
-  <string name="status_connected">Registrado</string>
-  <string name="status_in_progress">Registro em andamento</string>
-  <string name="status_error">Registro falhou</string>
-  <string name="voicemail_unread"> mensagens não lidas</string>
-  <!--Side Menu-->
-  <string name="menu_settings">Configurações</string>
-  <string name="menu_about">Sobre</string>
-  <!--Call-->
-  <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">Velocidade de Upload</string>
-  <string name="call_stats_download">Velocidade de Download:</string>
-  <string name="call_stats_ice">Conectividade ICE:</string>
-  <string name="call_stats_video_resolution">Tamanho de video:</string>
-  <string name="call">Ligar</string>
-  <!--About-->
-  <string name="menu_send_log">Enviar log</string>
-  <string name="menu_reset_log">Limpar log</string>
-  <!--Service-->
-  <string name="incall_notif_active">Chamada de áudio em curso</string>
-  <string name="incall_notif_paused">Chamada em pausa em curso</string>
-  <string name="incall_notif_video">Chamada de vídeo captura em curso</string>
-  <string name="notification_started">iniciado</string>
-  <string name="unread_messages">%i mensagens não lidas</string>
-  <!--Errors-->
-  <string name="skipable_error_service_not_ready">Aviso: O serviço não está pronto</string>
-  <string name="error">Erro</string>
-  <string name="error_unknown">Erro desconhecido</string>
-  <string name="error_call_declined">Chamada recusada</string>
-  <string name="error_user_not_found">Usuário não encontrado</string>
-  <string name="error_incompatible_media">Parâmetros de mídia incompatíveis</string>
-  <string name="error_network_unreachable">Rede inacessível</string>
-  <string name="error_bad_credentials">Credenciais erradas</string>
-  <string name="error_unauthorized">Não autorizado</string>
-  <string name="error_io_error">Erro de rede</string>
-  <string name="remote_provisioning_failure">Falha ao transferir ou aplicar perfil de aprovisionamento remoto...</string>
-  <string name="remote_provisioning_again_title">Provisionamento remoto</string>
-  <!--Account Settings-->
-  <string name="pref_sipaccount">Conta SIP</string>
-  <string name="pref_manage_title">Gerenciar</string>
-  <string name="pref_disable_account">Desativar</string>
-  <string name="pref_proxy">Proxy</string>
-  <string name="pref_domain">Domínio*</string>
-  <string name="pref_passwd">Senha*</string>
-  <string name="pref_username">Usuário*</string>
-  <string name="pref_enable_outbound_proxy">Proxy de saída</string>
-  <string name="pref_help_proxy">SIP Proxy, hostname ou endereço IP (opcional)</string>
-  <string name="pref_help_outbound_proxy">Rotear todas as chamadas através de proxy SIP</string>
-  <string name="pref_help_username">Example: se colocar john, sua conta é john@sip.exemplo.com.br</string>
-  <string name="pref_help_domain">sip.exemplo.com.br sua conta é john@sip.exemplo.com.br</string>
-  <string name="pref_help_password">Você deve voltar a entrar com sua senha se você editar o nome de usuário ou domínio</string>
-  <string name="pref_expire_title">Expirar</string>
-  <string name="pref_avpf">AVPF</string>
-  <string name="pref_avpf_rr_interval"> AVPF intervalos regulares RTCP em segundos (entre 1 e 5)</string>
-  <string name="pref_escape_plus">Substitua + por 00</string>
-  <string name="pref_auth_userid">ID de autenticação</string>
-  <string name="pref_display_name">Exibir nome</string>
-  <string name="pref_prefix">Prefixo</string>
-  <string name="pref_transport">Protocolo</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">Apagar esta conta</string>
-  <string name="pref_default_account">Usar como padrão</string>
-  <!--Settings-->
-  <string name="pref_sipaccounts">Contas SIP</string>
-  <string name="default_account_flag">Conta padrão</string>
-  <string name="pref_add_account">Adicionar Conta</string>
-  <string name="pref_tunnel">Túnel</string>
-  <string name="pref_tunnel_host">Hostname</string>
-  <string name="pref_tunnel_port">Porta</string>
-  <string name="pref_tunnel_mode">Modo</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string-array name="tunnel_mode_entries">
-    <item>Desativado</item>
-    <item>3G apenas</item>
-    <item>Sempre</item>
-    <item>Auto</item>
-  </string-array>
-  <string name="pref_none">Nenhum</string>
-  <string name="pref_preferences_title">Preferências</string>
-  <string name="pref_video_enable_title">Habilitar Vídeo</string>
-  <!--Audio settings-->
-  <string name="pref_audio_title">Audio</string>
-  <string name="pref_echo_cancellation">Cancelamento de eco</string>
-  <string name="pref_echo_cancellation_summary">Remove o eco ouvido pela outra extremidade</string>
-  <string name="ec_calibrating">Calibrando…</string>
-  <string name="no_echo">Sem echo</string>
-  <string name="failed">falhou</string>
-  <string name="pref_adaptive_rate_control">Controle de taxa adaptável</string>
-  <string name="pref_codec_bitrate_limit">Limite de taxa de Codec</string>
-  <string name="pref_codecs">Codecs</string>
-  <!--Video settings-->
-  <string name="pref_video_title">Video</string>
-  <string name="pref_video_use_front_camera_title">Usar câmera frontal</string>
-  <string name="pref_video_initiate_call_with_video_title">Iniciar chamadas de vídeo</string>
-  <string name="pref_video_initiate_call_with_video">Sempre enviar solicitações de vídeo</string>
-  <string name="pref_video_automatically_accept_video_title">Aceitar solicitações de entrada de vídeo</string>
-  <string name="pref_video_automatically_accept_video">Sempre aceitar solicitações de vídeo</string>
-  <string name="pref_preferred_video_size">Tamanho preferido do vídeo</string>
-  <string name="pref_bandwidth_limit">Limitar banda em kbits/s</string>
-  <string name="pref_video_codecs_title">Codecs</string>
-  <!--Call settings-->
-  <string name="pref_call_title">Ligar</string>
-  <string name="pref_rfc2833_dtmf">Enviar RFC2833 DTMFs</string>
-  <string name="pref_sipinfo_dtmf">Enviar SIP INFO DTMFs</string>
-  <!--Network settings-->
-  <string name="pref_network_title">Network</string>
-  <string name="pref_stun_server">Servidor Stun</string>
-  <string name="pref_ice_enable">Habilitar ICE</string>
-  <string name="pref_upnp_enable">Habilitar UPNP</string>
-  <string name="pref_transport_use_random_ports">Use portas aleatórias</string>
-  <string name="pref_sip_port_title">Porta SIP para usar</string>
-  <string name="pref_video_port_title">Porta ou intervalo de portas de vídeo </string>
-  <string name="pref_audio_port_title">Porta ou intervalo de portas de áudio</string>
-  <string name="pref_video_port_description">Porta ou intervalo de portas de vídeo (minport-maxport)</string>
-  <string name="pref_audio_port_description">Porta ou intervalo de portas de áudio (minport-maxport)</string>
-  <string name="pref_media_encryption">Criptografia de mídia</string>
-  <string name="pref_push_notification">Ativar notificações de envio</string>
-  <!--Advanced settings-->
-  <string name="pref_advanced_title">Avançado</string>
-  <string name="pref_debug">Depurar</string>
-  <string name="pref_background_mode">Em segundo plano</string>
-  <string name="pref_animation_enable_title">Ativar Animações</string>
-  <string name="pref_autostart">Iniciar na inicialização</string>
-  <string name="pref_image_sharing_server_title">Servidor de compartilhamento</string>
-  <string name="pref_remote_provisioning_title">Provisionamento remoto</string>
-  <string name="pref_primary_account_title">Conta primária</string>
-  <string name="pref_display_name_title">Mostrar nome</string>
-  <string name="pref_user_name_title">Usuário</string>
-  <!--Audio hack settings-->
-  <string name="pref_audio_hacks_title">Audio hacks</string>
-  <string name="pref_audio_use_specific_mode_title">Use modo hack específico</string>
-  <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (padrão), 2=MODE_IN_CALL</string>
-  <string name="pref_audio_hacks_use_routing_api_title">Use roteamento API hack</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">Use Galaxy S audio hack</string>
-  <!--Content description-->
-  <string name="content_description_back">Voltar</string>
-  <string name="content_description_dialer">Discador</string>
-  <string name="content_description_toggle_micro">Alterar micro</string>
-  <string name="content_description_toggle_speaker">Alterar auto-falante</string>
-  <string name="content_description_decline">Rejeitar</string>
-  <string name="content_description_hang_up">Terminar</string>
-  <string name="content_description_accept">Aceitar</string>
-  <string name="content_description_edit">Editar</string>
-  <string name="content_description_add_contact">Adicionar aos Contatos</string>
-  <string name="content_description_new_contact">Novo Contato</string>
-  <string name="content_description_call">Ligar</string>
-  <string name="content_description_backspace">Retorno</string>
-  <string name="content_description_chat">Chat</string>
-  <string name="content_description_dial_back">Discar de volta</string>
-  <string name="content_description_contact_picture">Foto do Contato</string>
-  <string name="content_description_send_message">Enviar Mensagem</string>
-  <string name="content_description_delete">Excluir esse contato selecionado?</string>
-  <string name="content_description_add">Adicionar chamada</string>
-  <string name="content_description_new_discussion">Nova Discussão</string>
-  <string name="content_description_search">Pesquisar</string>
-  <string name="content_description_all_contacts">Todos os Contatos</string>
-  <string name="content_description_linphone_contacts">Via Fone Contatos</string>
-  <string name="content_description_call_direction">Direção da Chamada</string>
-  <string name="content_description_all_calls">Todas as Chamadas</string>
-  <string name="content_description_missed_calls">Chamadas Perdidas</string>
-  <string name="content_description_switch_video">Switch video</string>
-  <string name="content_description_add_call">Adicionar Chamada</string>
-  <string name="content_description_pause">Pausar</string>
-  <string name="content_description_numpad">Numpad</string>
-  <string name="content_description_history">Botão Histórico</string>
-  <string name="content_description_chat_button">Botão de Chat</string>
-  <string name="content_description_contacts">Botão Contatos</string>
-  <string name="content_description_call_quality">Qualidade da Chamada</string>
-  <string name="content_description_encryption">Criptografia</string>
-  <string name="content_description_switch_camera">Trocar Câmera</string>
-  <string name="content_description_cancel_button">Botão Cancelar</string>
-  <string name="content_description_message_status">Status da Mensagem</string>
-  <string name="content_description_conference">Conferência</string>
-  <string name="content_description_default_account">Conta padrão</string>
-  <string name="content_description_contact_first_name">Nome</string>
-  <string name="content_description_contact_last_name">Sobrenome</string>
-  <string name="content_description_transfer">Transferir</string>
-  <string name="content_description_bluetooth">Bluetooth</string>
-</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
deleted file mode 100644
index 50ecb988f..000000000
--- a/res/values-ru/strings.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Custom-->
-  <string name="app_name">Linphone</string>
-  <string name="addressbook_label">Linphone</string>
-  <string name="notification_title">Linphone</string>
-  <string name="wait_dialog_text">Загружается</string>
-  <string name="tunnel_host"></string>
-  <!--Common-->
-  <string name="username">Имя пользователя</string>
-  <string name="display_name">Display name</string>
-  <string name="password">Пароль</string>
-  <string name="delete">Удалить</string>
-  <string name="retry">Retry</string>
-  <string name="cancel">Отменить</string>
-  <string name="accept">Принять</string>
-  <string name="continue_text">Продолжить</string>
-  <string name="about">О программе</string>
-  <string name="deny">Deny</string>
-  <string name="outgoing">Исходящий</string>
-  <string name="incoming">Входящий</string>
-  <string name="missed">Пропущенный</string>
-  <string name="settings">Настройки</string>
-  <string name="decline">Отклонить</string>
-  <string name="conference">Конференция</string>
-  <!--Launch screen-->
-  <!--Assistant-->
-  <string name="assistant_welcome_desc">Этот помощник поможет Вам настроить учётную запись SIP для звонков.</string>
-  <string name="transport">Транспорт</string>
-  <string name="assistant_account_not_validated">Ваша учётная запись ещё не подтверждена.</string>
-  <string name="assistant_account_validated">Ваша учётная запись подтверждена.</string>
-  <string name="wizard_failed">Произошла ошибка, попробуйте повторить позже.</string>
-  <string name="wizard_username_unavailable">Это имя пользователя уже использовано.</string>
-  <string name="first_launch_no_login_password">Пожалуйста введите имя пользователя и пароль</string>
-  <!--Dailer-->
-  <!--History-->
-  <string name="today">Сегодня</string>
-  <string name="yesterday">Вчера</string>
-  <!--Contacts-->
-  <string name="no_contact">Нет контакта в Вашей адресной книге.</string>
-  <string name="no_sip_contact">Нет SIP контакта в Вашей адресной книге.</string>
-  <string name="sip_address">адрес SIP</string>
-  <string name="phone_number">Номер телефона</string>
-  <string name="contact_first_name">Имя</string>
-  <string name="contact_last_name">Фамилия</string>
-  <!--Chat-->
-  <string name="remote_composing">Remote is writing...</string>
-  <string name="share_picture_size_small">Маленький</string>
-  <string name="share_picture_size_medium">Средний</string>
-  <string name="share_picture_size_large">Большой</string>
-  <string name="share_picture_size_real">Оригинальный размер</string>
-  <string name="text_copied_to_clipboard">Текст скопирован в буфер обмена</string>
-  <string name="copy_text">Скопировать текст</string>
-  <string name="image_picker_title">Выбрать источник</string>
-  <string name="image_saved">Картинка сохранена</string>
-  <string name="image_not_saved">Ошибка, картинка не сохранена</string>
-  <string name="wait">Please wait...</string>
-  <!--Status Bar-->
-  <string name="status_connected">Зарегистрирован</string>
-  <string name="status_in_progress">В процессе регистрации</string>
-  <string name="status_error">Ошибка регистрации</string>
-  <!--Side Menu-->
-  <string name="menu_settings">Настройки</string>
-  <string name="menu_about">О программе</string>
-  <!--Call-->
-  <string name="unknown_incoming_call_name">Неизвестнвй</string>
-  <string name="call_stats_audio">Аудио</string>
-  <string name="call_stats_video">Видео</string>
-  <string name="call_stats_codec">Кодек:</string>
-  <string name="call_stats_upload">Полоса пропускания загрузки:</string>
-  <string name="call_stats_download">Полоса пропускания скачивания:</string>
-  <string name="call_stats_ice">Подключение ICE:</string>
-  <string name="call_stats_video_resolution">Video size:</string>
-  <string name="call">Звонок</string>
-  <!--About-->
-  <!--Service-->
-  <string name="incall_notif_active">Идёт Аудио звонок</string>
-  <string name="incall_notif_paused">Звонок на Паузе</string>
-  <string name="incall_notif_video">Идёт Видео звонок</string>
-  <string name="notification_started">начат</string>
-  <string name="unread_messages">%i unread messages</string>
-  <!--Errors-->
-  <string name="skipable_error_service_not_ready">Внимание : сервис не готов</string>
-  <string name="error">Ошибка</string>
-  <string name="error_call_declined">Звонок сброшен</string>
-  <string name="error_user_not_found">Пользователь не найден</string>
-  <string name="error_incompatible_media">Несовместимые параметры потока</string>
-  <string name="error_network_unreachable">Сеть недоступна</string>
-  <string name="remote_provisioning_failure">Failed to download or apply remote provisioning profile...</string>
-  <string name="remote_provisioning_again_title">Remote provisioning</string>
-  <!--Account Settings-->
-  <string name="pref_sipaccount">Имя SIP</string>
-  <string name="pref_manage_title">Manage</string>
-  <string name="pref_disable_account">Деактивировать</string>
-  <string name="pref_proxy">Прокси</string>
-  <string name="pref_domain">Сервер*</string>
-  <string name="pref_passwd">Пароль*</string>
-  <string name="pref_username">Имя пользователя*</string>
-  <string name="pref_enable_outbound_proxy">Исходящий прокси</string>
-  <string name="pref_help_proxy">Имя сервера SIP прокси или адрес ip (необязательно)</string>
-  <string name="pref_help_outbound_proxy">Отправить все звонки через SIP прокси</string>
-  <string name="pref_help_username">Например: john если Ваш адрес john@sip.example.org</string>
-  <string name="pref_help_domain">sip.example.org если Ваш адрес john@sip.example.org</string>
-  <string name="pref_help_password">You have to re-enter your password if you edit the username and/or the domain</string>
-  <string name="pref_expire_title">Истекает</string>
-  <string name="pref_escape_plus">Заменить + на 00</string>
-  <string name="pref_auth_userid">Auth userid</string>
-  <string name="pref_display_name">Display name</string>
-  <string name="pref_prefix">Префикс</string>
-  <string name="pref_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">Удалить учётную запись</string>
-  <string name="pref_default_account">Использовать как основную</string>
-  <!--Settings-->
-  <string name="pref_sipaccounts">Учётные записи SIP</string>
-  <string name="default_account_flag">Default account</string>
-  <string name="pref_add_account">Добавить учётную запись</string>
-  <string name="pref_tunnel">Туннель</string>
-  <string name="pref_tunnel_host">Сервер</string>
-  <string name="pref_tunnel_port">Порт</string>
-  <string name="pref_tunnel_mode">Режим</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string-array name="tunnel_mode_entries">
-    <item>выключено</item>
-    <item>только 3G</item>
-    <item>всегда</item>
-    <item>авто</item>
-  </string-array>
-  <string name="pref_none">Отсутствует</string>
-  <string name="pref_preferences_title">Настройки</string>
-  <string name="pref_video_enable_title">Разрешить видео</string>
-  <!--Audio settings-->
-  <string name="pref_audio_title">Аудио</string>
-  <string name="pref_echo_cancellation">Шумоподавление</string>
-  <string name="pref_echo_cancellation_summary">Удаляет эхо, слышимое другой стороной</string>
-  <string name="ec_calibrating">Настраиваем…</string>
-  <string name="no_echo">Нет эха</string>
-  <string name="failed">неудавшийся</string>
-  <string name="pref_codecs">Кодеки</string>
-  <!--Video settings-->
-  <string name="pref_video_title">Видео</string>
-  <string name="pref_video_use_front_camera_title">Использовать фронтальную камеру</string>
-  <string name="pref_video_initiate_call_with_video_title">Начинать видео звонки</string>
-  <string name="pref_video_initiate_call_with_video">Всегда посылать видео запросы</string>
-  <string name="pref_video_automatically_accept_video_title">Принимать входящие видео звонки</string>
-  <string name="pref_video_automatically_accept_video">Всегда принимать видео запросы</string>
-  <string name="pref_preferred_video_size">Preferred video size</string>
-  <string name="pref_video_codecs_title">Кодеки</string>
-  <!--Call settings-->
-  <string name="pref_call_title">Звонок</string>
-  <string name="pref_rfc2833_dtmf">Послать RFC2833 DTMFs</string>
-  <string name="pref_sipinfo_dtmf">Послать SIP INFO DTMFs</string>
-  <!--Network settings-->
-  <string name="pref_network_title">Сеть</string>
-  <string name="pref_stun_server">Сервер Stun</string>
-  <string name="pref_ice_enable">Разрешить ICE</string>
-  <string name="pref_upnp_enable">Enable UPNP</string>
-  <string name="pref_transport_use_random_ports">Использовать случайный порт</string>
-  <string name="pref_sip_port_title">SIP порт занят</string>
-  <string name="pref_video_port_title">Видео порт или диапазон портов</string>
-  <string name="pref_audio_port_title">Аудио порт или диапазон портов</string>
-  <string name="pref_video_port_description">Видео порт или диапазон портов (минимум-максимум)</string>
-  <string name="pref_audio_port_description">Аудио порт или диапазон портов (минимум-максимум)</string>
-  <string name="pref_media_encryption">Шифрование потока</string>
-  <string name="pref_push_notification">Разрешить серверные уведомления</string>
-  <!--Advanced settings-->
-  <string name="pref_advanced_title">Продвинутые</string>
-  <string name="pref_debug">Отладка</string>
-  <string name="pref_background_mode">Фоновый режим</string>
-  <string name="pref_animation_enable_title">Разрешить анимацию</string>
-  <string name="pref_autostart">Запускаться с системой</string>
-  <string name="pref_image_sharing_server_title">Общий сервер</string>
-  <string name="pref_remote_provisioning_title">Удалённое резервирование</string>
-  <string name="pref_primary_account_title">Основная учётная запись</string>
-  <string name="pref_display_name_title">Отображаемое имя</string>
-  <string name="pref_user_name_title">Имя пользователя</string>
-  <!--Audio hack settings-->
-  <string name="pref_audio_hacks_title">Audio хаки</string>
-  <string name="pref_audio_use_specific_mode_title">Использовать хаки спец. режима</string>
-  <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (по умолчанию), 2=MODE_IN_CALL</string>
-  <string name="pref_audio_hacks_use_routing_api_title">Использовать хак API маршрутизации</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">Использовать аудио хак Galaxy S</string>
-  <!--Content description-->
-  <string name="content_description_back">Назад</string>
-  <string name="content_description_dialer">Клавиатура</string>
-  <string name="content_description_decline">Отклонить</string>
-  <string name="content_description_hang_up">Положить трубку</string>
-  <string name="content_description_accept">Accept</string>
-  <string name="content_description_edit">Редактировать</string>
-  <string name="content_description_add_contact">Кнопка добавить к контактам</string>
-  <string name="content_description_new_contact">Новый контакт</string>
-  <string name="content_description_call">Звонок</string>
-  <string name="content_description_chat">Чат</string>
-  <string name="content_description_delete">Удалить</string>
-  <string name="content_description_add">Добавить звонок</string>
-  <string name="content_description_add_call">Добавить звонок</string>
-  <string name="content_description_conference">Конференция</string>
-  <string name="content_description_default_account">Default account</string>
-  <string name="content_description_contact_first_name">Имя</string>
-  <string name="content_description_contact_last_name">Фамилия</string>
-  <string name="content_description_transfer">Перевести</string>
-  <string name="content_description_bluetooth">Bluetooth</string>
-</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
deleted file mode 100644
index 16090a149..000000000
--- a/res/values-sr/strings.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Custom-->
-  <string name="app_name">Линфон</string>
-  <string name="service_name">Услуга Линфона</string>
-  <string name="addressbook_label">Линфон</string>
-  <string name="notification_title">Линфон</string>
-  <string name="wait_dialog_text">Покрећем се</string>
-  <string name="tunnel_host"></string>
-  <!--Common-->
-  <string name="username">Корисничко име</string>
-  <string name="display_name">Приказано име</string>
-  <string name="password">Лозинка</string>
-  <string name="delete">Обриши</string>
-  <string name="retry">Понови</string>
-  <string name="cancel">Откажи</string>
-  <string name="accept">Прихвати</string>
-  <string name="continue_text">Настави</string>
-  <string name="about">Инфо</string>
-  <string name="deny">Одбијам</string>
-  <string name="search">Претрага</string>
-  <string name="outgoing">Одлазни</string>
-  <string name="incoming">Долазни</string>
-  <string name="missed">Пропуштени</string>
-  <string name="settings">Подешавања</string>
-  <string name="decline">Одбаци</string>
-  <string name="conference">Конференција</string>
-  <!--Launch screen-->
-  <!--Assistant-->
-  <string name="assistant_welcome_desc">Овај помоћник ће вам помоћи да користите СИП налог за ваше позиве.</string>
-  <string name="transport">Пренос</string>
-  <string name="assistant_account_not_validated">Ваш налог још није потврђен.</string>
-  <string name="assistant_account_validated">Ваш налог је потврђен.</string>
-  <string name="wizard_failed">Дошло је до грепке, пробајте опет касније.</string>
-  <string name="wizard_username_unavailable">Ово корисничко име је већ у употреби.</string>
-  <string name="first_launch_no_login_password">Упишите вашу пријаву и лозинку</string>
-  <!--Dailer-->
-  <!--History-->
-  <string name="today">Данас</string>
-  <string name="yesterday">Јуче</string>
-  <!--Contacts-->
-  <string name="no_contact">Нема контакта у вашем адресару.</string>
-  <string name="no_sip_contact">Нема СИП контакта у вашем адресару.</string>
-  <string name="sip_address">СИП адреса</string>
-  <string name="phone_number">Број телефона</string>
-  <string name="contact_first_name">Име</string>
-  <string name="contact_last_name">Презиме</string>
-  <!--Chat-->
-  <string name="remote_composing">Удаљени пише...</string>
-  <string name="share_picture_size_small">Мала</string>
-  <string name="share_picture_size_medium">Средња</string>
-  <string name="share_picture_size_large">Велика</string>
-  <string name="share_picture_size_real">Стварна величина</string>
-  <string name="text_copied_to_clipboard">Текст је умножен у оставу</string>
-  <string name="copy_text">Умножи текст</string>
-  <string name="image_picker_title">Изабери извор</string>
-  <string name="image_saved">Слика је сачувана</string>
-  <string name="image_not_saved">Грешка, слика није сачувана</string>
-  <string name="wait">Молим сачекајте...</string>
-  <string name="processing_image">Обрађујем слику, може да потраје неколико скунде у зависности од величине датотеке</string>
-  <!--Status Bar-->
-  <string name="status_connected">Уписан</string>
-  <string name="status_in_progress">Упис је у току</string>
-  <string name="status_error">Упис није успео</string>
-  <string name="voicemail_unread"> непрочитане поруке</string>
-  <!--Side Menu-->
-  <string name="menu_settings">Подешавања</string>
-  <string name="menu_about">Инфо</string>
-  <!--Call-->
-  <string name="unknown_incoming_call_name">Непознато</string>
-  <string name="call_stats_audio">Звук</string>
-  <string name="call_stats_video">Видео</string>
-  <string name="call_stats_codec">Кодек:</string>
-  <string name="call_stats_upload">Пропусни опсег отпремања:</string>
-  <string name="call_stats_download">Пропусни опсег преузимања:</string>
-  <string name="call_stats_ice">ИЦЕ повезивост:</string>
-  <string name="call_stats_video_resolution">Величина видеа:</string>
-  <string name="call">Позови</string>
-  <!--About-->
-  <string name="menu_send_log">Пошаљи дневник</string>
-  <string name="menu_reset_log">Поврати дневник</string>
-  <!--Service-->
-  <string name="incall_notif_active">Одлазни звучни позив</string>
-  <string name="incall_notif_paused">Одлазни заустављени позив</string>
-  <string name="incall_notif_video">Одлазни позив видео снимања</string>
-  <string name="notification_started">започето</string>
-  <string name="unread_messages">непрочитаних порука: %i</string>
-  <!--Errors-->
-  <string name="skipable_error_service_not_ready">Упозорење: услуга није спремна</string>
-  <string name="error">Грешка</string>
-  <string name="error_unknown">Непозната грешка</string>
-  <string name="error_call_declined">Позив је одбијен</string>
-  <string name="error_user_not_found">Корисник није нађен</string>
-  <string name="error_incompatible_media">Несагласни параметри медија</string>
-  <string name="error_network_unreachable">Мрежа није доступна</string>
-  <string name="error_bad_credentials">Лоша уверења</string>
-  <string name="error_unauthorized">Неовлашћен</string>
-  <string name="error_io_error">Грешка мреже</string>
-  <string name="remote_provisioning_failure">Нисам успео да преузмем или да применим профил прибављања удаљеног...</string>
-  <string name="remote_provisioning_again_title">Прибављање удаљеног</string>
-  <!--Account Settings-->
-  <string name="pref_sipaccount">СИП налог</string>
-  <string name="pref_manage_title">Управљај</string>
-  <string name="pref_disable_account">Искључи</string>
-  <string name="pref_proxy">Посредник</string>
-  <string name="pref_domain">Домен*</string>
-  <string name="pref_passwd">Лозинка*</string>
-  <string name="pref_username">Корисник*</string>
-  <string name="pref_enable_outbound_proxy">Outbound proxy</string>
-  <string name="pref_help_proxy">Назив домаћина СИП посредника или ип адреса (изборно)</string>
-  <string name="pref_help_outbound_proxy">Усмери све позиве кроз СИП посредника</string>
-  <string name="pref_help_username">Пример: „pera“ ако је ваш налог „pera@sip.primer.org“</string>
-  <string name="pref_help_domain">„sip.primer.org“ ако је ваш налог „pera@sip.primer.org“</string>
-  <string name="pref_help_password">Морате поново да унесете вашу лозинку ако измените ваше корисничко име и/или домен</string>
-  <string name="pref_expire_title">Истиче</string>
-  <string name="pref_avpf">АВПФ</string>
-  <string name="pref_avpf_rr_interval"> АВПФ редован РТЦП период у секундама (између 1 и 5)</string>
-  <string name="pref_escape_plus">Замени + са 00</string>
-  <string name="pref_auth_userid">Иб корисника потврђивања</string>
-  <string name="pref_display_name">Приказано име</string>
-  <string name="pref_prefix">Префикс</string>
-  <string name="pref_transport">Пренос</string>
-  <string name="pref_transport_udp">УДП</string>
-  <string name="pref_transport_tcp">ТЦП</string>
-  <string name="pref_transport_tls">ТЛС</string>
-  <string name="pref_delete_account">Обриши овај налог</string>
-  <string name="pref_default_account">Користи као основни</string>
-  <!--Settings-->
-  <string name="pref_sipaccounts">СИП налози</string>
-  <string name="default_account_flag">Основни налог</string>
-  <string name="pref_add_account">Додај налог</string>
-  <string name="pref_tunnel">Тунел</string>
-  <string name="pref_tunnel_host">Домаћин</string>
-  <string name="pref_tunnel_port">Прикључник</string>
-  <string name="pref_tunnel_mode">Режим</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string-array name="tunnel_mode_entries">
-    <item>искључено</item>
-    <item>само 3Г</item>
-    <item>увек</item>
-    <item>самостално</item>
-  </string-array>
-  <string name="pref_none">Ништа</string>
-  <string name="pref_preferences_title">Поставке</string>
-  <string name="pref_video_enable_title">Укључи видео</string>
-  <!--Audio settings-->
-  <string name="pref_audio_title">Звук</string>
-  <string name="pref_echo_cancellation">Брисање одјека</string>
-  <string name="pref_echo_cancellation_summary">Уклања одјек који чује друга страна</string>
-  <string name="ec_calibrating">Калибрирам…</string>
-  <string name="no_echo">Нема одјека</string>
-  <string name="failed">неуспех</string>
-  <string name="pref_adaptive_rate_control">Adaptive rate control</string>
-  <string name="pref_codec_bitrate_limit">Ограничење битског протока кодека</string>
-  <string name="pref_codecs">Кодеци</string>
-  <!--Video settings-->
-  <string name="pref_video_title">Видео</string>
-  <string name="pref_video_use_front_camera_title">Користи предњу камеру</string>
-  <string name="pref_video_initiate_call_with_video_title">Започни видео позиве</string>
-  <string name="pref_video_initiate_call_with_video">Увек пошаљи видео захтеве</string>
-  <string name="pref_video_automatically_accept_video_title">Прихвати долазне видео захтеве</string>
-  <string name="pref_video_automatically_accept_video">Увек прихвати видео захтеве</string>
-  <string name="pref_preferred_video_size">Жељена величина снимка</string>
-  <string name="pref_bandwidth_limit">Ограничење опсега у kb/s</string>
-  <string name="pref_video_codecs_title">Кодеци</string>
-  <!--Call settings-->
-  <string name="pref_call_title">Позови</string>
-  <string name="pref_rfc2833_dtmf">Пошаљи РФЦ2833 ДТМФ-е</string>
-  <string name="pref_sipinfo_dtmf">Пошаљи СИП ИНФО ДТФ-е</string>
-  <!--Network settings-->
-  <string name="pref_network_title">Мрежа</string>
-  <string name="pref_stun_server">Стун сервер</string>
-  <string name="pref_ice_enable">Укључи ИЦЕ</string>
-  <string name="pref_upnp_enable">Укључи УПНП</string>
-  <string name="pref_transport_use_random_ports">Користи насумичне прикључнике</string>
-  <string name="pref_sip_port_title">СИП прикључник за коришћење</string>
-  <string name="pref_video_port_title">Прикључник видеа или опсег прикључника</string>
-  <string name="pref_audio_port_title">Прикључник звука или опсег прикључника</string>
-  <string name="pref_video_port_description">Прикључник видеа или опсег прикључника (најм.-најв.)</string>
-  <string name="pref_audio_port_description">Прикључник звука или опсег прикључника (најм.-најв.)</string>
-  <string name="pref_media_encryption">Шифровање медија</string>
-  <string name="pref_push_notification">Укључи обавештења гурања</string>
-  <!--Advanced settings-->
-  <string name="pref_advanced_title">Напредно</string>
-  <string name="pref_debug">Прочисти</string>
-  <string name="pref_background_mode">Режим позадине</string>
-  <string name="pref_animation_enable_title">Укључи анимације</string>
-  <string name="pref_autostart">Покрени се приликом подизања система</string>
-  <string name="pref_image_sharing_server_title">Сервер дељења</string>
-  <string name="pref_remote_provisioning_title">Прибављање удаљеног</string>
-  <string name="pref_primary_account_title">Главни налог</string>
-  <string name="pref_display_name_title">Приказано име</string>
-  <string name="pref_user_name_title">Корисничко име</string>
-  <!--Audio hack settings-->
-  <string name="pref_audio_hacks_title">Штеловања звука</string>
-  <string name="pref_audio_use_specific_mode_title">Користи нарочито режимско штеловање</string>
-  <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (основно), 2=MODE_IN_CALL</string>
-  <string name="pref_audio_hacks_use_routing_api_title">Користи штеловање АПИ рутирања</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">Користи штеловање звука Галаксија С</string>
-  <!--Content description-->
-  <string name="content_description_back">Назад</string>
-  <string name="content_description_dialer">Бројчаник</string>
-  <string name="content_description_toggle_micro">Искључи микрофон</string>
-  <string name="content_description_toggle_speaker">Искључи звучник</string>
-  <string name="content_description_decline">Одбиј</string>
-  <string name="content_description_hang_up">Прекини</string>
-  <string name="content_description_accept">Прихватам</string>
-  <string name="content_description_edit">Уреди</string>
-  <string name="content_description_add_contact">Додај у контакте</string>
-  <string name="content_description_new_contact">Нови контакт</string>
-  <string name="content_description_call">Позови</string>
-  <string name="content_description_backspace">Повратница</string>
-  <string name="content_description_chat">Ћаскање</string>
-  <string name="content_description_dial_back">Откуцај број</string>
-  <string name="content_description_contact_picture">Слика контакта</string>
-  <string name="content_description_send_message">Пошаљи поруку</string>
-  <string name="content_description_delete">Обриши</string>
-  <string name="content_description_add">Додај позив</string>
-  <string name="content_description_new_discussion">Нова расправа</string>
-  <string name="content_description_search">Претрага</string>
-  <string name="content_description_all_contacts">Сви контакти</string>
-  <string name="content_description_linphone_contacts">Контакти Линфона</string>
-  <string name="content_description_call_direction">Смер позива</string>
-  <string name="content_description_all_calls">Сви позиви</string>
-  <string name="content_description_missed_calls">Пропуштени позиви</string>
-  <string name="content_description_switch_video">Укључи видео</string>
-  <string name="content_description_add_call">Додај позив</string>
-  <string name="content_description_pause">Паузирај</string>
-  <string name="content_description_numpad">Бројевна тастатура</string>
-  <string name="content_description_history">Дугме историјата</string>
-  <string name="content_description_chat_button">Дугме ћаскања</string>
-  <string name="content_description_contacts">Дугме контакта</string>
-  <string name="content_description_call_quality">Квалитет позива</string>
-  <string name="content_description_encryption">Шифровање</string>
-  <string name="content_description_switch_camera">Укључи камеру</string>
-  <string name="content_description_cancel_button">Дугме отказивања</string>
-  <string name="content_description_message_status">Стање поруке</string>
-  <string name="content_description_conference">Конференција</string>
-  <string name="content_description_default_account">Основни налог</string>
-  <string name="content_description_contact_first_name">Име</string>
-  <string name="content_description_contact_last_name">Презиме</string>
-  <string name="content_description_transfer">Пребаци</string>
-  <string name="content_description_bluetooth">Блутут</string>
-</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
deleted file mode 100644
index 700f548ce..000000000
--- a/res/values-sv/strings.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Custom-->
-  <string name="app_name">Linphone</string>
-  <string name="service_name">Linphone-tjänst</string>
-  <string name="addressbook_label">Linphone</string>
-  <string name="notification_title">Linphone</string>
-  <string name="wait_dialog_text">Startar upp</string>
-  <string name="tunnel_host"></string>
-  <!--Common-->
-  <string name="username">Användarnamn</string>
-  <string name="display_name">Visningsnamn</string>
-  <string name="password">Lösenord</string>
-  <string name="delete">Ta bort</string>
-  <string name="retry">Försök igen</string>
-  <string name="cancel">Avbryt</string>
-  <string name="accept">Acceptera</string>
-  <string name="continue_text">Fortsätt</string>
-  <string name="about">Om</string>
-  <string name="deny">Neka</string>
-  <string name="search">Sök</string>
-  <string name="outgoing">Utgående</string>
-  <string name="incoming">Inkommande</string>
-  <string name="missed">Missade</string>
-  <string name="settings">Inställningar</string>
-  <string name="decline">Avvisa</string>
-  <string name="conference">Konferens</string>
-  <!--Launch screen-->
-  <!--Assistant-->
-  <string name="wizard_username_unavailable">Detta användarnamn används redan.</string>
-  <string name="first_launch_no_login_password">Ange din inloggning och lösenord</string>
-  <!--Dailer-->
-  <!--History-->
-  <string name="today">Idag</string>
-  <string name="yesterday">Igår</string>
-  <!--Contacts-->
-  <string name="no_contact">Inga kontakter i din adressbok.</string>
-  <string name="no_sip_contact">Inga SIP-kontakter i din adressbok.</string>
-  <string name="sip_address">SIP-adress</string>
-  <string name="phone_number">Telefonnummer</string>
-  <string name="contact_first_name">Förnamn</string>
-  <string name="contact_last_name">Efternamn</string>
-  <!--Chat-->
-  <string name="share_picture_size_small">Liten</string>
-  <string name="share_picture_size_medium">Mellan</string>
-  <string name="share_picture_size_large">Stor</string>
-  <string name="share_picture_size_real">Riktig storlek</string>
-  <string name="copy_text">Kopiera text</string>
-  <string name="image_picker_title">Välj källa</string>
-  <string name="image_saved">Bild sparad</string>
-  <string name="image_not_saved">Fel, bild ej sparad</string>
-  <string name="wait">Vänta...</string>
-  <!--Status Bar-->
-  <string name="status_connected">Registrerad</string>
-  <string name="status_in_progress">Registrering pågår</string>
-  <string name="status_error">Registrering misslyckades</string>
-  <string name="voicemail_unread">olästa meddelanden</string>
-  <!--Side Menu-->
-  <string name="menu_settings">Inställningar</string>
-  <string name="menu_about">Om</string>
-  <!--Call-->
-  <string name="unknown_incoming_call_name">Okänd</string>
-  <string name="call_stats_audio">Ljud</string>
-  <string name="call_stats_video">Video</string>
-  <string name="call_stats_upload">Uppladdningsbandbredd:</string>
-  <string name="call_stats_download">Nerladdningsbandbredd:</string>
-  <string name="call_stats_ice">ICE-anslutning:</string>
-  <string name="call_stats_video_resolution">Video-storlek:</string>
-  <string name="call">Ring</string>
-  <!--About-->
-  <string name="menu_send_log">Skicka logg</string>
-  <string name="menu_reset_log">Nollställ logg</string>
-  <!--Service-->
-  <string name="incall_notif_active">Ljudsamtal pågår</string>
-  <string name="incall_notif_paused">Pausat samtal pågår</string>
-  <string name="notification_started">startad</string>
-  <string name="unread_messages">%i olästa meddelanden</string>
-  <!--Errors-->
-  <string name="skipable_error_service_not_ready">Varning: tjänst inte redo</string>
-  <string name="error">Fel</string>
-  <string name="error_unknown">Okänt fel</string>
-  <string name="error_call_declined">Samtal avvisat</string>
-  <string name="error_user_not_found">Användare ej funnen</string>
-  <string name="error_incompatible_media">Okompatibla mediaparametrar</string>
-  <string name="error_network_unreachable">Nätverk otillgängligt</string>
-  <string name="error_bad_credentials">Felaktigt inloggningsuppgifter</string>
-  <string name="error_io_error">Nätverksfel</string>
-  <!--Account Settings-->
-  <string name="pref_sipaccount">SIP-konto</string>
-  <string name="pref_manage_title">Hantera</string>
-  <string name="pref_disable_account">Inaktivera</string>
-  <string name="pref_proxy">Proxy</string>
-  <string name="pref_domain">Domän*</string>
-  <string name="pref_passwd">Lösenord*</string>
-  <string name="pref_username">Användarnamn*</string>
-  <string name="pref_enable_outbound_proxy">Utgående proxy</string>
-  <string name="pref_avpf">AVPF</string>
-  <string name="pref_escape_plus">Ersätt + med 00</string>
-  <string name="pref_display_name">Visningsnamn</string>
-  <string name="pref_prefix">Prefix</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">Ta bort detta konto</string>
-  <string name="pref_default_account">Använd som standard</string>
-  <!--Settings-->
-  <string name="pref_sipaccounts">SIP-konton</string>
-  <string name="default_account_flag">Standardkonto</string>
-  <string name="pref_add_account">Lägg till konto</string>
-  <string name="pref_tunnel">Tunnel</string>
-  <string name="pref_tunnel_host">Värdnamn</string>
-  <string name="pref_tunnel_port">Port</string>
-  <string name="pref_tunnel_mode">Läge</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string name="pref_none">Ingen</string>
-  <string name="pref_preferences_title">Inställningar</string>
-  <string name="pref_video_enable_title">Aktivera video</string>
-  <!--Audio settings-->
-  <string name="pref_audio_title">Ljud</string>
-  <string name="ec_calibrating">Kalibrerar...</string>
-  <string name="no_echo">Inget eko</string>
-  <string name="failed">misslyckades</string>
-  <!--Video settings-->
-  <string name="pref_video_title">Video</string>
-  <string name="pref_video_use_front_camera_title">Använd front-kamera</string>
-  <string name="pref_video_initiate_call_with_video_title">Initiera videosamtal</string>
-  <string name="pref_video_initiate_call_with_video">Skicka alltid videoförfrågningar</string>
-  <string name="pref_video_automatically_accept_video_title">Acceptera inkommande videoförfrågningar</string>
-  <string name="pref_video_automatically_accept_video">Acceptera alltid videoförfrågningar</string>
-  <string name="pref_preferred_video_size">Föredragen videostorlek</string>
-  <string name="pref_bandwidth_limit">Bandbreddsgräns i kbit/s</string>
-  <!--Call settings-->
-  <string name="pref_call_title">Ring</string>
-  <string name="pref_rfc2833_dtmf">Skicka RFC2833 DTMF</string>
-  <!--Network settings-->
-  <string name="pref_network_title">Nätverk</string>
-  <string name="pref_stun_server">Stun-server</string>
-  <string name="pref_ice_enable">Aktivera ICE</string>
-  <string name="pref_upnp_enable">Aktivera UPNP</string>
-  <string name="pref_transport_use_random_ports">Använd slumpade portar</string>
-  <string name="pref_sip_port_title">SIP-port att använda</string>
-  <string name="pref_media_encryption">Media-kryptering</string>
-  <!--Advanced settings-->
-  <string name="pref_advanced_title">Avancerat</string>
-  <string name="pref_background_mode">Bakgrundsläge</string>
-  <string name="pref_animation_enable_title">Aktivera animeringar</string>
-  <string name="pref_autostart">Starta vid uppstart</string>
-  <string name="pref_image_sharing_server_title">Delar server</string>
-  <string name="pref_primary_account_title">Primärt konto</string>
-  <string name="pref_display_name_title">Visningsnamn</string>
-  <string name="pref_user_name_title">Användarnamn</string>
-  <!--Audio hack settings-->
-  <string name="pref_audio_hacks_title">Ljud-hacks</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">Använd Galaxy S-ljudhack</string>
-  <!--Content description-->
-  <string name="content_description_back">Tillbaka</string>
-  <string name="content_description_toggle_micro">Växla micro</string>
-  <string name="content_description_toggle_speaker">Växla högtalare</string>
-  <string name="content_description_decline">Avvisa</string>
-  <string name="content_description_hang_up">Lägg på</string>
-  <string name="content_description_accept">Acceptera</string>
-  <string name="content_description_edit">Redigera</string>
-  <string name="content_description_add_contact">Lägg till kontakter</string>
-  <string name="content_description_new_contact">Ny kontakt</string>
-  <string name="content_description_call">Ring</string>
-  <string name="content_description_chat">Chatt</string>
-  <string name="content_description_dial_back">Ring tillbaka</string>
-  <string name="content_description_contact_picture">Kontakt-bild</string>
-  <string name="content_description_send_message">Skicka meddelande</string>
-  <string name="content_description_delete">Ta bort</string>
-  <string name="content_description_add">Lägg till samtal</string>
-  <string name="content_description_new_discussion">Ny diskussion</string>
-  <string name="content_description_search">Sök</string>
-  <string name="content_description_all_contacts">Alla kontakter</string>
-  <string name="content_description_linphone_contacts">Linphone-kontakter</string>
-  <string name="content_description_all_calls">Alla samtal</string>
-  <string name="content_description_missed_calls">Missade samtal</string>
-  <string name="content_description_switch_video">Växla video</string>
-  <string name="content_description_add_call">Lägg till samtal</string>
-  <string name="content_description_pause">Pausa</string>
-  <string name="content_description_history">Historik-knapp</string>
-  <string name="content_description_chat_button">Chatt-knapp</string>
-  <string name="content_description_contacts">Kontakter-knapp</string>
-  <string name="content_description_call_quality">Samtalskvalitet</string>
-  <string name="content_description_encryption">Kryptering</string>
-  <string name="content_description_switch_camera">Växla kamera</string>
-  <string name="content_description_cancel_button">Avbryt-knapp</string>
-  <string name="content_description_message_status">Meddelandestatus</string>
-  <string name="content_description_conference">Konferens</string>
-  <string name="content_description_default_account">Standardkonto</string>
-  <string name="content_description_contact_first_name">Förnamn</string>
-  <string name="content_description_contact_last_name">Efternamn</string>
-  <string name="content_description_transfer">Överför</string>
-  <string name="content_description_bluetooth">Bluetooth</string>
-</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
deleted file mode 100644
index 253027cef..000000000
--- a/res/values-tr/strings.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Custom-->
-  <string name="app_name">Linphone</string>
-  <string name="service_name">Linphone Hizmeti</string>
-  <string name="addressbook_label">Linphone</string>
-  <string name="notification_title">Linphone</string>
-  <string name="wait_dialog_text">Başlatılıyor</string>
-  <string name="tunnel_host"></string>
-  <!--Common-->
-  <string name="username">Kullanıcı adı</string>
-  <string name="display_name">Görünen ad</string>
-  <string name="password">Parola</string>
-  <string name="delete">Sil</string>
-  <string name="retry">Yeniden dene</string>
-  <string name="cancel">İptal</string>
-  <string name="accept">Kabul et</string>
-  <string name="continue_text">Sürdürmek</string>
-  <string name="about">Hakkında</string>
-  <string name="deny">Yoksay</string>
-  <string name="search">Arama</string>
-  <string name="outgoing">Giden</string>
-  <string name="incoming">Gelen</string>
-  <string name="missed">Yanıtsız</string>
-  <string name="settings">Ayarlar</string>
-  <string name="decline">Reddet</string>
-  <string name="conference">Çoklu görüşme</string>
-  <!--Launch screen-->
-  <!--Assistant-->
-  <string name="assistant_welcome_desc">Bu yardımcı, aramalarınız için bir SİP hesabı kullanmanıza yardım edecek.</string>
-  <string name="transport">Taşıma</string>
-  <string name="assistant_account_not_validated">Hesabınız henüz onaylanmadı.</string>
-  <string name="assistant_account_validated">Hesabınız onaylandı.</string>
-  <string name="wizard_failed">Bir hata oluştu,daha sonra tekrar deneyin.</string>
-  <string name="wizard_username_unavailable">Bu kullanıcı adı zaten kullanılıyor.</string>
-  <string name="first_launch_no_login_password">Lütfen giriş adınızı ve parolanızı girin</string>
-  <!--Dailer-->
-  <!--History-->
-  <string name="today">Bugün</string>
-  <string name="yesterday">Dün</string>
-  <!--Contacts-->
-  <string name="no_contact">Adres defterinizde kimse yok</string>
-  <string name="no_sip_contact">Adres defterinizde SİP bağlantısı yok</string>
-  <string name="sip_address">SİP adresi</string>
-  <string name="phone_number">Telefon numarası</string>
-  <string name="contact_first_name">Ad</string>
-  <string name="contact_last_name">Soyadı</string>
-  <!--Chat-->
-  <string name="remote_composing">Karşıdan yazılıyor...</string>
-  <string name="share_picture_size_small">Küçük</string>
-  <string name="share_picture_size_medium">Orta</string>
-  <string name="share_picture_size_large">Büyük</string>
-  <string name="share_picture_size_real">Gerçek boyut</string>
-  <string name="text_copied_to_clipboard">Metin panoya kopyalandı</string>
-  <string name="copy_text">Metni kopyalama</string>
-  <string name="image_picker_title">Kaynak seç</string>
-  <string name="image_saved">Resim kaydedildi</string>
-  <string name="image_not_saved">Hata,resim kaydedilmedi</string>
-  <string name="wait">Lütfen bekleyin...</string>
-  <!--Status Bar-->
-  <string name="status_connected">Kayıtlı</string>
-  <string name="status_in_progress">Kayıt sürüyor</string>
-  <string name="status_error">Kayıt başarısız</string>
-  <string name="voicemail_unread">okunmamış iletiler</string>
-  <!--Side Menu-->
-  <string name="menu_settings">Ayarlar</string>
-  <string name="menu_about">Hakkında</string>
-  <!--Call-->
-  <string name="unknown_incoming_call_name">Bilinmeyen</string>
-  <string name="call_stats_audio">Ses</string>
-  <string name="call_stats_video">Görüntü</string>
-  <string name="call_stats_codec">Çözücü:</string>
-  <string name="call_stats_upload">Karşıya yükleme hızı:</string>
-  <string name="call_stats_download">İndirme hızı:</string>
-  <string name="call_stats_ice">İCE bağlanılabilirliği:</string>
-  <string name="call_stats_video_resolution">Görüntü boyutu:</string>
-  <string name="call">Çağrı</string>
-  <!--About-->
-  <string name="menu_send_log">Günlük gönder</string>
-  <string name="menu_reset_log">Günlüğü sıfırla</string>
-  <!--Service-->
-  <string name="incall_notif_active">Sesli arama sürüyor</string>
-  <string name="incall_notif_paused">süregiden arama duraklatıldı</string>
-  <string name="incall_notif_video">Görüntülü görüşme sürüyor</string>
-  <string name="notification_started">Başladı</string>
-  <string name="unread_messages">%i okunmamış iletiler</string>
-  <!--Errors-->
-  <string name="skipable_error_service_not_ready">Uyarı: hizmet hazır değil</string>
-  <string name="error">Hata</string>
-  <string name="error_unknown">Tanımlanmayan hata</string>
-  <string name="error_call_declined">Reddedilen çağrı</string>
-  <string name="error_user_not_found">Kullanıcı bulunamadı</string>
-  <string name="error_incompatible_media">Uyumsuz ortam değişkenleri</string>
-  <string name="error_network_unreachable">Ağa erişim yok</string>
-  <string name="error_bad_credentials">Referansı kötü</string>
-  <string name="error_unauthorized">Kimlik doğrulanmadı</string>
-  <string name="error_io_error">Ağ hatası</string>
-  <string name="remote_provisioning_again_title">Uzaktan yetkilendirme</string>
-  <!--Account Settings-->
-  <string name="pref_sipaccount">SİP Hesabı</string>
-  <string name="pref_manage_title">Yönetme</string>
-  <string name="pref_disable_account">Devre dışı</string>
-  <string name="pref_proxy">Vekil</string>
-  <string name="pref_domain">Alan adı*</string>
-  <string name="pref_passwd">Parola*</string>
-  <string name="pref_username">Kullanıcı adı*</string>
-  <string name="pref_enable_outbound_proxy">Giden vekil sunucu</string>
-  <string name="pref_help_proxy">SİP vekil sunucu makine adı veya ip adresi (isteğe bağlı)</string>
-  <string name="pref_help_outbound_proxy">Bütün çağrıları SİP vekil sunucuya yönlendir</string>
-  <string name="pref_help_username">Örneğin: John  eğer sizin hesabınız john@sip.example.org ise</string>
-  <string name="pref_help_password">Kullanıcı adı veya alan adı oluşturduysanız parolanızı tekrar girmeniz gerekir</string>
-  <string name="pref_expire_title">Süresi dolmak</string>
-  <string name="pref_avpf">AVPF</string>
-  <string name="pref_auth_userid">Kullanıcı kimliği yetkisi</string>
-  <string name="pref_display_name">Görünen ad</string>
-  <string name="pref_prefix">Önek</string>
-  <string name="pref_transport">Taşıma</string>
-  <string name="pref_transport_udp">UDP</string>
-  <string name="pref_transport_tcp">TCP-Aktarma Denetim Protokolu</string>
-  <string name="pref_transport_tls">TLS-Taşıma Katmanı Güvenliği</string>
-  <string name="pref_delete_account">Bu hesabı sil</string>
-  <string name="pref_default_account">Öntanımlıyı kullan</string>
-  <!--Settings-->
-  <string name="pref_sipaccounts">SİP Hesabı</string>
-  <string name="default_account_flag">Öntanımlı hesap</string>
-  <string name="pref_add_account">Hesap ekle</string>
-  <string name="pref_tunnel">Tünel</string>
-  <string name="pref_tunnel_host">Makine Adı</string>
-  <string name="pref_tunnel_port">Bağlanma Noktası</string>
-  <string name="pref_tunnel_mode">Kip</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string-array name="tunnel_mode_entries">
-    <item>devre dışı</item>
-    <item>sadece 3G</item>
-    <item>her zaman</item>
-    <item>kendiliğinden</item>
-  </string-array>
-  <string name="pref_none">Hiçbiri</string>
-  <string name="pref_preferences_title">Yeğlenenler</string>
-  <string name="pref_video_enable_title">Görüntü etkin</string>
-  <!--Audio settings-->
-  <string name="pref_audio_title">Ses</string>
-  <string name="pref_echo_cancellation">Yankı giderme</string>
-  <string name="pref_echo_cancellation_summary">Karşıdan gelen yankılı sesi kaldır</string>
-  <string name="ec_calibrating">Ayarlama...</string>
-  <string name="no_echo">Eko yok</string>
-  <string name="failed">başarısız</string>
-  <string name="pref_adaptive_rate_control">Uyarlanabilir oran denetimi</string>
-  <string name="pref_codec_bitrate_limit">Çözücü bitrate sınırı</string>
-  <string name="pref_codecs">Çözücüler</string>
-  <!--Video settings-->
-  <string name="pref_video_title">Görüntü</string>
-  <string name="pref_video_use_front_camera_title">Ön kamerayı kullan</string>
-  <string name="pref_video_initiate_call_with_video_title">Görüntülü arama başlat</string>
-  <string name="pref_video_initiate_call_with_video">Görüntü isteğini her zaman gönder</string>
-  <string name="pref_video_automatically_accept_video_title">Gelen görüntü isteklerini kabul et</string>
-  <string name="pref_video_automatically_accept_video">Görüntü isteklerini her zaman kabul et</string>
-  <string name="pref_preferred_video_size">Yeğlenen görüntü boyutu</string>
-  <string name="pref_bandwidth_limit">kbits/s olarak bant genişliği</string>
-  <string name="pref_video_codecs_title">Çözücüler</string>
-  <!--Call settings-->
-  <string name="pref_call_title">Çağrı</string>
-  <string name="pref_rfc2833_dtmf">RFC2833 DTMF\'yi gönder</string>
-  <string name="pref_sipinfo_dtmf">SIP INFO DTMF\'yi gönder</string>
-  <!--Network settings-->
-  <string name="pref_network_title">Ağ</string>
-  <string name="pref_stun_server">Stun sunucusu</string>
-  <string name="pref_ice_enable">İCE Etkin</string>
-  <string name="pref_upnp_enable">UPNP Etkin</string>
-  <string name="pref_transport_use_random_ports">Rastgele bağlanma noktası kullan</string>
-  <string name="pref_sip_port_title">Kullanılacak SİP bağlanma noktası</string>
-  <string name="pref_video_port_title">Görüntü bağlantı noktası veya bağlantı noktası aralığı</string>
-  <string name="pref_audio_port_title">Ses bağlantı noktası veya bağlantı noktası aralığı</string>
-  <string name="pref_video_port_description">Görüntü bağlantı noktası veya bağlantı noktası aralığı (minport-maxport)</string>
-  <string name="pref_audio_port_description">Ses bağlantı noktası veya bağlantı noktası aralığı (minport-maxport)</string>
-  <string name="pref_media_encryption">Ortam şifreleme</string>
-  <string name="pref_push_notification">Anlık bildirim etkin</string>
-  <!--Advanced settings-->
-  <string name="pref_advanced_title">Gelişmiş</string>
-  <string name="pref_debug">Hata ayıklama</string>
-  <string name="pref_background_mode">Artalan kipi</string>
-  <string name="pref_animation_enable_title">Animasyonlar etkin</string>
-  <string name="pref_autostart">Başlangıçta çalıştır</string>
-  <string name="pref_image_sharing_server_title">Sunucu paylaşımı</string>
-  <string name="pref_remote_provisioning_title">Uzaktan yetkilendirme</string>
-  <string name="pref_primary_account_title">Ana hesap</string>
-  <string name="pref_display_name_title">Görünen ad</string>
-  <string name="pref_user_name_title">Kullanıcı adı</string>
-  <!--Audio hack settings-->
-  <string name="pref_audio_hacks_title">Ses kesme</string>
-  <string name="pref_audio_use_specific_mode_title">Özgün kesme kipi kullan</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">Galaxy S ses kesmeyi kullan</string>
-  <!--Content description-->
-  <string name="content_description_back">Geri</string>
-  <string name="content_description_dialer">Telefon numarası çevirici</string>
-  <string name="content_description_toggle_micro">Mikrofon düğmesi</string>
-  <string name="content_description_toggle_speaker">Hoparlör düğmesi</string>
-  <string name="content_description_decline">Reddet</string>
-  <string name="content_description_hang_up">Telefonu kapat</string>
-  <string name="content_description_accept">Kabul et</string>
-  <string name="content_description_edit">Düzenle</string>
-  <string name="content_description_add_contact">Bağlantılara ekle</string>
-  <string name="content_description_new_contact">Yeni bağlantı</string>
-  <string name="content_description_call">Çağrı</string>
-  <string name="content_description_backspace">Geri alma</string>
-  <string name="content_description_chat">Sohbet</string>
-  <string name="content_description_dial_back">Geri aramalı</string>
-  <string name="content_description_contact_picture">Kayıtlı kişinin resmi</string>
-  <string name="content_description_send_message">İleti gönder</string>
-  <string name="content_description_delete">Sil</string>
-  <string name="content_description_add">Arama ekle</string>
-  <string name="content_description_new_discussion">Yeni tartışma</string>
-  <string name="content_description_search">Arama</string>
-  <string name="content_description_all_contacts">Tüm bağlantılar</string>
-  <string name="content_description_linphone_contacts">Linphone bağlantıları</string>
-  <string name="content_description_call_direction">Çağrı yönlendirme</string>
-  <string name="content_description_all_calls">Tüm çağrılar</string>
-  <string name="content_description_missed_calls">Yanıtsız çağrılar</string>
-  <string name="content_description_switch_video">Görüntü düğmesi</string>
-  <string name="content_description_add_call">Arama ekle</string>
-  <string name="content_description_pause">Duraklat</string>
-  <string name="content_description_numpad">Sayısal tuş takımı</string>
-  <string name="content_description_history">Geçmiş düğmesi</string>
-  <string name="content_description_chat_button">Sohbet düğmesi</string>
-  <string name="content_description_contacts">Bağlantılar düğmesi</string>
-  <string name="content_description_call_quality">Çağrı kalitesi</string>
-  <string name="content_description_encryption">Şifreleme</string>
-  <string name="content_description_switch_camera">Kamera düğmesi</string>
-  <string name="content_description_cancel_button">İptal düğmesi</string>
-  <string name="content_description_message_status">İleti durumu</string>
-  <string name="content_description_conference">Çoklu görüşme</string>
-  <string name="content_description_default_account">Öntanımlı hesap</string>
-  <string name="content_description_contact_first_name">Ad</string>
-  <string name="content_description_contact_last_name">Soyadı</string>
-  <string name="content_description_transfer">Aktarma</string>
-  <string name="content_description_bluetooth">Bluetooth</string>
-</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
deleted file mode 100644
index df11179da..000000000
--- a/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--Custom-->
-  <string name="tunnel_host"></string>
-  <!--Common-->
-  <string name="username">使用者名稱</string>
-  <string name="display_name">顯示名稱</string>
-  <string name="password">密碼</string>
-  <string name="delete">刪除</string>
-  <string name="retry">重試</string>
-  <string name="cancel">取消</string>
-  <string name="accept">接受</string>
-  <string name="continue_text">繼續</string>
-  <string name="about">關於</string>
-  <string name="deny">拒絕</string>
-  <string name="search">搜尋</string>
-  <string name="missed">未接來電</string>
-  <string name="settings">設定</string>
-  <string name="decline">拒絕</string>
-  <string name="conference">會議</string>
-  <!--Launch screen-->
-  <!--Assistant-->
-  <string name="transport">傳輸</string>
-  <string name="assistant_account_not_validated">你的帳號還沒被驗證。</string>
-  <string name="assistant_account_validated">你的帳號已經被驗證。</string>
-  <string name="wizard_failed">發生錯誤，請稍候再試。</string>
-  <string name="wizard_username_unavailable">這個使用者名稱已經被使用。</string>
-  <!--Dailer-->
-  <!--History-->
-  <string name="today">今天</string>
-  <string name="yesterday">昨天</string>
-  <!--Contacts-->
-  <string name="no_contact">通訊錄中沒有連絡人。</string>
-  <string name="no_sip_contact">通訊錄中沒有 SIP 連絡人。</string>
-  <string name="phone_number">電話號碼</string>
-  <string name="contact_first_name">名字</string>
-  <string name="contact_last_name">姓氏</string>
-  <!--Chat-->
-  <string name="share_picture_size_small">小</string>
-  <string name="share_picture_size_medium">中</string>
-  <string name="share_picture_size_large">大</string>
-  <string name="share_picture_size_real">真實大小</string>
-  <string name="text_copied_to_clipboard">文字已複製到剪貼簿</string>
-  <string name="copy_text">複製文字</string>
-  <string name="image_picker_title">選擇來源</string>
-  <string name="image_saved">已儲存圖片</string>
-  <string name="image_not_saved">錯誤，沒有儲存圖片</string>
-  <string name="wait">請稍候...</string>
-  <!--Status Bar-->
-  <string name="status_connected">已註冊</string>
-  <string name="status_in_progress">正在註冊</string>
-  <string name="status_error">註冊失敗</string>
-  <string name="voicemail_unread">未讀訊息</string>
-  <!--Side Menu-->
-  <string name="menu_settings">設定</string>
-  <string name="menu_about">關於</string>
-  <!--Call-->
-  <string name="unknown_incoming_call_name">未知</string>
-  <string name="call_stats_audio">音訊</string>
-  <string name="call_stats_video">視訊</string>
-  <string name="call_stats_codec">編碼：</string>
-  <string name="call_stats_upload">上傳頻寬：</string>
-  <string name="call_stats_download">下載頻寬：</string>
-  <string name="call_stats_video_resolution">視訊大小：</string>
-  <string name="call">通話</string>
-  <!--About-->
-  <!--Service-->
-  <string name="unread_messages">%i 未讀訊息</string>
-  <!--Errors-->
-  <string name="skipable_error_service_not_ready">關閉</string>
-  <string name="error">錯誤</string>
-  <string name="error_unknown">未知錯誤</string>
-  <string name="error_user_not_found">找不到使用者</string>
-  <string name="error_network_unreachable">無法連接網路</string>
-  <string name="error_io_error">網路錯誤</string>
-  <!--Account Settings-->
-  <string name="pref_sipaccount">SIP 帳號</string>
-  <string name="pref_manage_title">管理</string>
-  <string name="pref_disable_account">已停用</string>
-  <string name="pref_domain">網域*</string>
-  <string name="pref_passwd">密碼*</string>
-  <string name="pref_username">使用者名稱*</string>
-  <string name="pref_escape_plus">以 00 取代 +</string>
-  <string name="pref_display_name">顯示名稱</string>
-  <string name="pref_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">刪除這個帳號</string>
-  <!--Settings-->
-  <string name="pref_sipaccounts">SIP 帳號</string>
-  <string name="default_account_flag">預設帳號</string>
-  <string name="pref_add_account">加入帳號</string>
-  <string name="pref_tunnel">隧道(Tunnel)</string>
-  <string name="pref_tunnel_host">主機名稱</string>
-  <string name="pref_tunnel_port">連接埠</string>
-  <string name="pref_tunnel_mode">模式</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string-array name="tunnel_mode_entries">
-    <item>停用</item>
-    <item>只有3G</item>
-    <item>總是</item>
-    <item>自動</item>
-  </string-array>
-  <string name="pref_none">無</string>
-  <string name="pref_preferences_title">偏好設定</string>
-  <string name="pref_video_enable_title">啟用視訊</string>
-  <!--Audio settings-->
-  <string name="pref_audio_title">音訊</string>
-  <string name="pref_echo_cancellation">回音消除</string>
-  <string name="pref_echo_cancellation_summary">移除另一端聽到的回音</string>
-  <string name="ec_calibrating">校正中...</string>
-  <string name="failed">失敗</string>
-  <string name="pref_codec_bitrate_limit">編碼位元率限制</string>
-  <string name="pref_codecs">編碼</string>
-  <!--Video settings-->
-  <string name="pref_video_title">視訊</string>
-  <string name="pref_video_use_front_camera_title">使用前攝影機</string>
-  <string name="pref_video_initiate_call_with_video_title">開始視訊通話</string>
-  <string name="pref_video_initiate_call_with_video">總是傳送視訊要求</string>
-  <string name="pref_video_automatically_accept_video">總是接受視訊要求</string>
-  <string name="pref_preferred_video_size">偏好的視訊大小</string>
-  <string name="pref_video_codecs_title">編碼</string>
-  <!--Call settings-->
-  <string name="pref_call_title">通話</string>
-  <!--Network settings-->
-  <string name="pref_network_title">網路</string>
-  <string name="pref_stun_server"> Stun 伺服器</string>
-  <string name="pref_ice_enable">啟用 ICE</string>
-  <string name="pref_upnp_enable">啟用 UPNP</string>
-  <string name="pref_transport_use_random_ports">使用隨機連接埠</string>
-  <string name="pref_sip_port_title">要使用的連接埠</string>
-  <string name="pref_video_port_title">視訊連接埠或連接埠範圍</string>
-  <string name="pref_audio_port_title">音訊連接埠或連接埠範圍</string>
-  <string name="pref_video_port_description">視訊連接埠或連接埠範圍(最小連接埠-最大連接埠)</string>
-  <string name="pref_audio_port_description">音訊連接埠或連接埠範圍(最小連接埠-最大連接埠)</string>
-  <string name="pref_media_encryption">媒體加密</string>
-  <!--Advanced settings-->
-  <string name="pref_advanced_title">進階</string>
-  <string name="pref_debug">除錯</string>
-  <string name="pref_background_mode">背景模式</string>
-  <string name="pref_animation_enable_title">啟用動畫</string>
-  <string name="pref_autostart">開機時啟動</string>
-  <string name="pref_primary_account_title">主要帳號</string>
-  <string name="pref_display_name_title">顯示名稱</string>
-  <string name="pref_user_name_title">使用者名稱</string>
-  <!--Audio hack settings-->
-  <!--Content description-->
-  <string name="content_description_back">返回</string>
-  <string name="content_description_dialer">撥號器</string>
-  <string name="content_description_decline">拒絕</string>
-  <string name="content_description_hang_up">掛斷</string>
-  <string name="content_description_accept">接受</string>
-  <string name="content_description_edit">編輯</string>
-  <string name="content_description_add_contact">加入到連絡人</string>
-  <string name="content_description_new_contact">新增聯絡人</string>
-  <string name="content_description_call">通話</string>
-  <string name="content_description_backspace">Backspace</string>
-  <string name="content_description_chat">聊天</string>
-  <string name="content_description_dial_back">回播</string>
-  <string name="content_description_contact_picture">連絡人圖片</string>
-  <string name="content_description_send_message">傳送訊息</string>
-  <string name="content_description_delete">刪除</string>
-  <string name="content_description_search">搜尋</string>
-  <string name="content_description_all_contacts">所有聯絡人</string>
-  <string name="content_description_linphone_contacts">Linphone 聯絡人</string>
-  <string name="content_description_call_direction">通話方向</string>
-  <string name="content_description_all_calls">所有通話</string>
-  <string name="content_description_missed_calls">未接來電</string>
-  <string name="content_description_switch_video">切換視訊</string>
-  <string name="content_description_pause">暫停</string>
-  <string name="content_description_history">歷史按鈕</string>
-  <string name="content_description_chat_button">聊天按鈕</string>
-  <string name="content_description_contacts">聯絡人按鈕</string>
-  <string name="content_description_call_quality">通話品質</string>
-  <string name="content_description_encryption">加密</string>
-  <string name="content_description_switch_camera">切換攝影機</string>
-  <string name="content_description_cancel_button">取消按鈕</string>
-  <string name="content_description_message_status">訊息狀態</string>
-  <string name="content_description_conference">會議</string>
-  <string name="content_description_default_account">預設帳號</string>
-  <string name="content_description_contact_first_name">名字</string>
-  <string name="content_description_contact_last_name">姓氏</string>
-  <string name="content_description_transfer">轉接</string>
-  <string name="content_description_bluetooth">藍牙</string>
-</resources>
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 1d6c5dd25..2a446dd74 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -13,7 +13,6 @@
 	<bool name="orientation_portrait_only">false</bool>
 	<bool name="show_statusbar_only_on_dialer">false</bool>
 	<bool name="replace_assistant_with_old_interface">false</bool>
-
 	<string name="wizard_url">https://www.linphone.org/wizard.php</string>
 	<bool name="display_remote_provisioning_login_activity">false</bool>
 
@@ -74,13 +73,6 @@
 
 	<bool name="hide_phone_numbers_in_editor">false</bool>
 	<bool name="hide_sip_addresses_in_editor">false</bool>
-	
-	<bool name="hide_contact_phone_numbers">false</bool>
-	<bool name="hide_contact_sip_addresses">false</bool>
-	
-	<bool name="allow_only_one_phone_number">false</bool>
-	<bool name="allow_only_one_sip_address">false</bool>
-	
 	<bool name="setup_cancel_move_to_back">false</bool>
 
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3db9b47fd..5a1324090 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
 	<!-- Custom -->
 	<string name="app_name">Orange Secure Phone</string>
@@ -6,20 +6,23 @@
 	<string name="addressbook_label">Linphone</string>
 	<string name="notification_title">Orange Secure Phone</string>
 	<string name="wait_dialog_text">Starting up</string>
-	<string name="notification_registered">%s registered</string>
-	<string name="notification_register_failure">%s failed to register</string>
-	<string name="tunnel_host"></string>
-	<string name="about_version">Linphone Android %s</string>
-	<string name="about_liblinphone_version">Linphone Core %s</string>
+	<string name="notification_registered">Registered to %s </string>
+	<string name="notification_register_failure">Fails to register to %s</string>
+	<string name="about_version">Orange Secure Phone Version %s</string>
+	<string name="about_liblinphone_version">Orange Secure Phone Core %s</string>
 	<string name="about_text">GNU General Public License V2\n © 2010-2016 Belledonne Communications</string>
 	<string name="about_link">www.linphone.org</string>
+
 	<string name="sync_account_name">linphone contacts</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>
 	<string name="display_name">Display name</string>
@@ -49,13 +52,12 @@
 	<string name="conference">Conference</string>
 
 	<!-- Launch screen -->
-	<string name="app_description">the <i>libre</i> SIP client</string>
+	<string name="app_description">the libre SIP client</string>
 
 	<!-- Assistant -->
 	<string name="welcome">Welcome</string>
 	<string name="assistant">Assistant</string>
 	<string name="assistant_create_account">Create account</string>
-	<string name="assistant_finish">Finish configuration</string>
 	<string name="assistant_validate_account">Your account is created. Please check your mails to validate your account. Once it is done, come back here and click on the button.</string>
 	<string name="assistant_welcome_desc">This assistant will help you to use a SIP account for your calls.</string>
 	<string name="assistant_linphone_login_desc">Enter your username and password of Linphone account</string>
@@ -83,7 +85,7 @@
 	<string name="wizard_username_unavailable">This username is already in use.</string>
 	<string name="wizard_username_incorrect">Your username is invalid.</string>
 	<string name="wizard_email_incorrect">Your email is invalid.</string>
-	<string name="wizard_password_incorrect">Your password is invalid</string>
+	<string name="wizard_password_incorrect">Your password is invalid (6 characters min).</string>
 	<string name="wizard_passwords_unmatched">Passwords do not match.</string>
 	<string name="setup_confirm_username">Your username will be %s.\r\n\r\nIt may differ from your input to match requirements.\r\nDo you accept?</string>
 	<string name="first_launch_no_login_password">Please enter your login and password</string>
@@ -307,30 +309,26 @@
 	<!-- Content description -->
 	<string name="content_description_back">Back</string>
 	<string name="content_description_dialer">Dialer</string>
-	<string name="content_description_menu">Menu</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</string>
-	<string name="content_description_edit_list">Edit List</string>
-	<string name="content_description_valid">Valid</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_dialer_back">Return to dialer</string>
 	<string name="content_description_contact_picture">Contact picture</string>
 	<string name="content_description_send_message">Send message</string>
 	<string name="content_description_detail">Details</string>
-	<string name="content_description_delete">Delete</string>
-	<string name="content_description_add">Add call</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_search_contact">Search contact</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>
@@ -349,26 +347,4 @@
 	<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>
-	<string name="content_description_username_field">Username field</string>
-	<string name="content_description_display_field">Display name field</string>
-	<string name="content_description_domain_field">Domain field</string>
-	<string name="content_description_url_field">Remote provisioning field</string>
-	<string name="content_description_confirm_password_field">Confirm password field</string>
-	<string name="content_description_email_field">Email field</string>
-	<string name="content_description_default_account">Default account</string>
-	<string name="content_description_deselect_all">Deselect all</string>
-	<string name="content_description_select_all">Select all</string>
-	<string name="content_description_delete_selection">Delete selection</string>
-	<string name="content_description_contact_first_name">First name</string>
-	<string name="content_description_contact_last_name">Last name</string>
-	<string name="content_description_back_call">Back to call</string>
-	<string name="content_description_send_file">Send a file</string>
-	<string name="content_description_message">Message</string>
-	<string name="content_description_unread_chat_message">Unread chat message</string>
-	<string name="content_description_transfer">Transfer</string>
-	<string name="content_description_earpiece">Earpiece</string>
-	<string name="content_description_bluetooth">Bluetooth</string>
-	<string name="content_description_call_options">Call options</string>
-	<string name="content_description_audio_route">Audio route</string>
-	<string name="content_description_exit_conference">Exit conference</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6c2063996..125e7170d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,21 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<style name="Default" parent="android:Theme.Holo.Light">
-		<item name="android:fastScrollThumbDrawable">@drawable/fast_scroll</item>
-		<item name="android:fastScrollTextColor">@android:color/white</item>
-		<item name="android:fastScrollPreviewBackgroundRight">@drawable/fast_scroll_preview</item>
-	</style>
-	<style name="NoTitle" parent="android:Theme.Holo.Light.NoActionBar">
-		<item name="android:fastScrollThumbDrawable">@drawable/fast_scroll</item>
-		<item name="android:fastScrollTextColor">@android:color/white</item>
-		<item name="android:fastScrollPreviewBackgroundRight">@drawable/fast_scroll_preview</item>
-	</style>
-	<style name="FullScreen" parent="android:Theme.Holo.Light.NoActionBar.Fullscreen">
-		<item name="android:fastScrollThumbDrawable">@drawable/fast_scroll</item>
-		<item name="android:fastScrollTextColor">@android:color/white</item>
-		<item name="android:fastScrollPreviewBackgroundRight">@drawable/fast_scroll_preview</item>
-	</style>
-
+	<style name="Default" parent="android:Theme.Holo.Light" />
+	<style name="NoTitle" parent="android:Theme.Holo.Light.NoActionBar" />
+	<style name="FullScreen" parent="android:Theme.Holo.Light.NoActionBar.Fullscreen" />
 
 	<style name="font1" parent="@android:style/TextAppearance.Medium">
 		<item name="android:textColor">@color/colorC</item>
diff --git a/src/org/linphone/ContactDetailsFragment.java b/src/org/linphone/ContactDetailsFragment.java
index 1326b7ea8..a5e94e81f 100644
--- a/src/org/linphone/ContactDetailsFragment.java
+++ b/src/org/linphone/ContactDetailsFragment.java
@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
+import java.io.InputStream;
 import java.util.ArrayList;
 
 import org.linphone.compatibility.Compatibility;
@@ -26,6 +27,7 @@ import org.linphone.core.LinphoneProxyConfig;
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.app.Fragment;
+import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -113,7 +115,7 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 			contactPicture.setImageBitmap(BitmapFactory.decodeStream(input));
         } else {
         	contactPicture.setImageResource(R.drawable.avatar);
-        }*/
+        }
 
 		TextView contactName = (TextView) view.findViewById(R.id.contact_name);
 		contactName.setText(contact.getFullName());
@@ -248,8 +250,8 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 				public void onClick(View view) {
 					dialog.dismiss();
 
-		if (id == R.id.back) {
-			LinphoneActivity.instance().displayContacts(false);
-		}
-	}
-}
+					if (id == R.id.back) {
+						LinphoneActivity.instance().displayContacts(false);
+					}
+				}
+			}
diff --git a/submodules/externals/libvpx b/submodules/externals/libvpx
index f659c7e99..cbecf57f3 160000
--- a/submodules/externals/libvpx
+++ b/submodules/externals/libvpx
@@ -1 +1 @@
-Subproject commit f659c7e99ee931e3611ec61609b96b5564ea2229
+Subproject commit cbecf57f3e0d85a7b7f97f3ab7c507f6fe640a93
diff --git a/submodules/externals/polarssl b/submodules/externals/polarssl
index 919006f5f..21360ca4d 160000
--- a/submodules/externals/polarssl
+++ b/submodules/externals/polarssl
@@ -1 +1 @@
-Subproject commit 919006f5f33febe72205078a125fae811b12a3d6
+Subproject commit 21360ca4d45c47f16952fa1f75c21600c4e26d7e
diff --git a/submodules/externals/srtp b/submodules/externals/srtp
index befc23777..a752d47da 160000
--- a/submodules/externals/srtp
+++ b/submodules/externals/srtp
@@ -1 +1 @@
-Subproject commit befc23777e07efba36ffd7bda73f22c92d4e2475
+Subproject commit a752d47da1a80e634f81a57bb975b6a80fc14ffa