From 1574778a0e193804d701557ad53e0aa354ebc54c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 13 Sep 2016 10:51:23 +0200
Subject: [PATCH 1/9] Added notification when missed call(s)

---
 res/values/strings.xml                        |  2 ++
 src/org/linphone/LinphoneActivity.java        |  3 ++
 src/org/linphone/LinphoneService.java         | 32 +++++++++++++++----
 .../linphone/compatibility/ApiElevenPlus.java | 14 ++++++++
 .../compatibility/ApiSixteenPlus.java         | 14 ++++++++
 .../compatibility/ApiTwentyOnePlus.java       | 16 ++++++++++
 .../linphone/compatibility/Compatibility.java | 11 +++++++
 7 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7807e83fb..1fbb3d425 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -170,6 +170,8 @@
 	<string name="incall_notif_video">Video capturing call ongoing</string>
 	<string name="notification_started">started</string>
 	<string name="unread_messages">%i unread messages</string>
+	<string name="missed_calls_notif_title">Missed call</string>
+	<string name="missed_calls_notif_body">%i missed calls</string>
 
 	<!-- Errors -->
 	<string name="skipable_error_service_not_ready">Warning: service is not ready</string>
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 1d0cbe75a..5a93cc348 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -1386,6 +1386,9 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			String sipUri = extras.getString("ChatContactSipUri");
 			doNotGoToCallActivity = true;
 			displayChat(sipUri);
+		} else if (extras != null && extras.getBoolean("GoToHistory", false)) {
+			doNotGoToCallActivity = true;
+			changeCurrentFragment(FragmentsAvailable.HISTORY_LIST, null);
 		} else if (extras != null && extras.getBoolean("Notification", false)) {
 			if (LinphoneManager.getLc().getCallsNb() > 0) {
 				LinphoneCall call = LinphoneManager.getLc().getCalls()[0];
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 674bf5521..844cc9b9b 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -89,6 +89,7 @@ public final class LinphoneService extends Service {
 	private final static int INCALL_NOTIF_ID=2;
 	private final static int MESSAGE_NOTIF_ID=3;
 	private final static int CUSTOM_NOTIF_ID=4;
+	private final static int MISSED_NOTIF_ID=5;
 	
 	public static boolean isReady() {
 		return instance != null && instance.mTestDelayElapsed;
@@ -114,7 +115,7 @@ public final class LinphoneService extends Service {
 	private Notification mMsgNotif;
 	private Notification mCustomNotif;
 	private int mMsgNotifCount;
-	private PendingIntent mNotifContentIntent;
+	private PendingIntent mNotifContentIntent, mMissedCallsNotifContentIntent;
 	private String mNotificationTitle;
 	private boolean mDisableRegistrationStatus;
 	private LinphoneCoreListenerBase mListener;
@@ -181,6 +182,10 @@ public final class LinphoneService extends Service {
 		Intent notifIntent = new Intent(this, incomingReceivedActivity);
 		notifIntent.putExtra("Notification", true);
 		mNotifContentIntent = PendingIntent.getActivity(this, 0, notifIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+		
+		Intent missedCallNotifIntent = new Intent(this, incomingReceivedActivity);
+		missedCallNotifIntent.putExtra("GoToHistory", true);
+		mMissedCallsNotifContentIntent = PendingIntent.getActivity(this, 0, missedCallNotifIntent, PendingIntent.FLAG_UPDATE_CURRENT);
 
 		Bitmap bm = null;
 		try {
@@ -215,11 +220,26 @@ public final class LinphoneService extends Service {
 					destroyOverlay();
 				}
 				
-				// Enable the following to have missed call notifications
-				/*if (state == State.CallEnd && call.getCallLog().getStatus() == CallStatus.Missed) {
-					Notification notif = Compatibility.createSimpleNotification(instance, "Missed call", LinphoneManager.getLc().getMissedCallsCount() + " missed call", mNotifContentIntent);
-					notifyWrapper(CUSTOM_NOTIF_ID, notif);
-				}*/
+				if (state == State.CallEnd && call.getCallLog().getStatus() == CallStatus.Missed) {
+					int missedCallCount = LinphoneManager.getLcIfManagerNotDestroyedOrNull().getMissedCallsCount();
+					String body;
+					if (missedCallCount > 1) {
+						body = getString(R.string.missed_calls_notif_body).replace("%i", String.valueOf(missedCallCount));
+					} else {
+						LinphoneAddress address = call.getRemoteAddress();
+						LinphoneContact c = ContactsManager.getInstance().findContactFromAddress(address);
+						if (c != null) {
+							body = c.getFullName();
+						} else {
+							body = address.getDisplayName();
+							if (body == null) {
+								body = address.asStringUriOnly();
+							}
+						}
+					}
+					Notification notif = Compatibility.createMissedCallNotification(instance, getString(R.string.missed_calls_notif_title), body, mMissedCallsNotifContentIntent);
+					notifyWrapper(MISSED_NOTIF_ID, notif);
+				}
 
 				if (state == State.StreamsRunning) {
 					// Workaround bug current call seems to be updated after state changed to streams running
diff --git a/src/org/linphone/compatibility/ApiElevenPlus.java b/src/org/linphone/compatibility/ApiElevenPlus.java
index 6fa46d519..9dda22251 100644
--- a/src/org/linphone/compatibility/ApiElevenPlus.java
+++ b/src/org/linphone/compatibility/ApiElevenPlus.java
@@ -151,6 +151,20 @@ public class ApiElevenPlus {
 		return intent;
 	}
 
+	@SuppressWarnings("deprecation")
+	public static Notification createMissedCallNotification(Context context, String title, String text, PendingIntent intent) {
+		Notification notif = new Notification.Builder(context)
+		.setContentTitle(title)
+		.setContentText(text)
+		.setContentIntent(intent)
+		.setSmallIcon(R.drawable.call_status_missed)
+		.setAutoCancel(true)
+		.setDefaults(Notification.DEFAULT_LIGHTS | Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE)
+		.setWhen(System.currentTimeMillis()).getNotification();
+
+		return notif;
+	}
+
 	@SuppressWarnings("deprecation")
 	public static Notification createSimpleNotification(Context context, String title, String text, PendingIntent intent) {
 		Notification notif = new Notification.Builder(context)
diff --git a/src/org/linphone/compatibility/ApiSixteenPlus.java b/src/org/linphone/compatibility/ApiSixteenPlus.java
index f7fff7d2f..1bee2257e 100644
--- a/src/org/linphone/compatibility/ApiSixteenPlus.java
+++ b/src/org/linphone/compatibility/ApiSixteenPlus.java
@@ -112,6 +112,20 @@ public class ApiSixteenPlus {
 		viewTreeObserver.removeOnGlobalLayoutListener(keyboardListener);		
 	}
 
+	public static Notification createMissedCallNotification(Context context, String title, String text, PendingIntent intent) {
+		Notification notif = new Notification.Builder(context)
+		.setContentTitle(title)
+		.setContentText(text)
+		.setSmallIcon(R.drawable.call_status_missed)
+		.setAutoCancel(true)
+		.setContentIntent(intent)
+		.setDefaults(Notification.DEFAULT_LIGHTS | Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE)
+		.setWhen(System.currentTimeMillis())
+		.build();
+
+		return notif;
+	}
+
 	public static Notification createSimpleNotification(Context context, String title, String text, PendingIntent intent) {
 		Notification notif = new Notification.Builder(context)
 		.setContentTitle(title)
diff --git a/src/org/linphone/compatibility/ApiTwentyOnePlus.java b/src/org/linphone/compatibility/ApiTwentyOnePlus.java
index 66d0a37b6..ff6431a5b 100644
--- a/src/org/linphone/compatibility/ApiTwentyOnePlus.java
+++ b/src/org/linphone/compatibility/ApiTwentyOnePlus.java
@@ -112,6 +112,22 @@ public class ApiTwentyOnePlus {
 		viewTreeObserver.removeOnGlobalLayoutListener(keyboardListener);		
 	}
 
+	public static Notification createMissedCallNotification(Context context, String title, String text, PendingIntent intent) {
+		Notification notif = new Notification.Builder(context)
+		.setContentTitle(title)
+		.setContentText(text)
+		.setSmallIcon(R.drawable.call_status_missed)
+		.setAutoCancel(true)
+		.setContentIntent(intent)
+		.setDefaults(Notification.DEFAULT_ALL)
+		.setCategory(Notification.CATEGORY_MESSAGE)
+		.setVisibility(Notification.VISIBILITY_PRIVATE)
+		.setPriority(Notification.PRIORITY_HIGH)
+		.build();
+
+		return notif;
+	}
+
 	public static Notification createSimpleNotification(Context context, String title, String text, PendingIntent intent) {
 		Notification notif = new Notification.Builder(context)
 		.setContentTitle(title)
diff --git a/src/org/linphone/compatibility/Compatibility.java b/src/org/linphone/compatibility/Compatibility.java
index 2cb9336c0..574cf485b 100644
--- a/src/org/linphone/compatibility/Compatibility.java
+++ b/src/org/linphone/compatibility/Compatibility.java
@@ -46,6 +46,17 @@ public class Compatibility {
 		}
 		return notif;
 	}
+	public static Notification createMissedCallNotification(Context context, String title, String text, PendingIntent intent) {
+		Notification notif = null;
+		if (Version.sdkAboveOrEqual(Version.API21_LOLLIPOP_50)) {
+			return ApiTwentyOnePlus.createMissedCallNotification(context, title, text, intent);
+		} else if (Version.sdkAboveOrEqual(Version.API16_JELLY_BEAN_41)) {
+			notif = ApiSixteenPlus.createMissedCallNotification(context, title, text, intent);
+		} else {
+			notif = ApiElevenPlus.createMissedCallNotification(context, title, text, intent);
+		}
+		return notif;
+	}
 	
 	public static Notification createMessageNotification(Context context, int msgCount, String msgSender, String msg, Bitmap contactIcon, PendingIntent intent) {
 		Notification notif = null;		

From 49139ba2aa10c3cc39a2c3c8f62b3a1d681d8dda Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 13 Sep 2016 10:57:49 +0200
Subject: [PATCH 2/9] Updated translations from transifex

---
 res/values-ar/strings.xml     |   1 -
 res/values-de/strings.xml     |  10 +-
 res/values-es/strings.xml     |   1 -
 res/values-fi/strings.xml     |   1 -
 res/values-fr/strings.xml     |  14 +-
 res/values-he/strings.xml     |   1 -
 res/values-ja/strings.xml     |   1 -
 res/values-nl/strings.xml     |   1 -
 res/values-pl/strings.xml     | 364 ++++++++++++++++++++++++++++++++++
 res/values-pt-rBR/strings.xml |   1 -
 res/values-ru/strings.xml     |   1 -
 res/values-sr/strings.xml     |   1 -
 res/values-sv/strings.xml     |   1 -
 res/values-tr/strings.xml     |   1 -
 res/values-zh-rTW/strings.xml |  29 ++-
 res/values/strings.xml        |   2 +-
 16 files changed, 408 insertions(+), 22 deletions(-)
 create mode 100644 res/values-pl/strings.xml

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 6d9035ed2..988b7fa32 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -247,7 +247,6 @@
   <!--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>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index bb698323b..1de2040ab 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -73,6 +73,9 @@
   <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="assistant_error_bad_credentials">Falscher Benutzername oder Passwort</string>
+  <string name="assistant_codec_down_question">Sind Sie mit dem Herunterladen des OpenH264-Videocodecs, bereitgestellt von Cisco Systems, Inc., einverstanden?</string>
+  <string name="assistant_codec_downloading">OpenH264-Videocodec, bereitgestellt von Cisco Systems, Inc., wird heruntergeladen.</string>
+  <string name="assistant_codec_downloaded">OpenH264-Videocodec, bereitgestellt von Cisco Systems, Inc., heruntergeladen.</string>
   <string name="wizard_failed">Es ist ein Fehler aufgetreten, versuchen Sie es später nochmal</string>
   <string name="wizard_server_unavailable">Server nicht erreichbar, überprüfen Sie Ihre Netzwerkverbindung.</string>
   <string name="wizard_username_unavailable">Der Benutzername wird bereits verwendet.</string>
@@ -100,6 +103,7 @@
   <string name="phone_number">Telefonnummer</string>
   <string name="contact_first_name">Vorname</string>
   <string name="contact_last_name">Nachname</string>
+  <string name="contact_organization">Organisation</string>
   <!--Chat-->
   <string name="no_chat_history">Keine Gespräche</string>
   <string name="delete_conversation">Möchten Sie das ausgewählte Gespräch löschen?</string>
@@ -246,6 +250,8 @@
   <string name="pref_video_codecs_title">Codecs</string>
   <!--Call settings-->
   <string name="pref_call_title">Anruf</string>
+  <string name="pref_device_ringtone">Geräteklingelton verwenden</string>
+  <string name="pref_auto_answer">Eingehende Anrufe automatisch beantworten</string>
   <string name="pref_rfc2833_dtmf">RFC2833 DTMFs senden</string>
   <string name="pref_sipinfo_dtmf">SIP INFO DTMFs senden</string>
   <string name="pref_voice_mail">Sprachnachricht-URI</string>
@@ -260,8 +266,8 @@
   <!--Network settings-->
   <string name="pref_network_title">Netzwerk</string>
   <string name="pref_wifi_only">Nur WiFi verwenden</string>
-  <string name="pref_stun_server">Stun-Server</string>
   <string name="pref_ice_enable">ICE aktivieren</string>
+  <string name="pref_turn_enable">TURN 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>
@@ -281,6 +287,7 @@
   <string name="pref_autostart">Beim Einschalten starten</string>
   <string name="pref_incoming_call_timeout_title">Auflegen bei eingehendem Anruf (in Sekunden)</string>
   <string name="pref_remote_provisioning_title">Fernbereitstellung</string>
+  <string name="pref_android_app_settings_title">Android-App-Einstellungen</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>
@@ -347,6 +354,7 @@
   <string name="content_description_delete_selection">Auswahl löschen</string>
   <string name="content_description_contact_first_name">Vorname</string>
   <string name="content_description_contact_last_name">Nachname</string>
+  <string name="content_description_contact_organization">Organisation</string>
   <string name="content_description_back_call">Zurück zum Anruf</string>
   <string name="content_description_send_file">Datei senden</string>
   <string name="content_description_message">Nachricht</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f0b79081c..a0da56384 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -150,7 +150,6 @@
   <string name="pref_chat_title">Chat</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>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index cef47c494..69c54a224 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -244,7 +244,6 @@
   <!--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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 4dc80e8ca..5aa8c3d23 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -74,6 +74,9 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
   <string name="assistant_account_not_validated">Votre compte n\'a pas encore été validé.</string>
   <string name="assistant_account_validated">Votre compte à été validé.</string>
   <string name="assistant_error_bad_credentials">Nom d\'utilisateur ou mot de passe invalide</string>
+  <string name="assistant_codec_down_question">Voulez-vous télécharger le codec vidéo OpenH264 fourni par Cisco Systems, Inc. ? </string>
+  <string name="assistant_codec_downloading">Téléchargement du codec vidéo OpenH264 fourni par Cisco Systems, Inc.</string>
+  <string name="assistant_codec_downloaded">Téléchargement du codec vidéo OpenH264 fourni par Cisco Systems, Inc effectué.</string>
   <string name="wizard_failed">Une erreur est survenue, réessayez plus tard.</string>
   <string name="wizard_server_unavailable">Serveur indisponible, veuillez vérifier votre connexion réseau.</string>
   <string name="wizard_username_unavailable">Ce nom d\'utilisateur est déjà pris.</string>
@@ -101,6 +104,7 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
   <string name="phone_number">Numéro de téléphone</string>
   <string name="contact_first_name">Prénom</string>
   <string name="contact_last_name">Nom</string>
+  <string name="contact_organization">Société</string>
   <!--Chat-->
   <string name="no_chat_history">Aucune conversation</string>
   <string name="delete_conversation">Voulez-vous supprimer la discussion sélectionnée ?</string>
@@ -154,6 +158,8 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
   <string name="incall_notif_video">Appel vidéo en cours</string>
   <string name="notification_started">démarré</string>
   <string name="unread_messages">%i messages non lus</string>
+  <string name="missed_calls_notif_title">Appel manqué</string>
+  <string name="missed_calls_notif_body">%i appels manqués</string>
   <!--Errors-->
   <string name="skipable_error_service_not_ready">Attention : le service n\'est pas prêt</string>
   <string name="error">Erreur</string>
@@ -225,6 +231,7 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
   <string name="pref_echo_cancellation">Annulateur d\'écho</string>
   <string name="pref_echo_cancellation_summary">Supprime l\'écho entendu de l\'autre côté</string>
   <string name="pref_echo_canceller_calibration">Calibration de l\'annulateur d\'écho</string>
+  <string name="pref_echo_tester">Tester l\'écho</string>
   <string name="ec_calibrating">Calibration…</string>
   <string name="ec_calibrated">Calibré en %s ms</string>
   <string name="no_echo">Pas d\'écho</string>
@@ -264,8 +271,11 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
   <!--Network settings-->
   <string name="pref_network_title">Réseau</string>
   <string name="pref_wifi_only">Utiliser WiFi uniquement</string>
-  <string name="pref_stun_server">Serveur Stun</string>
+  <string name="pref_stun_server">Serveur STUN / TURN</string>
   <string name="pref_ice_enable">Activer ICE</string>
+  <string name="pref_turn_enable">Activer TURN</string>
+  <string name="pref_turn_username_title">Identifiant STUN / TURN (optionnel)</string>
+  <string name="pref_turn_passwd_title">Mot de passe STUN / TURN (optionnel)</string>
   <string name="pref_upnp_enable">Activer UPNP</string>
   <string name="pref_transport_use_random_ports">Utiliser des ports aléatoires</string>
   <string name="pref_sip_port_title">Port SIP à utiliser si port aléatoire désactivé</string>
@@ -285,6 +295,7 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
   <string name="pref_autostart">Démarrer au lancement du téléphone</string>
   <string name="pref_incoming_call_timeout_title">Ignorer les appels entrants après (en secondes)</string>
   <string name="pref_remote_provisioning_title">Configuration distante</string>
+  <string name="pref_android_app_settings_title">Infos appli Android</string>
   <string name="pref_primary_account_title">Compte principal</string>
   <string name="pref_display_name_title">Nom d\'affichage</string>
   <string name="pref_user_name_title">Nom d\'utilisateur</string>
@@ -351,6 +362,7 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
   <string name="content_description_delete_selection">Supprimer la sélection</string>
   <string name="content_description_contact_first_name">Prénom</string>
   <string name="content_description_contact_last_name">Nom</string>
+  <string name="content_description_contact_organization">Société</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>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index e5cd6517f..7092176ea 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -71,7 +71,6 @@
   <string name="pref_chat_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>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 112d9524b..f58665a85 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -243,7 +243,6 @@
   <!--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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d113654d2..9551dd30f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -99,7 +99,6 @@
   <string name="pref_chat_title">Chat</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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
new file mode 100644
index 000000000..1a184aa86
--- /dev/null
+++ b/res/values-pl/strings.xml
@@ -0,0 +1,364 @@
+<?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">Uruchamianie</string>
+  <string name="notification_registered">%s zarejestrowany</string>
+  <string name="notification_register_failure">%s nie udało się zarejestrować</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="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">kontakt linphone</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>
+  <!--Common-->
+  <string name="username">Nazwa użytkownika</string>
+  <string name="display_name">Nazwa wyświetlana</string>
+  <string name="password">Hasło</string>
+  <string name="confirm_password">Potwierdź hasło</string>
+  <string name="domain">Domena</string>
+  <string name="remote_provisioning_url">URL</string>
+  <string name="email">Email</string>
+  <string name="delete_text">Czy na pewno chcesz skasować dokonany wybór?</string>
+  <string name="delete">Usuń</string>
+  <string name="retry">Spróbuj ponownie</string>
+  <string name="cancel">Anuluj</string>
+  <string name="accept">Akceptuj</string>
+  <string name="continue_text">Kontynuuj </string>
+  <string name="about">O nas</string>
+  <string name="deny">Zaprzeczać</string>
+  <string name="no_account">Konto nie zostało skonfigurowane</string>
+  <string name="search">Szukaj</string>
+  <string name="outgoing">Wyjście</string>
+  <string name="incoming">Przychodzące</string>
+  <string name="missed">Nieodebrane</string>
+  <string name="settings">Ustawienia</string>
+  <string name="connect">Połączenie</string>
+  <string name="decline">Utracone</string>
+  <string name="conference">Konferencja</string>
+  <!--Launch screen-->
+  <string name="app_description"><i>libre</i> klient SIP</string>
+  <!--Assistant-->
+  <string name="welcome">Witam</string>
+  <string name="assistant">Asystent</string>
+  <string name="assistant_create_account">Stwórz konto</string>
+  <string name="assistant_finish">Zakończ konfigurację</string>
+  <string name="assistant_validate_account">Konto zostało utworzone. Proszę sprawdzić pocztę, aby zweryfikować konto. Po weryfikacji proszę wrócić tutaj i kliknąć przycisk.</string>
+  <string name="assistant_welcome_desc">Ten asystent pomoże Ci używać konta połączeń SIP.</string>
+  <string name="assistant_linphone_login_desc">Wprowadź swoją nazwę użytkownika i hasło konta Linphone</string>
+  <string name="assistant_login_desc">Wprowadź swoją nazwę użytkownika i hasło w domenie SIP</string>
+  <string name="assistant_remote_provisioning_desc">Proszę podać swoje zastrzeganie URL</string>
+  <string name="transport">Transport</string>
+  <string name="assistant_login_linphone">Użyj konta Linphone</string>
+  <string name="assistant_login_generic">Użyj konta SIP</string>
+  <string name="assistant_remote_provisioning">Pobierz zdalną konfigurację</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">Wyświetl nazwę (opcjonalnie)</string>
+  <string name="assistant_linphone_account">Skonfiguruj konto Linphone</string>
+  <string name="assistant_generic_account">Skonfiguruj konto SIP</string>
+  <string name="assistant_remote_provisioning_title">Pobierz zdalną konfigurację </string>
+  <string name="assistant_fetch_apply">Pobierz i zastosuj</string>
+  <string name="assistant_login">Login</string>
+  <string name="assistant_ec_calibration">Anulacja kalibracji echo w trakcie</string>
+  <string name="assistant_remote_provisioning_login">Podaj login</string>
+  <string name="assistant_account_not_validated">Twoje konto nie zostało jeszcze zatwierdzone.</string>
+  <string name="assistant_account_validated">Twoje konto zostało zatwierdzone.</string>
+  <string name="assistant_error_bad_credentials">Niepoprawna nazwa użytkownika lub hasło</string>
+  <string name="assistant_codec_down_question">Czy zgadzają się Państwo na pobranie OpenH264 Video Codec dostarczonego przez Cisco Systems, Inc.?</string>
+  <string name="assistant_codec_downloading">Pobieranie OpenH264 Video Codec dostarczane przez Cisco Systems, Inc.</string>
+  <string name="assistant_codec_downloaded">OpenH264 Video Codec dostarczane przez Cisco Systems, Inc. Zostało pobrane. </string>
+  <string name="wizard_failed">Wystąpił błąd, spróbuj ponownie później.</string>
+  <string name="wizard_server_unavailable">Serwer niedostępny, sprawdź swoje połączenie sieciowe.</string>
+  <string name="wizard_username_unavailable">Nazwa użytkownika zajęta.</string>
+  <string name="wizard_username_incorrect">Twoja nazwa użytkownika jest nieprawidłowa.</string>
+  <string name="wizard_email_incorrect">Twój email jest niepoprawny.</string>
+  <string name="wizard_password_incorrect">Twoje hasło jest nieprawidłowe</string>
+  <string name="wizard_passwords_unmatched">Hasła nie pasują do siebie.</string>
+  <string name="setup_confirm_username">Twoja nazwa użytkownika będzie %s.\r\n\r\nIt  może różnić się od danych wejściowych w celu dopasowania wymagań. \ Czy akceptujesz?</string>
+  <string name="first_launch_no_login_password">Podaj swój login i hasło</string>
+  <string name="forgot_password">Zapomniałeś hasła ?</string>
+  <!--Dailer-->
+  <string name="address_bar_hint">Wprowadź numer lub adres</string>
+  <!--History-->
+  <string name="no_call_history">Brak połączeń w historii</string>
+  <string name="no_missed_call_history">Brak nieodebranego połączenia w historii</string>
+  <string name="delete_history_log">Czy chcesz usunąć zaznaczony rejestr połączeń?</string>
+  <string name="today">Dzisiaj</string>
+  <string name="yesterday">Wczoraj</string>
+  <!--Contacts-->
+  <string name="no_contact">Brak kontaktu w książce adresowej.</string>
+  <string name="no_sip_contact">Brak kontaktu SIP w książce adresowej.</string>
+  <string name="delete_contacts">Czy chcesz usunąć wybrane kontakty?</string>
+  <string name="delete_contact">Czy chcesz usunąć wybrany kontakt?</string>
+  <string name="sip_address">Adres SIP</string>
+  <string name="phone_number">Numer telefonu</string>
+  <string name="contact_first_name">Imię</string>
+  <string name="contact_last_name">Nazwisko</string>
+  <string name="contact_organization">Organizacja</string>
+  <!--Chat-->
+  <string name="no_chat_history">Brak rozmów</string>
+  <string name="delete_conversation">Czy chcesz usunąć wybraną rozmowę?</string>
+  <string name="delete_message">Czy chcesz usunąć zaznaczoną wiadomość?</string>
+  <string name="remote_composing">Zdalne pisanie ...</string>
+  <string name="share_picture_size_small">Mały</string>
+  <string name="share_picture_size_medium">Średni</string>
+  <string name="share_picture_size_large">Duży</string>
+  <string name="share_picture_size_real">Rzeczywisty rozmiar</string>
+  <string name="text_copied_to_clipboard">Tekst skopiowany do schowka</string>
+  <string name="copy_text">Kopiowanie tekstu</string>
+  <string name="image_picker_title">Wybierz źródło</string>
+  <string name="image_saved">Obraz zapisany</string>
+  <string name="image_not_saved">Błąd, obraz nie został zapisany</string>
+  <string name="wait">Proszę czekać...</string>
+  <string name="processing_image">Przetwarzania obrazu, może potrwać nawet do kilku sekund w zależności od rozmiaru pliku</string>
+  <!--Status Bar-->
+  <string name="status_connected">Zarejestrowany</string>
+  <string name="status_not_connected">Nie zarejestrowany</string>
+  <string name="status_in_progress">Rejestracja w trakcie</string>
+  <string name="status_error">Rejestracja nie powiodła się</string>
+  <string name="voicemail_unread">Nieprzeczytane wiadomości</string>
+  <!--Side Menu-->
+  <string name="menu_assistant">Asystent </string>
+  <string name="menu_settings">Ustawienia</string>
+  <string name="menu_about">O nas </string>
+  <string name="quit">Zamknij</string>
+  <!--Call-->
+  <string name="incoming_call">Połączenie przychodzące</string>
+  <string name="outgoing_call">Połączenia wychodzące</string>
+  <string name="add_video_dialog">Twój rozmówca chciałby włączyć wideo</string>
+  <string name="no_current_call">Brak aktywnego połączenia</string>
+  <string name="call_paused_by_remote">Twój rozmówca przerwał połączenie</string>
+  <string name="couldnt_accept_call">Wystąpił błąd podczas odebrania</string>
+  <string name="zrtp_dialog">Znak ZRTP %s\n należy zaakceptować tylko jeśli mają ten sam znak, jak rozmówcy</string>
+  <string name="unknown_incoming_call_name">Nieznany</string>
+  <string name="call_stats_audio">Audio</string>
+  <string name="call_stats_video">Wideo</string>
+  <string name="call_stats_codec">Codec:</string>
+  <string name="call_stats_upload">Prześlij przepustowość:</string>
+  <string name="call_stats_download">Pobierz przepustowość:</string>
+  <string name="call_stats_ice">Łączność ICE:</string>
+  <string name="call_stats_video_resolution">Rozmiar filmu:</string>
+  <string name="call">Połączenie</string>
+  <!--About-->
+  <string name="menu_send_log">Wyślij rejestr</string>
+  <string name="menu_reset_log">Resetuj rejestr</string>
+  <!--Service-->
+  <string name="incall_notif_active">Rozmowa audio w toku</string>
+  <string name="incall_notif_paused">Pauza rozmowy w toku</string>
+  <string name="incall_notif_video">Przechwytywanie wideo rozmowy w toku</string>
+  <string name="notification_started">Rozpoczęty</string>
+  <string name="unread_messages">%i nieprzeczytane wiadomości</string>
+  <!--Errors-->
+  <string name="skipable_error_service_not_ready">Ostrzeżenie: usługa nie jest gotowa</string>
+  <string name="error">Błąd</string>
+  <string name="warning_wrong_destination_address">Nie można zbudować adresu docelowego z %s</string>
+  <string name="error_unknown">Nieznany błąd</string>
+  <string name="error_call_declined">Spadek połaczeń</string>
+  <string name="error_user_not_found">Użytkownik nie znaleziony</string>
+  <string name="error_incompatible_media">Parametry nośników niekompatybilne</string>
+  <string name="error_low_bandwidth">Twój rozmówca ma niską przepustowość,  nie można uruchomić wideo</string>
+  <string name="error_network_unreachable">Sieć jest niedostępna</string>
+  <string name="error_bad_credentials">Złe poświadczenia</string>
+  <string name="error_unauthorized">Nieautoryzowany</string>
+  <string name="error_io_error">Błąd sieci</string>
+  <string name="download_image_failed">Pobieranie nie udane. Proszę sprawdzić swoje połączenie sieciowe lub spróbuj ponownie później.</string>
+  <string name="remote_provisioning_failure">Nie udało się pobrać lub zastosować profil zdalnego zastrzegania ...</string>
+  <string name="remote_provisioning_again_title">Zdalne zastrzeganie </string>
+  <string name="remote_provisioning_again_message">Chcesz zmienić zastrzeganie URI?</string>
+  <!--Account Settings-->
+  <string name="pref_sipaccount">Konto SIP</string>
+  <string name="pref_manage_title">Zarządzanie</string>
+  <string name="pref_disable_account">Wyłączyć</string>
+  <string name="pref_proxy">Proxy</string>
+  <string name="pref_domain">Domena*</string>
+  <string name="pref_passwd">Hasło*</string>
+  <string name="pref_username">Nazwa użytkownika*</string>
+  <string name="pref_enable_outbound_proxy">Outbound proxy</string>
+  <string name="pref_help_proxy">Nazwa hosta proxy SIP lub adres IP (opcja)</string>
+  <string name="pref_help_outbound_proxy">Droga wszystkich połączeń przez proxy SIP</string>
+  <string name="pref_help_username">Przykład: Jeśli konto jest john@sip.example.org</string>
+  <string name="pref_help_domain">sip.example.org jeśli konto jest john@sip.example.org</string>
+  <string name="pref_help_password">Musisz ponownie wprowadzić hasło, jeśli edytowałeś swój login i / lub domenę</string>
+  <string name="pref_expire_title">Expire</string>
+  <string name="pref_avpf">AVPF</string>
+  <string name="pref_avpf_rr_interval">AVPF regularny odstęp RTCP w sekundach (pomiędzy 1 i 5)</string>
+  <string name="pref_escape_plus">Wymień + przez 00</string>
+  <string name="pref_friendlist_subscribe">Przyjazne subskrybowanie</string>
+  <string name="pref_auth_userid">Autoryzuj ID użytkownika</string>
+  <string name="pref_help_auth_userid">Wprowadź ID użytkownika uwierzytelniania (opcjonalnie)</string>
+  <string name="pref_display_name">Nazwa wyświetlana</string>
+  <string name="pref_help_display_name">
+Wpisz wyświetlaną nazwę (opcjonalnie)</string>
+  <string name="pref_prefix">Prefix</string>
+  <string name="pref_transport">Transport</string>
+  <string name="pref_transport_udp">UDP</string>
+  <string name="pref_transport_tcp">TCP</string>
+  <string name="pref_transport_tls">TLS</string>
+  <string name="pref_delete_account">Usuń to konto</string>
+  <string name="pref_default_account">Użyj jako domyślny</string>
+  <!--Settings-->
+  <string name="pref_sipaccounts">Konta SIP</string>
+  <string name="default_account_flag">Domyślne konto</string>
+  <string name="pref_add_account">Dodaj konto</string>
+  <string name="pref_in_app_store">W aplikacji Store</string>
+  <string name="pref_tunnel">Tunel</string>
+  <string name="pref_tunnel_host">Nazwa hosta</string>
+  <string name="pref_tunnel_port">Port</string>
+  <string name="pref_tunnel_mode">Tryb</string>
+  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
+  <string name="pref_none">Żaden</string>
+  <string name="pref_preferences_title">Preferencje</string>
+  <string name="pref_video_enable_title">Włącz wideo</string>
+  <!--Audio settings-->
+  <string name="pref_audio_title">Audio </string>
+  <string name="pref_echo_cancellation">Redukcja szumów</string>
+  <string name="pref_echo_cancellation_summary">Usuwa usłyszane echo od drugiego końca</string>
+  <string name="pref_echo_canceller_calibration">Anulowanie kalibracji echo</string>
+  <string name="ec_calibrating">Kalibracja ...</string>
+  <string name="ec_calibrated">Kalibrowane w %s ms</string>
+  <string name="no_echo">Brak echa</string>
+  <string name="failed">Nie powiodło się</string>
+  <string name="pref_adaptive_rate_control">Adaptacyjne sterowanie prędkością</string>
+  <string name="pref_codec_bitrate_limit">Limit szybkości transmisji kodeka</string>
+  <string name="pref_codecs">Kodeki</string>
+  <!--Video settings-->
+  <string name="pref_video_title">Wideo</string>
+  <string name="pref_overlay">Nakładka wideo</string>
+  <string name="pref_overlay_summary">Wywołanie wyświetlania wideo w nakładce, gdy poza aplikacją</string>
+  <string name="pref_video_use_front_camera_title">Użyj przednią kamerę</string>
+  <string name="pref_video_initiate_call_with_video_title">Inicjowanie połączeń wideo</string>
+  <string name="pref_video_initiate_call_with_video">Zawsze wysyłaj żądania wideo</string>
+  <string name="pref_video_automatically_accept_video_title">Akceptuj nadchodzące żądania wideo</string>
+  <string name="pref_video_automatically_accept_video">Zawsze akceptuj żądania wideo</string>
+  <string name="pref_video_preset">Ustawienie wideo</string>
+  <string name="pref_preferred_video_size">Preferowany rozmiar wideo</string>
+  <string name="pref_preferred_fps">Preferowany FPS</string>
+  <string name="pref_bandwidth_limit">Limit przepustowości w kbits/s</string>
+  <string name="pref_video_codecs_title">Kodeki </string>
+  <!--Call settings-->
+  <string name="pref_call_title">Połączenie </string>
+  <string name="pref_device_ringtone">Zastosowanie urządzenia dzwonka</string>
+  <string name="pref_auto_answer">Auto odbieranie przychodzących połączeń</string>
+  <string name="pref_rfc2833_dtmf">Wyślij  RFC2833 DTMFs </string>
+  <string name="pref_sipinfo_dtmf">Wyślij SIP INFO DTMFs</string>
+  <string name="pref_voice_mail">Poczta głosowa URI</string>
+  <!--Chat settings-->
+  <string name="pref_chat_title">Czat</string>
+  <string name="pref_image_sharing_server_title">Udostępnianie serwera</string>
+  <string name="pref_image_sharing_server_desc">Nie edytuj, chyba że wiesz co robisz!</string>
+  <string name="pref_use_lime_encryption">Używaj szyfrowania LIME</string>
+  <string name="lime_encryption_entry_disabled">Nieaktywny</string>
+  <string name="lime_encryption_entry_mandatory">Obowiązkowy</string>
+  <string name="lime_encryption_entry_preferred">Preferowany</string>
+  <!--Network settings-->
+  <string name="pref_network_title">Sieć</string>
+  <string name="pref_wifi_only">Używaj tylko WiFi</string>
+  <string name="pref_ice_enable">Włącz ICE</string>
+  <string name="pref_turn_enable">Włącz TURN</string>
+  <string name="pref_upnp_enable">Włącz UPNP</string>
+  <string name="pref_transport_use_random_ports">Użyj losowych portów</string>
+  <string name="pref_sip_port_title">Port SIP w użyciu</string>
+  <string name="pref_video_port_title">Port wideo lub zakres portów</string>
+  <string name="pref_audio_port_title">Port audio lub zakres portów</string>
+  <string name="pref_video_port_description">Port wideo lub zakres portów (minport-maxport)</string>
+  <string name="pref_audio_port_description">Port audio lub zakres portów (minport-maxport)</string>
+  <string name="pref_media_encryption">Szyfrowanie mediów</string>
+  <string name="pref_push_notification">Włącz powiadomienia push</string>
+  <string name="pref_ipv6_title">Zezwól IPv6</string>
+  <!--Advanced settings-->
+  <string name="pref_advanced_title">Zaawansowany</string>
+  <string name="pref_debug">Debug</string>
+  <string name="pref_background_mode">Tryb tła</string>
+  <string name="pref_animation_enable_title">Włącz animacje</string>
+  <string name="pref_service_notification">Włącz powiadomienie usług</string>
+  <string name="pref_autostart">Uruchom przy starcie systemu</string>
+  <string name="pref_incoming_call_timeout_title">Rozłączanie połączeń przychodzących  (w sekundach)</string>
+  <string name="pref_remote_provisioning_title">Zdalne zastrzeganie  </string>
+  <string name="pref_android_app_settings_title">Ustawienia aplikacji Android</string>
+  <string name="pref_primary_account_title">Pierwotne konto</string>
+  <string name="pref_display_name_title">Nazwa wyświetlana</string>
+  <string name="pref_user_name_title">Nazwa użytkownika</string>
+  <!--Audio hack settings-->
+  <string name="pref_audio_hacks_title">Hacki audio</string>
+  <string name="pref_audio_use_specific_mode_title">Użyj szczególnego trybu Hack</string>
+  <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (domyślnie), 2=MODE_IN_CALL</string>
+  <string name="pref_audio_hacks_use_routing_api_title">Użyj routing API Hack</string>
+  <string name="pref_audio_hacks_use_galaxys_hack_title">Użyj Galaxy S audio hack</string>
+  <!--Content description-->
+  <string name="content_description_back">Powrót</string>
+  <string name="content_description_dialer">Komunikator</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">Utrata</string>
+  <string name="content_description_hang_up">Odłożyć słuchawkę</string>
+  <string name="content_description_accept">Akceptuj</string>
+  <string name="content_description_edit">Edytować</string>
+  <string name="content_description_edit_list">Edycja listy</string>
+  <string name="content_description_valid">Ważny</string>
+  <string name="content_description_add_contact">Dodaj do kontaktów</string>
+  <string name="content_description_new_contact">Nowy kontakt</string>
+  <string name="content_description_call">Połączenie </string>
+  <string name="content_description_backspace">Backspace</string>
+  <string name="content_description_chat">Czat </string>
+  <string name="content_description_dial_back">Wybieranie z powrotem</string>
+  <string name="content_description_dialer_back">Powrót do rozmówcy</string>
+  <string name="content_description_contact_picture">Zdjęcie kontaktu</string>
+  <string name="content_description_send_message">Wyślij wiadomość</string>
+  <string name="content_description_detail">Szczegóły</string>
+  <string name="content_description_delete">Usuń</string>
+  <string name="content_description_add">Dodaj połączenie</string>
+  <string name="content_description_new_discussion">Nowa dyskusja</string>
+  <string name="content_description_search">Szukaj</string>
+  <string name="content_description_search_contact">Wyszukiwanie kontaktu</string>
+  <string name="content_description_all_contacts">Wszystkie kontakty</string>
+  <string name="content_description_linphone_contacts">Kontakty Linphone</string>
+  <string name="content_description_call_direction">Kierunek połączeń</string>
+  <string name="content_description_all_calls">Wszystkie połączenia</string>
+  <string name="content_description_missed_calls">Nieodebrane połączenie</string>
+  <string name="content_description_switch_video">Przełącznik wideo</string>
+  <string name="content_description_add_call">Dodaj połączenie </string>
+  <string name="content_description_pause">Pauza</string>
+  <string name="content_description_numpad">Numpad</string>
+  <string name="content_description_history">History button</string>
+  <string name="content_description_chat_button">Chat button</string>
+  <string name="content_description_contacts">Przycisk kontaktów</string>
+  <string name="content_description_call_quality">Jakość rozmów</string>
+  <string name="content_description_encryption">Szyfrowanie</string>
+  <string name="content_description_switch_camera">Przełącz kamerę</string>
+  <string name="content_description_cancel_button">Przycisk anuluj</string>
+  <string name="content_description_message_status">Stan wiadomości</string>
+  <string name="content_description_conference">Konferencja</string>
+  <string name="content_description_username_field">Nazwa pola</string>
+  <string name="content_description_display_field">Wyświetlana nazwa pola</string>
+  <string name="content_description_domain_field">Pole domeny</string>
+  <string name="content_description_url_field">Pole zdalnego zastrzegania</string>
+  <string name="content_description_confirm_password_field">Potwierdź pole hasła</string>
+  <string name="content_description_email_field">Pole email</string>
+  <string name="content_description_default_account">Domyślne konto </string>
+  <string name="content_description_deselect_all">Odznacz wszystko</string>
+  <string name="content_description_select_all">Zaznacz wszystko</string>
+  <string name="content_description_delete_selection">Usuń wybrane</string>
+  <string name="content_description_contact_first_name">Pierwsze imię</string>
+  <string name="content_description_contact_last_name">Nazwisko</string>
+  <string name="content_description_contact_organization">Organizacja</string>
+  <string name="content_description_back_call">Wróć aby połączyć</string>
+  <string name="content_description_send_file">Wyślij plik</string>
+  <string name="content_description_message">Wiadomość</string>
+  <string name="content_description_unread_chat_message">Nieprzeczytane wiadomości czatu</string>
+  <string name="content_description_transfer">Transfer</string>
+  <string name="content_description_earpiece">Słuchawki</string>
+  <string name="content_description_bluetooth">Bluetooth</string>
+  <string name="content_description_call_options">Opcje połączeń</string>
+  <string name="content_description_audio_route">Przesyłanie audio</string>
+  <string name="content_description_exit_conference">Wyjście konferencji </string>
+</resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 6445c8332..42295bebe 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -166,7 +166,6 @@
   <string name="pref_image_sharing_server_title">Servidor de compartilhamento</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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 96a0910d8..53fe03310 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -240,7 +240,6 @@
   <!--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>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 6da76c63d..f8115080d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -174,7 +174,6 @@
   <string name="pref_image_sharing_server_title">Сервер дељења</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>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 340d48e6e..393af657d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -138,7 +138,6 @@
   <string name="pref_image_sharing_server_title">Delar server</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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d709cec2c..7fb62494e 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -243,7 +243,6 @@
   <!--Network settings-->
   <string name="pref_network_title">Ağ</string>
   <string name="pref_wifi_only">Sadece WİFİ kullan</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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 8f70ad4a9..b6a58fedb 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -9,6 +9,10 @@
   <string name="notification_registered">%s 已註冊</string>
   <string name="notification_register_failure">%s 無法註冊</string>
   <string name="tunnel_host"></string>
+  <string name="about_version">Linphone Android %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 聯絡人</string>
   <!--Common-->
   <string name="username">使用者名稱</string>
   <string name="display_name">顯示名稱</string>
@@ -53,6 +57,7 @@
   <string name="assistant_generic_account">設定 SIP 帳號</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>
@@ -63,11 +68,14 @@
   <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>
+  <string name="forgot_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="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>
@@ -115,7 +123,7 @@
   <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_codec">編解碼器：</string>
   <string name="call_stats_upload">上傳頻寬：</string>
   <string name="call_stats_download">下載頻寬：</string>
   <string name="call_stats_video_resolution">視訊大小：</string>
@@ -131,6 +139,7 @@
   <string name="error">錯誤</string>
   <string name="error_unknown">未知錯誤</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_io_error">網路錯誤</string>
@@ -178,8 +187,8 @@
   <string name="ec_calibrating">校正中...</string>
   <string name="no_echo">沒有回音</string>
   <string name="failed">失敗</string>
-  <string name="pref_codec_bitrate_limit">編碼位元率限制</string>
-  <string name="pref_codecs">編碼</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>
@@ -190,16 +199,20 @@
   <string name="pref_video_preset">視訊預設</string>
   <string name="pref_preferred_video_size">偏好的視訊大小</string>
   <string name="pref_preferred_fps">偏好的 FPS</string>
-  <string name="pref_video_codecs_title">編碼</string>
+  <string name="pref_video_codecs_title">編解碼器</string>
   <!--Call settings-->
   <string name="pref_call_title">通話</string>
+  <string name="pref_device_ringtone">使用裝置鈴聲</string>
   <!--Chat settings-->
   <string name="pref_chat_title">聊天</string>
+  <string name="pref_image_sharing_server_desc">不要編輯除非你知道你在做什麼！</string>
+  <string name="lime_encryption_entry_disabled">停用</string>
+  <string name="lime_encryption_entry_mandatory">強制</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_turn_enable">啟用 TURN</string>
   <string name="pref_upnp_enable">啟用 UPNP</string>
   <string name="pref_transport_use_random_ports">使用隨機連接埠</string>
   <string name="pref_sip_port_title">要使用的連接埠</string>
@@ -251,7 +264,7 @@
   <string name="content_description_switch_video">切換視訊</string>
   <string name="content_description_pause">暫停</string>
   <string name="content_description_numpad">數字鍵盤</string>
-  <string name="content_description_history">歷史按鈕</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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1fbb3d425..8edc2148d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -292,7 +292,7 @@
 	<!-- Network settings -->
 	<string name="pref_network_title">Network</string>
 	<string name="pref_wifi_only">Use WiFi only</string>
-	<string name="pref_stun_server">STUN server</string>
+	<string name="pref_stun_server">STUN / TURN server</string>
 	<string name="pref_ice_enable">Enable ICE</string>
 	<string name="pref_turn_enable">Enable TURN</string>
 	<string name="pref_turn_username_title">STUN / TURN username (optional)</string>

From 219340822235cef667c88509b9b5a1e4d53d3d0e Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 13 Sep 2016 13:40:29 +0200
Subject: [PATCH 3/9] Update linphone submodule.

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 510e9d92d..c87b9a5a3 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 510e9d92d051c0bedc2803669f6aa81bda7c3cb9
+Subproject commit c87b9a5a3b706b74f1513f65fd56e7085850aefb

From 36e361dc8db7ca8d47f3456aa21adce368336947 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Mon, 12 Sep 2016 17:37:07 +0200
Subject: [PATCH 4/9] Fix video enabled in tests

---
 tests/src/org/linphone/test/CallsAudio.java | 1 +
 tests/src/org/linphone/test/CallsVideo.java | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/src/org/linphone/test/CallsAudio.java b/tests/src/org/linphone/test/CallsAudio.java
index 4d2238c60..e65c2f468 100644
--- a/tests/src/org/linphone/test/CallsAudio.java
+++ b/tests/src/org/linphone/test/CallsAudio.java
@@ -31,6 +31,7 @@ public class CallsAudio extends SampleTest {
 		goToSettings();
 
 		selectItemInListOnUIThread(3);
+		solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_title));
 		solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_enable_title));
 		solo.sleep(500);
 		
diff --git a/tests/src/org/linphone/test/CallsVideo.java b/tests/src/org/linphone/test/CallsVideo.java
index f4f258242..177c3974c 100644
--- a/tests/src/org/linphone/test/CallsVideo.java
+++ b/tests/src/org/linphone/test/CallsVideo.java
@@ -31,13 +31,10 @@ public class CallsVideo extends SampleTest {
 		//Enable video
 		goToSettings();
 
-		selectItemInListOnUIThread(3);
-		solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_enable_title));
-		solo.sleep(500);
-		
 		// enable auto accept and auto share video
 		goToVideoCodecsSettings();
 		solo.sleep(500);
+		solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_enable_title));
 		solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_initiate_call_with_video_title));
 		solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_automatically_accept_video_title));
 		solo.sleep(500);
@@ -61,6 +58,7 @@ public class CallsVideo extends SampleTest {
 		solo.clickOnView(solo.getView(org.linphone.R.id.call));
 
 		assertOutgoingCallIsCorrectlyRunning();
+		assertCallIsCorrectlyRunning();
 		assertCallIsRunningWithVideo();
 
 		solo.clickOnView(solo.getView(org.linphone.R.id.video_frame));

From 83c32db784032bb55fb09794eef4a52f37c6b638 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 13 Sep 2016 14:19:19 +0200
Subject: [PATCH 5/9] Fix call transfer

---
 src/org/linphone/DialerFragment.java   |  6 ++++--
 src/org/linphone/LinphoneActivity.java | 13 ++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/org/linphone/DialerFragment.java b/src/org/linphone/DialerFragment.java
index 32c54c3ed..6a760dd3f 100644
--- a/src/org/linphone/DialerFragment.java
+++ b/src/org/linphone/DialerFragment.java
@@ -122,13 +122,15 @@ public class DialerFragment extends Fragment {
 			}
 		}
 
+		instance = this;
+
 		return view;
     }
 
 	/**
 	 * @return null if not ready yet
 	 */
-	public static DialerFragment instance() { 
+	public static DialerFragment instance() {
 		return instance;
 	}
 	
@@ -166,7 +168,7 @@ public class DialerFragment extends Fragment {
 	}
 	
 	public void resetLayout(boolean callTransfer) {
-		isCallTransferOngoing = callTransfer;
+		isCallTransferOngoing = LinphoneActivity.instance().isCallTransfer();
 		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
 		if (lc == null) {
 			return;
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 5a93cc348..0dea57932 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -133,6 +133,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	private ImageView menu;
 	private boolean fetchedContactsOnce = false;
 	private boolean doNotGoToCallActivity = false;
+	private boolean callTransfer = false;
 
 	static final boolean isInstanciated() {
 		return instance != null;
@@ -998,7 +999,11 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		}
 	}
 
-	private void initInCallMenuLayout(boolean callTransfer) {
+	public Boolean isCallTransfer(){
+		return callTransfer;
+	}
+
+	private void initInCallMenuLayout(final boolean callTransfer) {
 		selectMenu(FragmentsAvailable.DIALER);
 		DialerFragment dialerFragment = DialerFragment.instance();
 		if (dialerFragment != null) {
@@ -1009,7 +1014,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	public void resetClassicMenuLayoutAndGoBackToCallIfStillRunning() {
 		DialerFragment dialerFragment = DialerFragment.instance();
 		if (dialerFragment != null) {
-			((DialerFragment) dialerFragment).resetLayout(false);
+			((DialerFragment) dialerFragment).resetLayout(true);
 		}
 
 		if (LinphoneManager.isInstanciated() && LinphoneManager.getLc().getCallsNb() > 0) {
@@ -1073,7 +1078,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			}
 		} else if (resultCode == Activity.RESULT_FIRST_USER && requestCode == CALL_ACTIVITY) {
 			getIntent().putExtra("PreviousActivity", CALL_ACTIVITY);
-			boolean callTransfer = data == null ? false : data.getBooleanExtra("Transfer", false);
+			callTransfer = data == null ? false : data.getBooleanExtra("Transfer", false);
 			boolean chat = data == null ? false : data.getBooleanExtra("chat", false);
 			if(chat){
 				pendingFragmentTransaction = FragmentsAvailable.CHAT_LIST;
@@ -1103,6 +1108,8 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		if (lc != null) {
 			lc.removeListener(mListener);
 		}
+
+		callTransfer = false;
 		
 		super.onPause();
 	}

From ab8bc312fb94de61de0d97d4d382d95701827d2e Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 13 Sep 2016 14:19:38 +0200
Subject: [PATCH 6/9] Fix some tests

---
 tests/src/org/linphone/test/AccountAssistant.java       | 5 +++--
 tests/src/org/linphone/test/ConferenceAndMultiCall.java | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/src/org/linphone/test/AccountAssistant.java b/tests/src/org/linphone/test/AccountAssistant.java
index ab029d5e4..1e31ee3d3 100644
--- a/tests/src/org/linphone/test/AccountAssistant.java
+++ b/tests/src/org/linphone/test/AccountAssistant.java
@@ -46,8 +46,9 @@ public class AccountAssistant extends SampleTest {
 		solo.sleep(1000);
 
 		//Test echo calibration launch at first start
-		Assert.assertTrue(solo.searchText(aContext.getString(org.linphone.R.string.assistant_ec_calibration)));
-				
+		Assert.assertTrue(solo.searchText(aContext.getString(org.linphone.R.string.assistant_codec_down_question)));
+		solo.clickOnView(solo.getView(org.linphone.R.id.answerNo));
+
 		solo.waitForActivity("LinphoneActivity", 8000);
 		Assert.assertTrue(solo.searchText(iContext.getString(R.string.account_linphone_login) + "@sip.linphone.org"));
 
diff --git a/tests/src/org/linphone/test/ConferenceAndMultiCall.java b/tests/src/org/linphone/test/ConferenceAndMultiCall.java
index 076640ac8..7f2c32d0a 100644
--- a/tests/src/org/linphone/test/ConferenceAndMultiCall.java
+++ b/tests/src/org/linphone/test/ConferenceAndMultiCall.java
@@ -33,6 +33,7 @@ public class ConferenceAndMultiCall extends SampleTest {
 		goToSettings();
 
 		selectItemInListOnUIThread(3);
+		solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_title));
 		solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_enable_title));
 		solo.sleep(500);
 

From 3c7948fdd553f20a0e40dd3050013cfecab16a7c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 13 Sep 2016 16:38:46 +0200
Subject: [PATCH 7/9] Fixed spinner in contacts list not being visible while
 fetching contacts

---
 src/org/linphone/ContactsListFragment.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/org/linphone/ContactsListFragment.java b/src/org/linphone/ContactsListFragment.java
index 66984af71..22dd4256c 100644
--- a/src/org/linphone/ContactsListFragment.java
+++ b/src/org/linphone/ContactsListFragment.java
@@ -146,6 +146,7 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 		});
 		
 		contactsFetchInProgress = (ProgressBar) view.findViewById(R.id.contactsFetchInProgress);
+		contactsFetchInProgress.setVisibility(View.VISIBLE);
 
 		return view;
     }
@@ -333,17 +334,23 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 		noSipContact.setVisibility(View.GONE);
 		noContact.setVisibility(View.GONE);
 		contactsList.setVisibility(View.VISIBLE);
-		contactsFetchInProgress.setVisibility(View.GONE);
 
+		ContactsListAdapter adapter;
 		if (onlyDisplayLinphoneContacts) {
 			contactsList.setChoiceMode(AbsListView.CHOICE_MODE_MULTIPLE);
-			contactsList.setAdapter(new ContactsListAdapter(ContactsManager.getInstance().getSIPContacts()));
+			adapter = new ContactsListAdapter(ContactsManager.getInstance().getSIPContacts());
+			contactsList.setAdapter(adapter);
 			edit.setEnabled(true);
 		} else {
 			contactsList.setChoiceMode(AbsListView.CHOICE_MODE_MULTIPLE);
-			contactsList.setAdapter(new ContactsListAdapter(ContactsManager.getInstance().getContacts()));
+			adapter = new ContactsListAdapter(ContactsManager.getInstance().getContacts());
+			contactsList.setAdapter(adapter);
 			edit.setEnabled(true);
 		}
+		
+		if (adapter.getCount() > 0) {
+			contactsFetchInProgress.setVisibility(View.GONE);
+		}
 		ContactsManager.getInstance().setLinphoneContactsPrefered(onlyDisplayLinphoneContacts);
 	}
 	

From 03883ed1a2a31eb6bf352710400a285198670a0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Wed, 14 Sep 2016 11:22:38 +0200
Subject: [PATCH 8/9] Add codec2 submodule

---
 .gitmodules                 | 3 +++
 submodules/externals/codec2 | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 submodules/externals/codec2

diff --git a/.gitmodules b/.gitmodules
index 366481017..d7a3256b5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -101,3 +101,6 @@
 [submodule "submodules/externals/vo-amrwbenc"]
 	path = submodules/externals/vo-amrwbenc
 	url = git://git.linphone.org/vo-amrwbenc.git
+[submodule "submodules/externals/codec2"]
+	path = submodules/externals/codec2
+	url = git://git.linphone.org/codec2
diff --git a/submodules/externals/codec2 b/submodules/externals/codec2
new file mode 160000
index 000000000..4e154e6bb
--- /dev/null
+++ b/submodules/externals/codec2
@@ -0,0 +1 @@
+Subproject commit 4e154e6bbbe92cc76e333a0b4acb365b5c042ec6

From d2903709381f4d3cbe5a1545c7b40c13fc6dc9aa Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 14 Sep 2016 11:39:25 +0200
Subject: [PATCH 9/9] Updated linphone submodule

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index c87b9a5a3..a6e7eec3b 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit c87b9a5a3b706b74f1513f65fd56e7085850aefb
+Subproject commit a6e7eec3b3ec268e7d86f85ae268b53eca5c10de